Skip to content

Commit a66df57

Browse files
DougGregorDougGregor
committed
[Mangling] Update SILGen and IRGen tests for mangling change.
1 parent f232af5 commit a66df57

File tree

54 files changed

+281
-285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+281
-285
lines changed

‎test/DebugInfo/mangling.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ func markUsed<T>(_ t: T) {}
88
// Variable:
99
// mangling.myDict : Swift.Dictionary<Swift.Int64, Swift.String>
1010
// CHECK: !DIGlobalVariable(name: "myDict",
11-
// CHECK-SAME: linkageName: "$S8mangling6myDicts10DictionaryVys5Int64VSSGvp",
11+
// CHECK-SAME: linkageName: "$S8mangling6myDictSDys5Int64VSSGvp",
1212
// CHECK-SAME: line: [[@LINE+3]]
1313
// CHECK-SAME: type: ![[DT:[0-9]+]]
1414
// CHECK: ![[DT]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Dictionary"

‎test/Demangle/Inputs/manglings.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ _TtSV ---> Swift.UnsafeRawPointer
2323
_TtSv ---> Swift.UnsafeMutableRawPointer
2424
_TtGSaSS_ ---> [Swift.String]
2525
_TtGSqSS_ ---> Swift.String?
26-
_TtGSQSS_ ---> Swift.String!
2726
_TtGVs10DictionarySSSi_ ---> [Swift.String : Swift.Int]
2827
_TtVs7CString ---> Swift.CString
2928
_TtCSo8NSObject ---> __C.NSObject
@@ -287,10 +286,6 @@ _T03nix6testitSaySiGyFTv_ ---> outlined variable #0 of nix.testit() -> [Swift.In
287286
_T03nix6testitSaySiGyFTv0_ ---> outlined variable #1 of nix.testit() -> [Swift.Int]
288287
_T0So11UITextFieldC4textSSSgvgToTepb_ ---> outlined bridged method (pb) of @objc __C.UITextField.text.getter : Swift.String?
289288
_T0So11UITextFieldC4textSSSgvgToTeab_ ---> outlined bridged method (ab) of @objc __C.UITextField.text.getter : Swift.String?
290-
_T0So5GizmoC11doSomethingSQyypGSQySaySSGGFToTembnn_ ---> outlined bridged method (mbnn) of @objc __C.Gizmo.doSomething([Swift.String]!) -> Any!
291-
_T0So5GizmoC12modifyStringSQySSGAD_Si10withNumberSQyypG0D6FoobartFToTembnnnb_ ---> outlined bridged method (mbnnnb) of @objc __C.Gizmo.modifyString(_: Swift.String!, withNumber: Swift.Int, withFoobar: Any!) -> Swift.String!
292-
_$SSo5GizmoC11doSomethingySQyypGSQySaySSGGFToTembnn_ ---> outlined bridged method (mbnn) of @objc __C.Gizmo.doSomething([Swift.String]!) -> Any!
293-
_$SSo5GizmoC12modifyString_10withNumber0D6FoobarSQySSGAF_SiSQyypGtFToTembnnnb_ ---> outlined bridged method (mbnnnb) of @objc __C.Gizmo.modifyString(_: Swift.String!, withNumber: Swift.Int, withFoobar: Any!) -> Swift.String!
294289
_T04test1SVyxGAA1RA2A1ZRzAA1Y2ZZRpzl1A_AhaGPWT ---> {C} associated type witness table accessor for A.ZZ : test.Y in <A where A: test.Z, A.ZZ: test.Y> test.S<A> : test.R in test
295290
_T0s24_UnicodeScalarExceptions33_0E4228093681F6920F0AB2E48B4F1C69LLVACycfC ---> Swift.(_UnicodeScalarExceptions in _0E4228093681F6920F0AB2E48B4F1C69).init() -> Swift.(_UnicodeScalarExceptions in _0E4228093681F6920F0AB2E48B4F1C69)
296291
_T0D ---> _T0D

