Skip to content

Commit 42522ca

Browse files
jrose-applejrose-apple
committed
[ParseableInterface] Module-qualify protocol types too
Otherwise we can get in trouble when a local type is named, say, 'Sequence'. Also contains test updates and a fix for Harlan's previous commit, which actually affects all typealiases, not just those in the Builtin module.
1 parent a49fea5 commit 42522ca

16 files changed

+659
-582
lines changed

‎lib/AST/ASTPrinter.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3380,7 +3380,11 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
33803380
if (!Options.FullyQualifiedTypesIfAmbiguous)
33813381
return false;
33823382

3383-
Decl *D = T->getAnyGeneric();
3383+
Decl *D;
3384+
if (auto *TAT = dyn_cast<TypeAliasType>(T))
3385+
D = TAT->getDecl();
3386+
else
3387+
D = T->getAnyGeneric();
33843388

33853389
// If we cannot find the declaration, be extra careful and print
33863390
// the type qualified.
@@ -4031,6 +4035,10 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
40314035
}
40324036

40334037
void visitProtocolType(ProtocolType *T) {
4038+
if (shouldPrintFullyQualified(T)) {
4039+
printModuleContext(T);
4040+
}
4041+
40344042
printTypeDeclName(T);
40354043
}
40364044

‎test/IDE/print_swift_module.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public func returnsAlias() -> Alias<Int> {
2828
// CHECK1: /// Alias comment
2929
// CHECK1-NEXT: typealias Alias<T> = (T, T)
3030

31-
// CHECK1: public class C1 : P1 {
31+
// CHECK1: public class C1 : print_swift_module.P1 {
3232
// CHECK1-NEXT: /// foo1 comment from P1
3333
// CHECK1-NEXT: public func foo1()
3434
// CHECK1-NEXT: /// foo2 comment from C1
@@ -43,4 +43,4 @@ public func returnsAlias() -> Alias<Int> {
4343
// CHECK1-NEXT: }
4444

4545
// CHECK1: /// returnsAlias() comment
46-
// CHECK1-NEXT: func returnsAlias() -> Alias<Int>
46+
// CHECK1-NEXT: func returnsAlias() -> print_swift_module.Alias<Int>

‎test/IDE/print_synthesized_extensions.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ extension S13 : P5 {
255255
// CHECK4-NEXT: <decl:Func>public func <loc>S9IntFunc()</loc></decl>
256256
// CHECK4-NEXT: }</synthesized>
257257

258-
// CHECK5: <decl:Struct>public struct <loc>S10</loc> : <ref:Protocol>P1</ref> {
258+
// CHECK5: <decl:Struct>public struct <loc>S10</loc> : <ref:module>print_synthesized_extensions</ref>.<ref:Protocol>P1</ref> {
259259
// CHECK5-NEXT: <decl:TypeAlias>public typealias <loc>T1</loc> = <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S9</ref><<ref:Struct>Int</ref>></decl>
260260
// CHECK5-NEXT: <decl:TypeAlias>public typealias <loc>T2</loc> = <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S9</ref><<ref:Struct>Int</ref>></decl>
261261
// CHECK5-NEXT: <decl:Func>public func <loc>f1(<decl:Param>t: <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S10</ref>.<ref:TypeAlias>T1</ref></decl>)</loc> -> <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S10</ref>.<ref:TypeAlias>T1</ref></decl>
@@ -275,15 +275,15 @@ extension S13 : P5 {
275275
// CHECK7-NEXT: <decl:Func>public func <loc>P4Func2()</loc></decl>
276276
// CHECK7-NEXT: }</synthesized>
277277

278-
// CHECK8: <decl:Struct>public struct <loc>S4<<decl:GenericTypeParam>T</decl>></loc> : <ref:Protocol>P1</ref> {
278+
// CHECK8: <decl:Struct>public struct <loc>S4<<decl:GenericTypeParam>T</decl>></loc> : <ref:module>print_synthesized_extensions</ref>.<ref:Protocol>P1</ref> {
279279
// CHECK8-NEXT: <decl:TypeAlias>public typealias <loc>T1</loc> = <ref:Struct>Int</ref></decl>
280280
// CHECK8-NEXT: <decl:TypeAlias>public typealias <loc>T2</loc> = <ref:Struct>Int</ref></decl>
281281
// CHECK8-NEXT: <decl:Func>public func <loc>f1(<decl:Param>t: <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S4</ref><T>.<ref:TypeAlias>T1</ref></decl>)</loc> -> <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S4</ref><T>.<ref:TypeAlias>T1</ref></decl>
282282
// CHECK8-NEXT: <decl:Func>public func <loc>f2(<decl:Param>t: <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S4</ref><T>.<ref:TypeAlias>T2</ref></decl>)</loc> -> <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S4</ref><T>.<ref:TypeAlias>T2</ref></decl></decl>
283283
// CHECK8-NEXT: <decl:Func>public func <loc>p1IntFunc(<decl:Param>i: <ref:Struct>Int</ref></decl>)</loc> -> <ref:Struct>Int</ref></decl>
284284
// CHECK8-NEXT: }</synthesized>
285285

286-
// CHECK9: <decl:Struct>public struct <loc>S6<<decl:GenericTypeParam>T</decl>></loc> : <ref:Protocol>P1</ref> {
286+
// CHECK9: <decl:Struct>public struct <loc>S6<<decl:GenericTypeParam>T</decl>></loc> : <ref:module>print_synthesized_extensions</ref>.<ref:Protocol>P1</ref> {
287287
// CHECK9-NEXT: <decl:TypeAlias>public typealias <loc>T1</loc> = <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S5</ref></decl>
288288
// CHECK9-NEXT: <decl:TypeAlias>public typealias <loc>T2</loc> = <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S5</ref></decl>
289289
// CHECK9-NEXT: <decl:Func>public func <loc>f1(<decl:Param>t: <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S6</ref><T>.<ref:TypeAlias>T1</ref></decl>)</loc> -> <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S6</ref><T>.<ref:TypeAlias>T1</ref></decl>
@@ -300,7 +300,7 @@ extension S13 : P5 {
300300
// CHECK10-NEXT: <decl:Func>public func <loc>ef5(<decl:Param>t: <ref:Struct>S5</ref></decl>)</loc></decl>
301301
// CHECK10-NEXT: }</synthesized>
302302

303-
// CHECK11: <decl:Struct>public struct <loc>S12</loc> : <ref:Protocol>P5</ref> {
303+
// CHECK11: <decl:Struct>public struct <loc>S12</loc> : <ref:module>print_synthesized_extensions</ref>.<ref:Protocol>P5</ref> {
304304
// CHECK11-NEXT: <decl:TypeAlias>public typealias <loc>T1</loc> = <ref:Struct>Int</ref></decl>
305305
// CHECK11-NEXT: <decl:Func>/// This is picked
306306
// CHECK11-NEXT: public func <loc>foo1()</loc></decl></decl>

‎test/IDE/print_types.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
typealias MyInt = Int
88
// CHECK: TypeAliasDecl '''MyInt''' MyInt.Type{{$}}
9-
// FULL: TypeAliasDecl '''MyInt''' MyInt.Type{{$}}
9+
// FULL: TypeAliasDecl '''MyInt''' swift_ide_test.MyInt.Type{{$}}
1010

1111
func testVariableTypes(_ param: Int, param2: inout Double) {
1212
// CHECK: FuncDecl '''testVariableTypes''' (Int, inout Double) -> (){{$}}
@@ -52,7 +52,7 @@ func testVariableTypes(_ param: Int, param2: inout Double) {
5252
var typealias1 : MyInt = 42
5353
// CHECK: VarDecl '''typealias1''' MyInt{{$}}
5454
// CHECK: IntegerLiteralExpr:[[@LINE-2]] '''42''' Int{{$}}
55-
// FULL: VarDecl '''typealias1''' MyInt{{$}}
55+
// FULL: VarDecl '''typealias1''' swift_ide_test.MyInt{{$}}
5656
// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Swift.Int{{$}}
5757
_ = typealias1 ; typealias1 = 1
5858

@@ -77,11 +77,11 @@ func testFuncType2() -> () {}
7777

7878
func testFuncType3() -> Void {}
7979
// CHECK: FuncDecl '''testFuncType3''' () -> Void{{$}}
80-
// FULL: FuncDecl '''testFuncType3''' () -> Void{{$}}
80+
// FULL: FuncDecl '''testFuncType3''' () -> Swift.Void{{$}}
8181

8282
func testFuncType4() -> MyInt {}
8383
// CHECK: FuncDecl '''testFuncType4''' () -> MyInt{{$}}
84-
// FULL: FuncDecl '''testFuncType4''' () -> MyInt{{$}}
84+
// FULL: FuncDecl '''testFuncType4''' () -> swift_ide_test.MyInt{{$}}
8585

8686
func testFuncType5() -> (Int) {}
8787
// CHECK: FuncDecl '''testFuncType5''' () -> (Int){{$}}
@@ -111,7 +111,7 @@ struct GenericStruct<A, B : FooProtocol> {}
111111

112112
func testInGenericFunc1<A, B : FooProtocol, C : FooProtocol & BarProtocol>(_ a: A, b: B, c: C) {
113113
// CHECK: FuncDecl '''testInGenericFunc1''' <A, B, C where B : FooProtocol, C : BarProtocol, C : FooProtocol> (A, b: B, c: C) -> (){{$}}
114-
// FULL: FuncDecl '''testInGenericFunc1''' <A, B, C where B : FooProtocol, C : BarProtocol, C : FooProtocol> (A, b: B, c: C) -> (){{$}}
114+
// FULL: FuncDecl '''testInGenericFunc1''' <A, B, C where B : swift_ide_test.FooProtocol, C : swift_ide_test.BarProtocol, C : swift_ide_test.FooProtocol> (A, b: B, c: C) -> (){{$}}
115115

116116
var a1 = a
117117
_ = a1; a1 = a
@@ -136,5 +136,5 @@ func testInGenericFunc1<A, B : FooProtocol, C : FooProtocol & BarProtocol>(_ a:
136136

137137
func testInGenericFunc2<T : QuxProtocol, U : QuxProtocol>(_: T, _: U) where T.Qux == U.Qux {}
138138
// CHECK: FuncDecl '''testInGenericFunc2''' <T, U where T : QuxProtocol, U : QuxProtocol, T.Qux == U.Qux> (T, U) -> (){{$}}
139-
// FULL: FuncDecl '''testInGenericFunc2''' <T, U where T : QuxProtocol, U : QuxProtocol, T.Qux == U.Qux> (T, U) -> (){{$}}
139+
// FULL: FuncDecl '''testInGenericFunc2''' <T, U where T : swift_ide_test.QuxProtocol, U : swift_ide_test.QuxProtocol, T.Qux == U.Qux> (T, U) -> (){{$}}
140140

‎test/ParseableInterface/ParseStdlib.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
// RUN: %target-swift-frontend -build-module-from-parseable-interface -o %t/ParseStdlib.swiftmodule %s
99
// RUN: %target-swift-ide-test -print-module -module-to-print ParseStdlib -I %t -source-filename x -print-interface | %FileCheck %s
1010

11-
// CHECK: func test(_: Int42)
11+
// CHECK: func test(_: Builtin.Int42)
1212
public func test(_: Builtin.Int42) {}

‎test/ParseableInterface/access-filter.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ extension GenericStruct where InternalStruct_BAD == T {
197197
@usableFromInline internal func constrainedToInternalStruct2_BAD() {}
198198
}
199199

200-
// CHECK: extension GenericStruct where T : PublicProto {{[{]$}}
200+
// CHECK: extension GenericStruct where T : main.PublicProto {{[{]$}}
201201
extension GenericStruct where T: PublicProto {
202202
// CHECK-NEXT: public func constrainedToPublicProto(){{$}}
203203
public func constrainedToPublicProto() {}
204204
} // CHECK-NEXT: {{^[}]$}}
205-
// CHECK: extension GenericStruct where T : UFIProto {{[{]$}}
205+
// CHECK: extension GenericStruct where T : main.UFIProto {{[{]$}}
206206
extension GenericStruct where T: UFIProto {
207207
// CHECK-NEXT: @usableFromInline{{$}}
208208
// CHECK-NEXT: internal func constrainedToUFIProto(){{$}}
@@ -245,12 +245,12 @@ internal typealias InternalAlias_BAD = PublicAliasBase
245245

246246
internal typealias ReallyInternalAlias_BAD = ReallyInternalAliasBase_BAD
247247

248-
// CHECK: extension GenericStruct where T == PublicAlias {{[{]$}}
248+
// CHECK: extension GenericStruct where T == main.PublicAlias {{[{]$}}
249249
extension GenericStruct where T == PublicAlias {
250250
// CHECK-NEXT: public func constrainedToPublicAlias(){{$}}
251251
public func constrainedToPublicAlias() {}
252252
} // CHECK-NEXT: {{^[}]$}}
253-
// CHECK: extension GenericStruct where T == UFIAlias {{[{]$}}
253+
// CHECK: extension GenericStruct where T == main.UFIAlias {{[{]$}}
254254
extension GenericStruct where T == UFIAlias {
255255
// CHECK-NEXT: @usableFromInline{{$}}
256256
// CHECK-NEXT: internal func constrainedToUFIAlias(){{$}}

‎test/ParseableInterface/conformances.swift

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ public struct A1: PublicProto, PrivateProto {}
3333
// NEGATIVE-NOT: extension conformances.A2
3434
public struct A2: PrivateProto, PublicProto {}
3535
// CHECK: public struct A3 {
36-
// CHECK-END: extension conformances.A3 : PublicProto {}
36+
// CHECK-END: extension conformances.A3 : conformances.PublicProto {}
3737
public struct A3: PublicProto & PrivateProto {}
3838
// CHECK: public struct A4 {
39-
// CHECK-END: extension conformances.A4 : PublicProto {}
39+
// CHECK-END: extension conformances.A4 : conformances.PublicProto {}
4040
public struct A4: PrivateProto & PublicProto {}
4141

4242
public protocol PublicBaseProto {}
4343
private protocol PrivateSubProto: PublicBaseProto {}
4444

4545
// CHECK: public struct B1 {
46-
// CHECK-END: extension conformances.B1 : PublicBaseProto {}
46+
// CHECK-END: extension conformances.B1 : conformances.PublicBaseProto {}
4747
public struct B1: PrivateSubProto {}
4848
// CHECK: public struct B2 : PublicBaseProto {
4949
// NEGATIVE-NOT: extension conformances.B2
5050
public struct B2: PublicBaseProto, PrivateSubProto {}
5151
// CHECK: public struct B3 {
52-
// CHECK-END: extension conformances.B3 : PublicBaseProto {}
52+
// CHECK-END: extension conformances.B3 : conformances.PublicBaseProto {}
5353
public struct B3: PublicBaseProto & PrivateSubProto {}
5454
// CHECK: public struct B4 : PublicBaseProto {
5555
// CHECK: extension B4 {
@@ -87,26 +87,26 @@ public struct OuterGeneric<T> {
8787
public protocol ConditionallyConformed {}
8888
public protocol ConditionallyConformedAgain {}
8989

90-
// CHECK-END: extension conformances.OuterGeneric : ConditionallyConformed, ConditionallyConformedAgain where T : _ConstraintThatIsNotPartOfTheAPIOfThisLibrary {}
90+
// CHECK-END: extension conformances.OuterGeneric : conformances.ConditionallyConformed, conformances.ConditionallyConformedAgain where T : _ConstraintThatIsNotPartOfTheAPIOfThisLibrary {}
9191
extension OuterGeneric: ConditionallyConformed where T: PrivateProto {}
9292
extension OuterGeneric: ConditionallyConformedAgain where T == PrivateProto {}
9393

94-
// CHECK-END: extension conformances.OuterGeneric.Inner : PublicBaseProto {}
95-
// CHECK-END: extension conformances.OuterGeneric.Inner : ConditionallyConformed, ConditionallyConformedAgain where T : _ConstraintThatIsNotPartOfTheAPIOfThisLibrary {}
94+
// CHECK-END: extension conformances.OuterGeneric.Inner : conformances.PublicBaseProto {}
95+
// CHECK-END: extension conformances.OuterGeneric.Inner : conformances.ConditionallyConformed, conformances.ConditionallyConformedAgain where T : _ConstraintThatIsNotPartOfTheAPIOfThisLibrary {}
9696
extension OuterGeneric.Inner: ConditionallyConformed where T: PrivateProto {}
9797
extension OuterGeneric.Inner: ConditionallyConformedAgain where T == PrivateProto {}
9898

9999
private protocol AnotherPrivateSubProto: PublicBaseProto {}
100100

101101
// CHECK: public struct C1 {
102-
// CHECK-END: extension conformances.C1 : PublicBaseProto {}
102+
// CHECK-END: extension conformances.C1 : conformances.PublicBaseProto {}
103103
public struct C1: PrivateSubProto, AnotherPrivateSubProto {}
104104
// CHECK: public struct C2 {
105-
// CHECK-END: extension conformances.C2 : PublicBaseProto {}
105+
// CHECK-END: extension conformances.C2 : conformances.PublicBaseProto {}
106106
public struct C2: PrivateSubProto & AnotherPrivateSubProto {}
107107
// CHECK: public struct C3 {
108108
// CHECK: extension C3 {
109-
// CHECK-END: extension conformances.C3 : PublicBaseProto {}
109+
// CHECK-END: extension conformances.C3 : conformances.PublicBaseProto {}
110110
public struct C3: PrivateSubProto {}
111111
extension C3: AnotherPrivateSubProto {}
112112

@@ -120,10 +120,10 @@ public struct D1: PublicSubProto, PrivateSubProto {}
120120
// NEGATIVE-NOT: extension conformances.D2
121121
public struct D2: PrivateSubProto, PublicSubProto {}
122122
// CHECK: public struct D3 {
123-
// CHECK-END: extension conformances.D3 : PublicBaseProto, PublicSubProto {}
123+
// CHECK-END: extension conformances.D3 : conformances.PublicBaseProto, conformances.PublicSubProto {}
124124
public struct D3: PrivateSubProto & PublicSubProto {}
125125
// CHECK: public struct D4 {
126-
// CHECK-END: extension conformances.D4 : APublicSubProto, PublicBaseProto {}
126+
// CHECK-END: extension conformances.D4 : conformances.APublicSubProto, conformances.PublicBaseProto {}
127127
public struct D4: APublicSubProto & PrivateSubProto {}
128128
// CHECK: public struct D5 {
129129
// CHECK: extension D5 : PublicSubProto {
@@ -139,33 +139,33 @@ extension D6: PrivateSubProto {}
139139
private typealias PrivateProtoAlias = PublicProto
140140

141141
// CHECK: public struct E1 {
142-
// CHECK-END: extension conformances.E1 : PublicProto {}
142+
// CHECK-END: extension conformances.E1 : conformances.PublicProto {}
143143
public struct E1: PrivateProtoAlias {}
144144

145145
private typealias PrivateSubProtoAlias = PrivateSubProto
146146

147147
// CHECK: public struct F1 {
148-
// CHECK-END: extension conformances.F1 : PublicBaseProto {}
148+
// CHECK-END: extension conformances.F1 : conformances.PublicBaseProto {}
149149
public struct F1: PrivateSubProtoAlias {}
150150

151151
private protocol ClassConstrainedProto: PublicProto, AnyObject {}
152152

153153
public class G1: ClassConstrainedProto {}
154154
// CHECK: public class G1 {
155-
// CHECK-END: extension conformances.G1 : PublicProto {}
155+
// CHECK-END: extension conformances.G1 : conformances.PublicProto {}
156156

157157
public class Base {}
158158
private protocol BaseConstrainedProto: Base, PublicProto {}
159159

160160
public class H1: Base, ClassConstrainedProto {}
161161
// CHECK: public class H1 : Base {
162-
// CHECK-END: extension conformances.H1 : PublicProto {}
162+
// CHECK-END: extension conformances.H1 : conformances.PublicProto {}
163163

164164
public struct MultiGeneric<T, U, V> {}
165165
extension MultiGeneric: PublicProto where U: PrivateProto {}
166166

167167
// CHECK: public struct MultiGeneric<T, U, V> {
168-
// CHECK-END: extension conformances.MultiGeneric : PublicProto where T : _ConstraintThatIsNotPartOfTheAPIOfThisLibrary {}
168+
// CHECK-END: extension conformances.MultiGeneric : conformances.PublicProto where T : _ConstraintThatIsNotPartOfTheAPIOfThisLibrary {}
169169

170170

171171
internal struct InternalImpl_BAD: PrivateSubProto {}

‎test/ParseableInterface/inlinable-function.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
// RUN: %target-swift-frontend -emit-module -o /dev/null -merge-modules %t/Test.swiftmodule -disable-objc-attr-requires-foundation-module -emit-parseable-module-interface-path %t/TestFromModule.swiftinterface -module-name Test
55
// RUN: %FileCheck %s --check-prefix FROMMODULE --check-prefix CHECK < %t/TestFromModule.swiftinterface
66

7-
// CHECK: public struct Foo : Hashable {
7+
// FIXME: These shouldn't be different, or we'll get different output from
8+
// WMO and non-WMO builds.
9+
// FROMSOURCE-LABEL: public struct Foo : Hashable {
10+
// FROMMODULE-LABEL: public struct Foo : Swift.Hashable {
811
public struct Foo: Hashable {
912
// CHECK: public var inlinableGetPublicSet: [[INT:(Swift.)?Int]] {
1013
public var inlinableGetPublicSet: Int {

‎test/SILGen/witness_accessibility_multi.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import witness_accessibility_other
1515
// CHECK-LABEL: sil [ossa] @$s27witness_accessibility_multi22callsPublicRequirement1sy0a1_B6_other1SV_tF : $@convention(thin) (S) -> ()
1616
public func callsPublicRequirement(s: S) {
1717

18-
// CHECK: witness_method $S, #P.publicRequirement!1 : <Self where Self : P> (Self) -> () -> () : $@convention(witness_method: P) <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> ()
18+
// CHECK: witness_method $S, #P.publicRequirement!1 : <Self where Self : witness_accessibility_other.P> (Self) -> () -> () : $@convention(witness_method: P) <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> ()
1919
s.publicRequirement()
2020

2121
// CHECK: function_ref @$s27witness_accessibility_other1QPAAE19internalRequirementyyF : $@convention(method) <τ_0_0 where τ_0_0 : Q> (@in_guaranteed τ_0_0) -> ()

0 commit comments

Comments
 (0)