‎test/IDE/reconstruct_type_from_mangled_name.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ struct HasGenericSubscript<T> {
327327
private
328328
// CHECK: decl: private func patatino<T>(_ vers1: T, _ vers2: T) -> Bool where T : Comparable for
329329
func patatino<T: Comparable>(_ vers1: T, _ vers2: T) -> Bool {
330-
// CHECK: decl: FAILURE for 'T' usr=s:14swift_ide_test8patatino33_D7B956AE2D93947DFA67A1ECF93EF238LLySbx_xts10ComparableRzlF1TL_xmfp decl
331-
// CHECK: decl: let vers1: T for 'vers1' usr=s:14swift_ide_test8patatino33_D7B956AE2D93947DFA67A1ECF93EF238LLySbx_xts10ComparableRzlF5vers1L_xvp
332-
// CHECK: decl: let vers2: T for 'vers2' usr=s:14swift_ide_test8patatino33_D7B956AE2D93947DFA67A1ECF93EF238LLySbx_xts10ComparableRzlF5vers2L_xvp
330+
// CHECK: decl: FAILURE for 'T' usr=s:14swift_ide_test8patatino33_D7B956AE2D93947DFA67A1ECF93EF238LLySbx_xtSLRzlF1TL_xmfp decl
331+
// CHECK: decl: let vers1: T for 'vers1' usr=s:14swift_ide_test8patatino33_D7B956AE2D93947DFA67A1ECF93EF238LLySbx_xtSLRzlF5vers1L_xvp
332+
// CHECK: decl: let vers2: T for 'vers2' usr=s:14swift_ide_test8patatino33_D7B956AE2D93947DFA67A1ECF93EF238LLySbx_xtSLRzlF5vers2L_xvp
333333
return vers1 < vers2;
334334
}

‎test/IRGen/big_types_corner_cases.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ public struct MUseStruct {
185185

186186
// CHECK-LABEL-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @"$S22big_types_corner_cases18stringAndSubstringSS_s0G0VtyF"(<{ %TSS, %Ts9SubstringV }>* noalias nocapture sret) #0 {
187187
// CHECK-LABEL-32: define{{( dllexport)?}}{{( protected)?}} swiftcc void @"$S22big_types_corner_cases18stringAndSubstringSS_s0G0VtyF"(<{ %TSS, [4 x i8], %Ts9SubstringV }>* noalias nocapture sret) #0 {
188-
// CHECK: alloca %Ts9SubstringV
189-
// CHECK: alloca %Ts9SubstringV
188+
// CHECK: alloca %TSs
189+
// CHECK: alloca %TSs
190190
// CHECK: ret void
191191
public func stringAndSubstring() -> (String, Substring) {
192192
let s = "Hello, World"
@@ -207,15 +207,15 @@ public func testGetFunc() {
207207
// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} hidden swiftcc void @"$S22big_types_corner_cases7TestBigC4testyyF"(%T22big_types_corner_cases7TestBigC* swiftself)
208208
// CHECK: [[T0:%.*]] = call swiftcc %swift.metadata_response @"$SSayy22big_types_corner_cases9BigStructVcSgGMa"
209209
// CHECK: [[CALL1:%.*]] = extractvalue %swift.metadata_response [[T0]], 0
210-
// CHECK: [[CALL2:%.*]] = call i8** @"$SSayy22big_types_corner_cases9BigStructVcSgGSayxGs10CollectionsWl
211-
// CHECK: call swiftcc void @"$Ss10CollectionPsE10firstIndex5where0C0QzSgSb7ElementQzKXE_tKF"(%TSq.{{.*}}* noalias nocapture sret {{.*}}, i8* bitcast (i1 (%T22big_types_corner_cases9BigStructVytIegnr_Sg*, %swift.refcounted*, %swift.error**)* @"$S22big_types_corner_cases9BigStructVIegy_SgSbs5Error_pIggdzo_ACytIegnr_SgSbsAE_pIegndzo_TRTA" to i8*), %swift.opaque* {{.*}}, %swift.type* [[CALL1]], i8** [[CALL2]], %swift.opaque* noalias nocapture swiftself
210+
// CHECK: [[CALL2:%.*]] = call i8** @"$SSayy22big_types_corner_cases9BigStructVcSgGSayxGSlsWl
211+
// CHECK: call swiftcc void @"$SSlsE10firstIndex5where0B0QzSgSb7ElementQzKXE_tKF"(%TSq.{{.*}}* noalias nocapture sret {{.*}}, i8* bitcast (i1 (%T22big_types_corner_cases9BigStructVytIegnr_Sg*, %swift.refcounted*, %swift.error**)* @"$S22big_types_corner_cases9BigStructVIegy_SgSbs5Error_pIggdzo_ACytIegnr_SgSbsAE_pIegndzo_TRTA" to i8*), %swift.opaque* {{.*}}, %swift.type* [[CALL1]], i8** [[CALL2]], %swift.opaque* noalias nocapture swiftself
212212
// CHECK: ret void
213213

214214
// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} hidden swiftcc void @"$S22big_types_corner_cases7TestBigC5test2yyF"(%T22big_types_corner_cases7TestBigC* swiftself)
215215
// CHECK: [[T0:%.*]] = call swiftcc %swift.metadata_response @"$SSaySS2ID_y22big_types_corner_cases9BigStructVcSg7handlertGMa"
216216
// CHECK: [[CALL1:%.*]] = extractvalue %swift.metadata_response [[T0]], 0
217-
// CHECK: [[CALL2:%.*]] = call i8** @"$SSaySS2ID_y22big_types_corner_cases9BigStructVcSg7handlertGSayxGs10CollectionsWl"
218-
// CHECK: call swiftcc void @"$Ss10CollectionPss16IndexingIteratorVyxG0C0RtzrlE04makeC0AEyF"(%Ts16IndexingIteratorV* noalias nocapture sret {{.*}}, %swift.type* [[CALL1]], i8** [[CALL2]], %swift.opaque* noalias nocapture swiftself {{.*}})
217+
// CHECK: [[CALL2:%.*]] = call i8** @"$SSaySS2ID_y22big_types_corner_cases9BigStructVcSg7handlertGSayxGSlsWl"
218+
// CHECK: call swiftcc void @"$SSlss16IndexingIteratorVyxG0B0RtzrlE04makeB0ACyF"(%Ts16IndexingIteratorV* noalias nocapture sret {{.*}}, %swift.type* [[CALL1]], i8** [[CALL2]], %swift.opaque* noalias nocapture swiftself {{.*}})
219219
// CHECK: ret void
220220
class TestBig {
221221
typealias Handler = (BigStruct) -> Void

‎test/IRGen/objc_bridge.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ import Foundation
8888
// CHECK: { i8*, i8*, i8* } {
8989
// CHECK: i8* getelementptr inbounds ([11 x i8], [11 x i8]* @"\01L_selector_data(acceptSet:)", i64 0, i64 0),
9090
// CHECK: i8* getelementptr inbounds ([11 x i8], [11 x i8]* @{{[0-9]+}}, i64 0, i64 0),
91-
// CHECK: i8* bitcast (void (%3*, i8*, %4*)* @"$S11objc_bridge3BasC9acceptSetyys0E0VyACSo8NSObjectCs8Hashable10ObjectiveCg_GFTo" to i8*)
91+
// CHECK: i8* bitcast (void (%3*, i8*, %4*)* @"$S11objc_bridge3BasC9acceptSetyyShyACSo8NSObjectCSH10ObjectiveCg_GFTo" to i8*)
9292
// CHECK: }
9393
// CHECK: { i8*, i8*, i8* } {
9494
// CHECK: i8* getelementptr inbounds ([14 x i8], [14 x i8]* @"\01L_selector_data(.cxx_destruct)", i64 0, i64 0),

‎test/IRGen/objc_extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ extension NSDogcow {
179179
@NSManaged var woof: Int
180180
}
181181

182-
// CHECK: @"$SSo8NSObjectC15objc_extensionsE8SomeEnum33_1F05E59585E0BB585FCA206FBFF1A92DLLOs9EquatableACWp" =
182+
// CHECK: @"$SSo8NSObjectC15objc_extensionsE8SomeEnum33_1F05E59585E0BB585FCA206FBFF1A92DLLOSQACWp" =
183183

184184
class SwiftSubGizmo : SwiftBaseGizmo {
185185

‎test/IRGen/objc_generic_class_metadata.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ entry(%0: $Subclass):
7373
unreachable
7474
}
7575

76-
sil @$S27objc_generic_class_metadata8SubclassC7optionsACSgs10DictionaryVySo13GenericOptionaypGSg_tcfcTo : $@convention(objc_method) (@owned Subclass, @owned NSDictionary) -> @owned Subclass {
76+
sil @$S27objc_generic_class_metadata8SubclassC7optionsACSgSDySo13GenericOptionaypGSg_tcfcTo : $@convention(objc_method) (@owned Subclass, @owned NSDictionary) -> @owned Subclass {
7777
entry(%0: $Subclass, %1: $NSDictionary):
7878
unreachable
7979
}

‎test/IRGen/objc_ns_enum.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import gizmo
1111
// CHECK: @"$SSo16NSRuncingOptionsVWV" = linkonce_odr hidden constant
1212
// CHECK: @"$SSo16NSRuncingOptionsVMn" = linkonce_odr hidden constant
1313
// CHECK: @"$SSo16NSRuncingOptionsVN" = linkonce_odr hidden global
14-
// CHECK: @"$SSo16NSRuncingOptionsVs9EquatableSCMc" = linkonce_odr hidden constant %swift.protocol_conformance_descriptor { {{.*}}@"$SSo16NSRuncingOptionsVs9EquatableSCWa
15-
// CHECK: @"$SSo28NeverActuallyMentionedByNameVs9EquatableSCWp" = linkonce_odr hidden constant
14+
// CHECK: @"$SSo16NSRuncingOptionsVSQSCMc" = linkonce_odr hidden constant %swift.protocol_conformance_descriptor { {{.*}}@"$SSo16NSRuncingOptionsVSQSCWa
15+
// CHECK: @"$SSo28NeverActuallyMentionedByNameVSQSCWp" = linkonce_odr hidden constant
1616

1717
// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} i32 @main
1818
// CHECK: call swiftcc %swift.metadata_response @"$SSo16NSRuncingOptionsVMa"(i64 0)
@@ -89,9 +89,9 @@ use_metadata(NSRuncingOptions.mince)
8989
// CHECK-LABEL: define linkonce_odr hidden swiftcc %swift.metadata_response @"$SSo16NSRuncingOptionsVMa"(i64)
9090
// CHECK: call %swift.type* @swift_getForeignTypeMetadata({{.*}} @"$SSo16NSRuncingOptionsVN" {{.*}}) [[NOUNWIND_READNONE:#[0-9]+]]
9191

92-
// CHECK-LABEL: define linkonce_odr hidden i8** @"$SSo16NSRuncingOptionsVs9EquatableSCWa"()
93-
// CHECK: [[NONUNIQUE:%.*]] = call i8** @swift_getGenericWitnessTable(%swift.generic_witness_table_cache* @"$SSo16NSRuncingOptionsVs9EquatableSCWG", %swift.type* null, i8*** null)
94-
// CHECK: [[UNIQUE:%.*]] = call i8** @swift_getForeignWitnessTable(i8** [[NONUNIQUE]], %swift.type_descriptor* bitcast (<{ i32, i32, i32, i32, i32, i32 }>* @"$SSo16NSRuncingOptionsVMn" to %swift.type_descriptor*), %swift.protocol* @"$Ss9EquatableMp")
92+
// CHECK-LABEL: define linkonce_odr hidden i8** @"$SSo16NSRuncingOptionsVSQSCWa"()
93+
// CHECK: [[NONUNIQUE:%.*]] = call i8** @swift_getGenericWitnessTable(%swift.generic_witness_table_cache* @"$SSo16NSRuncingOptionsVSQSCWG", %swift.type* null, i8*** null)
94+
// CHECK: [[UNIQUE:%.*]] = call i8** @swift_getForeignWitnessTable(i8** [[NONUNIQUE]], %swift.type_descriptor* bitcast (<{ i32, i32, i32, i32, i32, i32 }>* @"$SSo16NSRuncingOptionsVMn" to %swift.type_descriptor*), %swift.protocol* @"$SSQMp")
9595
// CHECK: ret i8** [[UNIQUE]]
9696

9797
@objc enum ExportedToObjC: Int {

‎test/IRGen/objc_pointers.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
import Foundation
99

1010
@objc class Foo : NSObject {
11-
// CHECK: define internal void @"$S13objc_pointers3FooC16pointerArguments_1y1z1wySpySiG_SvSPySiGs33AutoreleasingUnsafeMutablePointerVyACSgGtFTo"(%0*, i8*, i64*, i8*, i64*, %0**)
11+
// CHECK: define internal void @"$S13objc_pointers3FooC16pointerArguments_1y1z1wySpySiG_SvSPySiGSAyACSgGtFTo"(%0*, i8*, i64*, i8*, i64*, %0**)
1212
@objc func pointerArguments(_ x: UnsafeMutablePointer<Int>,
1313
y: UnsafeMutableRawPointer,
1414
z: UnsafePointer<Int>,
1515
w: AutoreleasingUnsafeMutablePointer<Foo?>) {}
1616

17-
// CHECK: define internal void @"$S13objc_pointers3FooC24pointerMetatypeArguments1x1yys33AutoreleasingUnsafeMutablePointerVyyXlXpG_AHyyXlXpSgGtFTo"(%0*, i8*, i8**, i8**)
17+
// CHECK: define internal void @"$S13objc_pointers3FooC24pointerMetatypeArguments1x1yySAyyXlXpG_SAyyXlXpSgGtFTo"(%0*, i8*, i8**, i8**)
1818
@objc func pointerMetatypeArguments(x: AutoreleasingUnsafeMutablePointer<AnyClass>,
1919
y: AutoreleasingUnsafeMutablePointer<AnyClass?>) {}
2020
}

‎test/IRGen/property_descriptor.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ sil_property #ExternalGeneric.computedRW <T: Comparable> (
7777
getter @get_computed_generic : $@convention(thin) <T: Comparable> (@in_guaranteed ExternalGeneric<T>) -> @out T,
7878
setter @set_computed_generic : $@convention(thin) <T: Comparable> (@in_guaranteed T, @inout ExternalGeneric<T>) -> ())
7979

80-
// CHECK: @"$S19property_descriptor15ExternalGenericVyxqd__cs8HashableRd__luipMV" ={{( dllexport)?}}{{( protected)?}} constant
80+
// CHECK: @"$S19property_descriptor15ExternalGenericVyxqd__cSHRd__luipMV" ={{( dllexport)?}}{{( protected)?}} constant
8181
// -- 0x01c8_0000 - computed, settable, mutating, has arguments
8282
// CHECK-SAME: <{ <i32 0x01c8_0000>,
8383
// CHECK-SAME: @id_computed,

‎test/IRGen/reflection_metadata_imported.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import c_layout
77
// CHECK-DAG: @"$S28reflection_metadata_imported15HasImportedTypeVMF" = internal constant {{.*}}section "{{[^"]*swift5_fieldmd|.sw5flmd\$B}}
88
// CHECK-DAG: @"$SSo1AVMB" = linkonce_odr hidden constant {{.*}}section "{{[^"]*swift5_builtin|.sw5bltn\$B}}
99
// CHECK-DAG: @"$SSo11CrappyColorVMB" = linkonce_odr hidden constant {{.*}}section "{{[^"]*swift5_builtin|.sw5bltn\$B}}
10-
// CHECK-DAG: @"$SSo11CrappyColorVs16RawRepresentableSCMA" = linkonce_odr hidden constant {{.*}}section "{{[^"]*swift5_assocty|.sw5asty\$B}}
10+
// CHECK-DAG: @"$SSo11CrappyColorVSYSCMA" = linkonce_odr hidden constant {{.*}}section "{{[^"]*swift5_assocty|.sw5asty\$B}}
1111

1212
struct HasImportedType {
1313
let a: A

‎test/IRGen/synthesized_conformance.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,24 @@ extension Nonfinal: Encodable where T: Encodable {}
3232
func doEquality<T: Equatable>(_: T) {}
3333
// CHECK-LABEL: define{{( dllexport| protected)?}} swiftcc void @"$S23synthesized_conformance8equalityyyF"()
3434
public func equality() {
35-
// CHECK: [[Struct_Equatable:%.*]] = call i8** @"$S23synthesized_conformance6StructVySiGACyxGs9EquatableAAsAFRzlWl"()
36-
// CHECK-NEXT: call swiftcc void @"$S23synthesized_conformance10doEqualityyyxs9EquatableRzlF"(%swift.opaque* noalias nocapture {{%.*}}, %swift.type* {{%.*}}, i8** [[Struct_Equatable]])
35+
// CHECK: [[Struct_Equatable:%.*]] = call i8** @"$S23synthesized_conformance6StructVySiGACyxGSQAASQRzlWl"()
36+
// CHECK-NEXT: call swiftcc void @"$S23synthesized_conformance10doEqualityyyxSQRzlF"(%swift.opaque* noalias nocapture {{%.*}}, %swift.type* {{%.*}}, i8** [[Struct_Equatable]])
3737
doEquality(Struct(x: 1))
38-
// CHECK: [[Enum_Equatable:%.*]] = call i8** @"$S23synthesized_conformance4EnumOySiGACyxGs9EquatableAAsAFRzlWl"()
39-
// CHECK-NEXT: call swiftcc void @"$S23synthesized_conformance10doEqualityyyxs9EquatableRzlF"(%swift.opaque* noalias nocapture {{%.*}}, %swift.type* {{%.*}}, i8** [[Enum_Equatable]])
38+
// CHECK: [[Enum_Equatable:%.*]] = call i8** @"$S23synthesized_conformance4EnumOySiGACyxGSQAASQRzlWl"()
39+
// CHECK-NEXT: call swiftcc void @"$S23synthesized_conformance10doEqualityyyxSQRzlF"(%swift.opaque* noalias nocapture {{%.*}}, %swift.type* {{%.*}}, i8** [[Enum_Equatable]])
4040
doEquality(Enum.a(1))
4141
}
4242

4343
func doEncodable<T: Encodable>(_: T) {}
4444
// CHECK-LABEL: define{{( dllexport| protected)?}} swiftcc void @"$S23synthesized_conformance9encodableyyF"()
4545
public func encodable() {
46-
// CHECK: [[Struct_Encodable:%.*]] = call i8** @"$S23synthesized_conformance6StructVySiGACyxGs9EncodableAAs9DecodableRzsAFRzlWl"()
47-
// CHECK-NEXT: call swiftcc void @"$S23synthesized_conformance11doEncodableyyxs0D0RzlF"(%swift.opaque* noalias nocapture {{%.*}}, %swift.type* {{%.*}}, i8** [[Struct_Encodable]])
46+
// CHECK: [[Struct_Encodable:%.*]] = call i8** @"$S23synthesized_conformance6StructVySiGACyxGSEAASeRzSERzlWl"()
47+
// CHECK-NEXT: call swiftcc void @"$S23synthesized_conformance11doEncodableyyxSERzlF"(%swift.opaque* noalias nocapture {{%.*}}, %swift.type* {{%.*}}, i8** [[Struct_Encodable]])
4848
doEncodable(Struct(x: 1))
49-
// CHECK: [[Final_Encodable:%.*]] = call i8** @"$S23synthesized_conformance5FinalCySiGACyxGs9EncodableAAsAFRzlWl"()
50-
// CHECK-NEXT: call swiftcc void @"$S23synthesized_conformance11doEncodableyyxs0D0RzlF"(%swift.opaque* noalias nocapture {{%.*}}, %swift.type* {{%.*}}, i8** [[Final_Encodable]])
49+
// CHECK: [[Final_Encodable:%.*]] = call i8** @"$S23synthesized_conformance5FinalCySiGACyxGSEAASERzlWl"()
50+
// CHECK-NEXT: call swiftcc void @"$S23synthesized_conformance11doEncodableyyxSERzlF"(%swift.opaque* noalias nocapture {{%.*}}, %swift.type* {{%.*}}, i8** [[Final_Encodable]])
5151
doEncodable(Final(x: 1))
52-
// CHECK: [[Nonfinal_Encodable:%.*]] = call i8** @"$S23synthesized_conformance8NonfinalCySiGACyxGs9EncodableAAsAFRzlWl"()
53-
// CHECK-NEXT: call swiftcc void @"$S23synthesized_conformance11doEncodableyyxs0D0RzlF"(%swift.opaque* noalias nocapture {{%.*}}, %swift.type* {{%.*}}, i8** [[Nonfinal_Encodable]])
52+
// CHECK: [[Nonfinal_Encodable:%.*]] = call i8** @"$S23synthesized_conformance8NonfinalCySiGACyxGSEAASERzlWl"()
53+
// CHECK-NEXT: call swiftcc void @"$S23synthesized_conformance11doEncodableyyxSERzlF"(%swift.opaque* noalias nocapture {{%.*}}, %swift.type* {{%.*}}, i8** [[Nonfinal_Encodable]])
5454
doEncodable(Nonfinal(x: 1))
5555
}

‎test/Migrator/Inputs/API.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
"NodeKind": "Function",
210210
"NodeAnnotation": "UnwrapOptional",
211211
"ChildIndex": "1:1",
212-
"LeftUsr": "s:6CitiesAAC7mareeba1x1yys10DictionaryVySSABSgG_AGySSABGSgtF",
212+
"LeftUsr": "s:6CitiesAAC7mareeba1x1yySDySSABSgG_SDySSABGSgtF",
213213
"LeftComment": "",
214214
"RightUsr": "",
215215
"RightComment": "",
@@ -220,7 +220,7 @@
220220
"NodeKind": "Function",
221221
"NodeAnnotation": "WrapOptional",
222222
"ChildIndex": "1:0",
223-
"LeftUsr": "s:6CitiesAAC7mareeba1x1yys10DictionaryVySSABSgG_AGySSABGSgtF",
223+
"LeftUsr": "s:6CitiesAAC7mareeba1x1yySDySSABSgG_SDySSABGSgtF",
224224
"LeftComment": "",
225225
"RightUsr": "",
226226
"RightComment": "",
@@ -231,7 +231,7 @@
231231
"NodeKind": "Function",
232232
"NodeAnnotation": "UnwrapOptional",
233233
"ChildIndex": "2",
234-
"LeftUsr": "s:6CitiesAAC7mareeba1x1yys10DictionaryVySSABSgG_AGySSABGSgtF",
234+
"LeftUsr": "s:6CitiesAAC7mareeba1x1yySDySSABSgG_SDySSABGSgtF",
235235
"LeftComment": "",
236236
"RightUsr": "",
237237
"RightComment": "",
@@ -242,7 +242,7 @@
242242
"NodeKind": "Function",
243243
"NodeAnnotation": "TypeRewritten",
244244
"ChildIndex": "2:0:0",
245-
"LeftUsr": "s:6CitiesAAC7mareeba1x1yys10DictionaryVySSABSgG_AGySSABGSgtF",
245+
"LeftUsr": "s:6CitiesAAC7mareeba1x1yySDySSABSgG_SDySSABGSgtF",
246246
"LeftComment": "String",
247247
"RightUsr": "",
248248
"RightComment": "Int",
@@ -253,7 +253,7 @@
253253
"NodeKind": "Function",
254254
"NodeAnnotation": "ImplicitOptionalToOptional",
255255
"ChildIndex": "1",
256-
"LeftUsr": "s:6CitiesAAC7yandina1xySays10DictionaryVySSABGGSg_tF",
256+
"LeftUsr": "s:6CitiesAAC7yandina1xySaySDySSABGGSg_tF",
257257
"LeftComment": "",
258258
"RightUsr": "",
259259
"RightComment": "",
@@ -264,7 +264,7 @@
264264
"NodeKind": "Function",
265265
"NodeAnnotation": "TypeRewritten",
266266
"ChildIndex": "1:0:0:0",
267-
"LeftUsr": "s:6CitiesAAC7yandina1xySays10DictionaryVySSABGGSg_tF",
267+
"LeftUsr": "s:6CitiesAAC7yandina1xySaySDySSABGGSg_tF",
268268
"LeftComment": "",
269269
"RightUsr": "",
270270
"RightComment": "Int",
@@ -286,7 +286,7 @@
286286
"NodeKind": "Function",
287287
"NodeAnnotation": "UnwrapOptional",
288288
"ChildIndex": "0:0",
289-
"LeftUsr": "s:6CitiesAAC5noosaSays10DictionaryVySSABGSgGyF",
289+
"LeftUsr": "s:6CitiesAAC5noosaSaySDySSABGSgGyF",
290290
"LeftComment": "",
291291
"RightUsr": "",
292292
"RightComment": "",
@@ -297,7 +297,7 @@
297297
"NodeKind": "Function",
298298
"NodeAnnotation": "TypeRewritten",
299299
"ChildIndex": "0:0:0:0",
300-
"LeftUsr": "s:6CitiesAAC5noosaSays10DictionaryVySSABGSgGyF",
300+
"LeftUsr": "s:6CitiesAAC5noosaSaySDySSABGSgGyF",
301301
"LeftComment": "",
302302
"RightUsr": "",
303303
"RightComment": "Int",
@@ -308,7 +308,7 @@
308308
"NodeKind": "Function",
309309
"NodeAnnotation": "TypeRewritten",
310310
"ChildIndex": "1:1:1:0:0",
311-
"LeftUsr": "s:6Cities05ExtraA0P6coolum1xys10DictionaryVySSAGySiSaySSSgGGG_tF",
311+
"LeftUsr": "s:6Cities05ExtraA0P6coolum1xySDySSSDySiSaySSSgGGG_tF",
312312
"LeftComment": "",
313313
"RightUsr": "",
314314
"RightComment": "[String]",
@@ -319,7 +319,7 @@
319319
"NodeKind": "Function",
320320
"NodeAnnotation": "UnwrapOptional",
321321
"ChildIndex": "1:1:1:0",
322-
"LeftUsr": "s:6Cities05ExtraA0P6coolum1xys10DictionaryVySSAGySiSaySSSgGGG_tF",
322+
"LeftUsr": "s:6Cities05ExtraA0P6coolum1xySDySSSDySiSaySSSgGGG_tF",
323323
"LeftComment": "",
324324
"RightUsr": "",
325325
"RightComment": "",

0 commit comments

Comments
 (0)