Various test updates for Linux, Windows, iOS, and x86_64 macOS

DougGregor · DougGregor · commit 523b3b7ab761 · 2025-10-30T09:45:10.000-07:00
diff --git a/test/Interop/Cxx/class/inheritance/subscript-irgen.swift b/test/Interop/Cxx/class/inheritance/subscript-irgen.swift
@@ -9,6 +9,6 @@ func testGetX() -> CInt {
 
 let _ = testGetX()
 
-// CHECK: define {{.*}}linkonce_odr{{.*}} i32 @_ZNK30CopyTrackedDerivedDerivedClass67__synthesizedBaseCall_operatorSubscriptC__ZTS20CopyTrackedBaseClassEi(ptr {{.*}} %[[THIS_PTR:.*]], i32 {{.*}})
+// CHECK: define {{.*}}linkonce_odr{{.*}} i32 @{{.*}}synthesizedBaseCall_operatorSubscriptC{{.*}}(ptr {{.*}} %[[THIS_PTR:.*]], i32 {{.*}})
 // CHECK: %[[ADD_PTR:.*]] = getelementptr inbounds i8, ptr %{{.*}}, i{{32|64}} 4
 // CHECK: {{.*}}call {{.*}} i32 @{{.*}}CopyTrackedBaseClass{{.*}}(ptr {{.*}} %[[ADD_PTR]], i32 {{.*}}){{.*}}
diff --git a/test/Interop/Cxx/class/inheritance/virtual-methods-irgen.swift b/test/Interop/Cxx/class/inheritance/virtual-methods-irgen.swift
@@ -23,12 +23,12 @@ d4.f()
 // CHECK: call swiftcc {{.*}} @"$sSo8Derived4V1fs5Int32VyF"
 
 // CHECK: define {{.*}} @"$sSo8Derived4V1fs5Int32VyF"(ptr swiftself dereferenceable
-// CHECK: call {{.*}}  @{{_ZN8Derived434__synthesizedBaseCall_f__ZTS5Base3Ev|"\?__synthesizedBaseCall_ZTS5Base3Ev@@QEAAHXZ"}}
+// CHECK: call {{.*}}  @{{.*}}__synthesizedBaseCall_{{.*}}
 
 // CHECK: define {{.*}}void @{{_ZN7DerivedIiE3fooEv|"\?foo@\?\$Derived@H@@UEAAXXZ"}}
-// CHECK:   call void @{{_Z21testFunctionCollectedv|"\?testFunctionCollected@@YAXXZ"}}
+// CHECK:   call void @{{.*}}testFunctionCollected
 
-// CHECK: define {{.*}}void @{{_Z21testFunctionCollectedv|"\?testFunctionCollected@@YAXXZ"}}
+// CHECK: define {{.*}}void @{{.*}}testFunctionCollected
 
 // CHECK-NOT: _ZN6UnusedIiE3fooEv
 // CHECK-NOT: "\?foo@\?\$Unused@H@@UEAAXXZ"
diff --git a/test/Interop/Cxx/class/method/methods-silgen.swift b/test/Interop/Cxx/class/method/methods-silgen.swift
@@ -3,10 +3,10 @@
 import Methods
 
 // clang name: ReferenceParams::ReferenceParams
-// CHECK: sil [asmname "_ZN15ReferenceParamsC1ERKiS1_"] [clang ReferenceParams.init] @$sSo15ReferenceParamsVyABs5Int32V_ADtcfCTo : $@convention(c) (@in_guaranteed Int32, @in_guaranteed Int32) -> @out ReferenceParams
+// CHECK: sil [asmname "{{.*}}"] [clang ReferenceParams.init] @$sSo15ReferenceParamsVyABs5Int32V_ADtcfCTo : $@convention(c) (@in_guaranteed Int32, @in_guaranteed Int32) -> @out ReferenceParams
 
 // clang name: ReferenceParams::staticMethod
-// CHECK: sil [asmname "_ZN15ReferenceParams12staticMethodERKiS1_"] [clang ReferenceParams.staticMethod] @$sSo15ReferenceParamsV12staticMethodyys5Int32V_AEtFZTo : $@convention(c) (@in_guaranteed Int32, @in_guaranteed Int32) -> ()
+// CHECK: sil [asmname "{{.*}}staticMethod{{.*}}"] [clang ReferenceParams.staticMethod] @$sSo15ReferenceParamsV12staticMethodyys5Int32V_AEtFZTo : $@convention(c) (@in_guaranteed Int32, @in_guaranteed Int32) -> ()
 
 public func use() {
   let a = CInt(42)
diff --git a/test/Interop/Cxx/class/type-classification-non-trivial-silgen-windows.swift b/test/Interop/Cxx/class/type-classification-non-trivial-silgen-windows.swift
@@ -8,13 +8,13 @@ import TypeClassification
 // "destroy_addr".
 // CHECK-LABEL: sil [ossa] @$s4main24testStructWithDestructoryyF
 // CHECK: [[AS:%.*]] = alloc_stack [lexical] [var_decl] $StructWithDestructor
-// CHECK: [[FN:%.*]] = function_ref @{{_ZN20StructWithDestructorC1Ev|\?\?0StructWithDestructor@@QEAA@XZ}} : $@convention(c) () -> @out StructWithDestructor
+// CHECK: [[FN:%.*]] = function_ref @$sSo20StructWithDestructorVABycfCTo : $@convention(c) () -> @out StructWithDestructor
 // CHECK: apply [[FN]]([[AS]]) : $@convention(c) () -> @out StructWithDestructor
 // CHECK: destroy_addr [[AS]]
 // CHECK: dealloc_stack %0 : $*StructWithDestructor
 // CHECK-LABEL: end sil function '$s4main24testStructWithDestructoryyF'
 
-// CHECK-LABEL: sil [clang StructWithDestructor.init] @{{_ZN20StructWithDestructorC1Ev|\?\?0StructWithDestructor@@QEAA@XZ}} : $@convention(c) () -> @out StructWithDestructor
+// CHECK-LABEL: sil [asmname "{{.*}}"] [clang StructWithDestructor.init] @{{.*}}StructWithDestructor{{.*}} : $@convention(c) () -> @out StructWithDestructor
 public func testStructWithDestructor() {
   let d = StructWithDestructor()
 }
diff --git a/test/Interop/Cxx/class/type-classification-non-trivial-silgen.swift b/test/Interop/Cxx/class/type-classification-non-trivial-silgen.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swiftxx-frontend -I %S/Inputs -Xllvm -sil-print-types -emit-silgen %s | %FileCheck --dump-input-filter=all %s
 
-// REQUIRES: OS=macosx || OS=linux-android
+// REQUIRES: OS=macosx || OS=linux-android || OS=windows-msvc
 
 import TypeClassification
 
diff --git a/test/Interop/Cxx/foreign-reference/move-only-silgen.swift b/test/Interop/Cxx/foreign-reference/move-only-silgen.swift
@@ -25,4 +25,4 @@ public func test() {
   _ = x.test()
 }
 
-// CHECK-LABEL: sil [available 13.3.0] [asmname "_ZN8MoveOnly6createEv"] [clang MoveOnly.create] @$sSo8MoveOnlyV6createAByFZTo : $@convention(c) () -> MoveOnly
+// CHECK-LABEL: sil {{.*}}[asmname "{{.*}}create{{.*}}"] [clang MoveOnly.create] @$sSo8MoveOnlyV6createAByFZTo : $@convention(c) () -> MoveOnly
diff --git a/test/Interop/Cxx/foreign-reference/pod-silgen.swift b/test/Interop/Cxx/foreign-reference/pod-silgen.swift
@@ -32,4 +32,4 @@ public func test() {
   _ = x.test()
 }
 
-// CHECK-LABEL: sil [available 13.3.0] [asmname "_ZN7IntPair6createEv"] [clang IntPair.create] @$sSo7IntPairV6createAByFZTo : $@convention(c) () -> IntPair
+// CHECK-LABEL: sil {{.*}}[asmname "{{.*}}create{{.*}}"] [clang IntPair.create] @$sSo7IntPairV6createAByFZTo : $@convention(c) () -> IntPair
diff --git a/test/Interop/Cxx/foreign-reference/singleton-silgen.swift b/test/Interop/Cxx/foreign-reference/singleton-silgen.swift
@@ -31,8 +31,8 @@ public func test() {
   mutateIt(x)
 }
 
-// CHECK-LABEL: sil [available 13.3.0] [asmname "_ZN21DeletedSpecialMembers6createEv"] [clang DeletedSpecialMembers.create] @$sSo21DeletedSpecialMembersV6createAByFZTo : $@convention(c) () -> DeletedSpecialMembers
+// CHECK-LABEL: sil {{.*}}[asmname "{{.*}}create{{.*}}"] [clang DeletedSpecialMembers.create] @$sSo21DeletedSpecialMembersV6createAByFZTo : $@convention(c) () -> DeletedSpecialMembers
 
-// CHECK-LABEL: sil [available 13.3.0] [asmname "_ZNK21DeletedSpecialMembers4testEv"] [clang DeletedSpecialMembers.test] @$sSo21DeletedSpecialMembersV4tests5Int32VyFTo : $@convention(cxx_method) (DeletedSpecialMembers) -> Int32
+// CHECK-LABEL: sil {{.*}}[asmname "{{.*}}test{{.*}}"] [clang DeletedSpecialMembers.test] @$sSo21DeletedSpecialMembersV4tests5Int32VyFTo : $@convention(cxx_method) (DeletedSpecialMembers) -> Int32
 
-// CHECK-LABEL: sil [serialized] [asmname "_Z8mutateItR21DeletedSpecialMembers"] [clang mutateIt] @$sSo8mutateItyySo21DeletedSpecialMembersVFTo : $@convention(c) (DeletedSpecialMembers) -> ()
+// CHECK-LABEL: sil [serialized] [asmname "{{.*}}mutate{{.*}}"] [clang mutateIt] @$sSo8mutateItyySo21DeletedSpecialMembersVFTo : $@convention(c) (DeletedSpecialMembers) -> ()
diff --git a/test/Interop/Cxx/operators/member-inline-silgen.swift b/test/Interop/Cxx/operators/member-inline-silgen.swift
@@ -28,7 +28,7 @@ public func call(_ wrapper: inout LoadableIntWrapper, _ arg: Int32) -> Int32 { w
 // CHECK: apply [[OP]]([[RHS]], [[SELFACCESS]]) : $@convention(cxx_method) (Int32, @inout LoadableIntWrapper) -> Int32
 // CHECK: end_access [[SELFACCESS]] : $*LoadableIntWrapper
 
-// CHECK: sil [asmname "_ZN18LoadableIntWrapperclEi"] [clang LoadableIntWrapper.callAsFunction] @$sSo18LoadableIntWrapperV14callAsFunctionys5Int32VAEFTo : $@convention(cxx_method) (Int32, @inout LoadableIntWrapper) -> Int32
+// CHECK: sil [asmname "{{.*}}"] [clang LoadableIntWrapper.callAsFunction] @$sSo18LoadableIntWrapperV14callAsFunctionys5Int32VAEFTo : $@convention(cxx_method) (Int32, @inout LoadableIntWrapper) -> Int32
 
 public func call(_ wrapper: inout AddressOnlyIntWrapper) -> Int32 { wrapper() }
 
@@ -38,7 +38,7 @@ public func call(_ wrapper: inout AddressOnlyIntWrapper) -> Int32 { wrapper() }
 // CHECK: apply [[OP]]([[SELFACCESS]]) : $@convention(cxx_method) (@inout AddressOnlyIntWrapper) -> Int32
 // CHECK: end_access [[SELFACCESS]] : $*AddressOnlyIntWrapper
 
-// CHECK: sil [asmname "_ZN21AddressOnlyIntWrapperclEv"] [clang AddressOnlyIntWrapper.callAsFunction] @$sSo21AddressOnlyIntWrapperV14callAsFunctions5Int32VyFTo : $@convention(cxx_method) (@inout AddressOnlyIntWrapper) -> Int32
+// CHECK: sil [asmname "{{.*}}"] [clang AddressOnlyIntWrapper.callAsFunction] @$sSo21AddressOnlyIntWrapperV14callAsFunctions5Int32VyFTo : $@convention(cxx_method) (@inout AddressOnlyIntWrapper) -> Int32
 
 public func index(_ arr: ReadOnlyIntArray, _ arg: Int32) -> Int32 { arr[arg] }
 
@@ -180,12 +180,12 @@ public func subscriptUnnamed(_ unnamed: SubscriptUnnamedParameter, _ arg: Int32)
 // CHECK:   dealloc_stack [[SELFACCESS]]
 // CHECK: } // end sil function '$sSo25SubscriptUnnamedParameterVys5Int32VADcig'
 
-// CHECK: sil [asmname "_ZNK16ReadOnlyIntArrayixEi"] [clang ReadOnlyIntArray.__operatorSubscriptConst] @$sSo16ReadOnlyIntArrayV24__operatorSubscriptConstySPys5Int32VGAEFTo : $@convention(cxx_method) (Int32, @in_guaranteed ReadOnlyIntArray) -> UnsafePointer<Int32>
-// CHECK: sil [asmname "_ZN17ReadWriteIntArrayixEi"] [clang ReadWriteIntArray.__operatorSubscript] @$sSo17ReadWriteIntArrayV19__operatorSubscriptySpys5Int32VGAEFTo : $@convention(cxx_method) (Int32, @inout ReadWriteIntArray) -> UnsafeMutablePointer<Int32>
-// CHECK: sil [asmname "_ZNK23NonTrivialIntArrayByValixEi"] [clang NonTrivialIntArrayByVal.__operatorSubscriptConst] @$sSo23NonTrivialIntArrayByValV24__operatorSubscriptConstys5Int32VAEFTo : $@convention(cxx_method) (Int32, @in_guaranteed NonTrivialIntArrayByVal) -> Int32
+// CHECK: sil [asmname "{{.*}}ReadOnlyIntArray{{.*}}"] [clang ReadOnlyIntArray.__operatorSubscriptConst] @$sSo16ReadOnlyIntArrayV24__operatorSubscriptConstySPys5Int32VGAEFTo : $@convention(cxx_method) (Int32, @in_guaranteed ReadOnlyIntArray) -> UnsafePointer<Int32>
+// CHECK: sil [asmname "{{.*}}ReadWriteIntArray{{.*}}"] [clang ReadWriteIntArray.__operatorSubscript] @$sSo17ReadWriteIntArrayV19__operatorSubscriptySpys5Int32VGAEFTo : $@convention(cxx_method) (Int32, @inout ReadWriteIntArray) -> UnsafeMutablePointer<Int32>
+// CHECK: sil [asmname "{{.*}}NonTrivialIntArrayByVal{{.*}}"] [clang NonTrivialIntArrayByVal.__operatorSubscriptConst] @$sSo23NonTrivialIntArrayByValV24__operatorSubscriptConstys5Int32VAEFTo : $@convention(cxx_method) (Int32, @in_guaranteed NonTrivialIntArrayByVal) -> Int32
 
-// CHECK: sil [asmname "_ZN8PtrByValixEi"] [clang PtrByVal.__operatorSubscript] @$sSo8PtrByValV19__operatorSubscriptySpys5Int32VGSgAEFTo : $@convention(cxx_method) (Int32, @inout PtrByVal) -> Optional<UnsafeMutablePointer<Int32>>
-// CHECK: sil [asmname "_ZN8RefToPtrixEi"] [clang RefToPtr.__operatorSubscript] @$sSo8RefToPtrV19__operatorSubscriptySpySpys5Int32VGSgGAEFTo : $@convention(cxx_method) (Int32, @inout RefToPtr) -> UnsafeMutablePointer<Optional<UnsafeMutablePointer<Int32>>>
-// CHECK: sil [asmname "_ZN8PtrToPtrixEi"] [clang PtrToPtr.__operatorSubscript] @$sSo05PtrToA0V19__operatorSubscriptySpySpys5Int32VGSgGSgAEFTo : $@convention(cxx_method) (Int32, @inout PtrToPtr) -> Optional<UnsafeMutablePointer<Optional<UnsafeMutablePointer<Int32>>>>
-// CHECK: sil [asmname "_ZNK15ConstOpPtrByValixEi"] [clang ConstOpPtrByVal.__operatorSubscriptConst] @$sSo15ConstOpPtrByValV019__operatorSubscriptA0ySPys5Int32VGSgAEFTo : $@convention(cxx_method) (Int32, @in_guaranteed ConstOpPtrByVal) -> Optional<UnsafePointer<Int32>>
-// CHECK: sil [asmname "_ZN13ConstPtrByValixEi"] [clang ConstPtrByVal.__operatorSubscriptConst] @$sSo13ConstPtrByValV019__operatorSubscriptA0ySPys5Int32VGSgAEFTo : $@convention(cxx_method) (Int32, @inout ConstPtrByVal) -> Optional<UnsafePointer<Int32>>
+// CHECK: sil [asmname "{{.*}}PtrByVal{{.*}}"] [clang PtrByVal.__operatorSubscript] @$sSo8PtrByValV19__operatorSubscriptySpys5Int32VGSgAEFTo : $@convention(cxx_method) (Int32, @inout PtrByVal) -> Optional<UnsafeMutablePointer<Int32>>
+// CHECK: sil [asmname "{{.*}}RefToPtr{{.*}}"] [clang RefToPtr.__operatorSubscript] @$sSo8RefToPtrV19__operatorSubscriptySpySpys5Int32VGSgGAEFTo : $@convention(cxx_method) (Int32, @inout RefToPtr) -> UnsafeMutablePointer<Optional<UnsafeMutablePointer<Int32>>>
+// CHECK: sil [asmname "{{.*}}PtrToPtr{{.*}}"] [clang PtrToPtr.__operatorSubscript] @$sSo05PtrToA0V19__operatorSubscriptySpySpys5Int32VGSgGSgAEFTo : $@convention(cxx_method) (Int32, @inout PtrToPtr) -> Optional<UnsafeMutablePointer<Optional<UnsafeMutablePointer<Int32>>>>
+// CHECK: sil [asmname "{{.*}}ConstOpPtrByVal{{.*}}"] [clang ConstOpPtrByVal.__operatorSubscriptConst] @$sSo15ConstOpPtrByValV019__operatorSubscriptA0ySPys5Int32VGSgAEFTo : $@convention(cxx_method) (Int32, @in_guaranteed ConstOpPtrByVal) -> Optional<UnsafePointer<Int32>>
+// CHECK: sil [asmname "{{.*}}ConstPtrByVal{{.*}}"] [clang ConstPtrByVal.__operatorSubscriptConst] @$sSo13ConstPtrByValV019__operatorSubscriptA0ySPys5Int32VGSgAEFTo : $@convention(cxx_method) (Int32, @inout ConstPtrByVal) -> Optional<UnsafePointer<Int32>>
diff --git a/test/Interop/Cxx/operators/member-out-of-line-silgen.swift b/test/Interop/Cxx/operators/member-out-of-line-silgen.swift
@@ -9,11 +9,11 @@ public func add(_ lhs: LoadableIntWrapper, _ rhs: LoadableIntWrapper) -> Loadabl
 // CHECK-SYSV:   [[FUNC:%.*]] = function_ref @$sSo18LoadableIntWrapperV14__operatorPlusyA2BFTo : $@convention(cxx_method) (LoadableIntWrapper, @in_guaranteed LoadableIntWrapper) -> LoadableIntWrapper
 // CHECK-SYSV:   apply [[FUNC]]([[ACCESS:%.*]], [[STORE_LOC]]) : $@convention(cxx_method) (LoadableIntWrapper, @in_guaranteed LoadableIntWrapper) -> LoadableIntWrapper
 
-// CHECK-SYSV: sil [asmname "_ZNK18LoadableIntWrapperplES_"] [clang LoadableIntWrapper.__operatorPlus] @$sSo18LoadableIntWrapperV14__operatorPlusyA2BFTo : $@convention(cxx_method) (LoadableIntWrapper, @in_guaranteed LoadableIntWrapper) -> LoadableIntWrapper
+// CHECK-SYSV: sil [asmname "{{.*}}"] [clang LoadableIntWrapper.__operatorPlus] @$sSo18LoadableIntWrapperV14__operatorPlusyA2BFTo : $@convention(cxx_method) (LoadableIntWrapper, @in_guaranteed LoadableIntWrapper) -> LoadableIntWrapper
 
 // CHECK-WIN: bb0([[LHS:%.*]] : $LoadableIntWrapper, [[RHS:%.*]] : $LoadableIntWrapper):
 // CHECK-WIN:   store [[LHS]] to [[STORE_LOC:%.*]] : $*LoadableIntWrapper
 // CHECK-WIN:   [[FUNC:%.*]] = function_ref @$sSo18LoadableIntWrapperV14__operatorPlusyA2BFTo : $@convention(cxx_method) (LoadableIntWrapper, @in_guaranteed LoadableIntWrapper) -> LoadableIntWrapper
 // CHECK-WIN:   apply [[FUNC]]([[ACCESS:%.*]], [[STORE_LOC]]) : $@convention(cxx_method) (LoadableIntWrapper, @in_guaranteed LoadableIntWrapper) -> LoadableIntWrapper
 
-// CHECK-WIN: sil [asmname "_ZNK18LoadableIntWrapperplES_"] [clang LoadableIntWrapper.__operatorPlus] @$sSo18LoadableIntWrapperV14__operatorPlusyA2BFTo : $@convention(cxx_method) (LoadableIntWrapper, @in_guaranteed LoadableIntWrapper) -> LoadableIntWrapper
+// CHECK-WIN: sil [asmname "{{.*}}"] [clang LoadableIntWrapper.__operatorPlus] @$sSo18LoadableIntWrapperV14__operatorPlusyA2BFTo : $@convention(cxx_method) (LoadableIntWrapper, @in_guaranteed LoadableIntWrapper) -> LoadableIntWrapper
diff --git a/test/Interop/Cxx/static/static-member-func-silgen.swift b/test/Interop/Cxx/static/static-member-func-silgen.swift
@@ -12,7 +12,7 @@ func callStaticMemberFunc() -> CInt {
 // CHECK: return [[VALUE]] : $Int32
 
 // CHECK: // clang name: WithStaticMemberFunc::staticMemberFunc
-// CHECK: sil [asmname "_ZN20WithStaticMemberFunc16staticMemberFuncEv"] [clang WithStaticMemberFunc.staticMemberFunc] @$sSo20WithStaticMemberFuncV06staticcD0s5Int32VyFZTo : $@convention(c) () -> Int32
+// CHECK: sil [asmname "{{.*}}staticMemberFunc{{.*}}"] [clang WithStaticMemberFunc.staticMemberFunc] @$sSo20WithStaticMemberFuncV06staticcD0s5Int32VyFZTo : $@convention(c) () -> Int32
 
 func callStaticMemberFuncAddr() -> CInt {
   return WithStaticMemberFunc.getStaticMemberFuncAddress()!()
@@ -23,4 +23,4 @@ func callStaticMemberFuncAddr() -> CInt {
 // CHECK: [[VALUE:%.*]] = apply [[FUNC]]() : $@convention(c) () -> Optional<@convention(c) () -> Int32>
 
 // CHECK: // clang name: WithStaticMemberFunc::getStaticMemberFuncAddress
-// CHECK: sil [asmname "_ZN20WithStaticMemberFunc26getStaticMemberFuncAddressEv"] [clang WithStaticMemberFunc.getStaticMemberFuncAddress] @$sSo20WithStaticMemberFuncV03getbcD7Addresss5Int32VyXCSgyFZTo : $@convention(c) () -> Optional<@convention(c) () -> Int32>
+// CHECK: sil [asmname "{{.*}}getStaticMemberFuncAddress{{.*}}"] [clang WithStaticMemberFunc.getStaticMemberFuncAddress] @$sSo20WithStaticMemberFuncV03getbcD7Addresss5Int32VyXCSgyFZTo : $@convention(c) () -> Optional<@convention(c) () -> Int32>
diff --git a/test/Interop/Cxx/templates/member-templates-silgen.swift b/test/Interop/Cxx/templates/member-templates-silgen.swift
@@ -26,13 +26,13 @@ func basicTest() {
   obj.doNothingConstRef(i)
 }
 
-// CHECK-LABEL: sil [asmname "_ZN18HasMemberTemplates17addSameTypeParamsIiEET_S1_S1_"] [clang HasMemberTemplates.addSameTypeParams] @$sSo18HasMemberTemplatesV17addSameTypeParamsys5Int32VAE_AEtFTo : $@convention(cxx_method) (Int32, Int32, @inout HasMemberTemplates) -> Int32
+// CHECK-LABEL: sil [asmname "{{.*}}addSameTypeParams{{.*}}"] [clang HasMemberTemplates.addSameTypeParams] @$sSo18HasMemberTemplatesV17addSameTypeParamsys5Int32VAE_AEtFTo : $@convention(cxx_method) (Int32, Int32, @inout HasMemberTemplates) -> Int32
 
-// CHECK-LABEL: sil [asmname "_ZN18HasMemberTemplates18addMixedTypeParamsIiiEET_S1_T0_"] [clang HasMemberTemplates.addMixedTypeParams] @$sSo18HasMemberTemplatesV18addMixedTypeParamsys5Int32VAE_AEtFTo : $@convention(cxx_method) (Int32, Int32, @inout HasMemberTemplates) -> Int32
+// CHECK-LABEL: sil [asmname "{{.*}}addMixedTypeParams{{.*}}"] [clang HasMemberTemplates.addMixedTypeParams] @$sSo18HasMemberTemplatesV18addMixedTypeParamsys5Int32VAE_AEtFTo : $@convention(cxx_method) (Int32, Int32, @inout HasMemberTemplates) -> Int32
 
-// CHECK-LABEL: sil [asmname "_ZN18HasMemberTemplates6addAllIiiEEiiT_T0_"] [clang HasMemberTemplates.addAll] @$sSo18HasMemberTemplatesV6addAllys5Int32VAE_A2EtFTo : $@convention(cxx_method) (Int32, Int32, Int32, @inout HasMemberTemplates) -> Int32
+// CHECK-LABEL: sil [asmname "{{.*}}addAll{{.*}}"] [clang HasMemberTemplates.addAll] @$sSo18HasMemberTemplatesV6addAllys5Int32VAE_A2EtFTo : $@convention(cxx_method) (Int32, Int32, Int32, @inout HasMemberTemplates) -> Int32
 
-// CHECK-LABEL: sil [asmname "_ZN18HasMemberTemplates17doNothingConstRefIiEEvRKT_"] [clang HasMemberTemplates.doNothingConstRef] @$sSo18HasMemberTemplatesV17doNothingConstRefyys5Int32VFTo : $@convention(cxx_method) (@in_guaranteed Int32, @inout HasMemberTemplates) -> ()
+// CHECK-LABEL: sil [asmname "{{.*}}doNothingConstRef{{.*}}"] [clang HasMemberTemplates.doNothingConstRef] @$sSo18HasMemberTemplatesV17doNothingConstRefyys5Int32VFTo : $@convention(cxx_method) (@in_guaranteed Int32, @inout HasMemberTemplates) -> ()
 
 // CHECK-LABEL: sil hidden @$s4main12testSetValueyyF : $@convention(thin) () -> ()
 
@@ -65,8 +65,8 @@ func testStaticMembers() {
   HasStaticMemberTemplates.removeReference(&x)
 }
 
-// CHECK: sil hidden_external [asmname "_ZN24HasStaticMemberTemplates3addIlEET_S1_S1_"] [clang HasStaticMemberTemplates.add] @$sSo24HasStaticMemberTemplatesV3addyS2i_SitFZTo : $@convention(c) (Int, Int) -> Int
+// CHECK: sil hidden_external [asmname "{{.*}}add{{.*}}"] [clang HasStaticMemberTemplates.add] @$sSo24HasStaticMemberTemplatesV3addyS2i_SitFZTo : $@convention(c) (Int, Int) -> Int
 
-// CHECK: sil hidden_external [asmname "_ZN24HasStaticMemberTemplates15addTwoTemplatesIlcEET_S1_T0_"] [clang HasStaticMemberTemplates.addTwoTemplates] @$sSo24HasStaticMemberTemplatesV06addTwoD0yS2i_s4Int8VtFZTo : $@convention(c) (Int, Int8) -> Int
+// CHECK: sil hidden_external [asmname "{{.*}}addTwoTemplates{{.*}}"] [clang HasStaticMemberTemplates.addTwoTemplates] @$sSo24HasStaticMemberTemplatesV06addTwoD0yS2i_s4Int8VtFZTo : $@convention(c) (Int, Int8) -> Int
 
-// CHECK: sil hidden_external [asmname "_ZN24HasStaticMemberTemplates15removeReferenceIlEET_RS1_"] [clang HasStaticMemberTemplates.removeReference] @$sSo24HasStaticMemberTemplatesV15removeReferenceyS2izFZTo : $@convention(c) (@inout Int) -> Int
+// CHECK: sil hidden_external [asmname "{{.*}}removeReference{{.*}}"] [clang HasStaticMemberTemplates.removeReference] @$sSo24HasStaticMemberTemplatesV15removeReferenceyS2izFZTo : $@convention(c) (@inout Int) -> Int
diff --git a/test/SILGen/objc_bridging.swift b/test/SILGen/objc_bridging.swift
@@ -513,15 +513,15 @@ func forceNSArrayMembers() -> (NSArray, NSArray) {
 // imported C functions.
 
 // CHECK-ios-i386-LABEL: sil hidden [ossa] @$s13objc_bridging5boolsySb_SbtSbF
-// CHECK-ios-i386:         function_ref @$sSo7useBOOLyySo0B0VFTo : $@convention(c) (ObjCBool) -> ()
+// CHECK-ios-i386:         function_ref @$sSo7useBOOLyySbFTo : $@convention(c) (ObjCBool) -> ()
 // CHECK-ios-i386:         function_ref @$sSo7useBoolyySbFTo : $@convention(c) (Bool) -> ()
-// CHECK-ios-i386:         function_ref @$sSo7getBOOLSo0B0VyFTo : $@convention(c) () -> ObjCBool
+// CHECK-ios-i386:         function_ref @$sSo7getBOOLSbyFTo : $@convention(c) () -> ObjCBool
 // CHECK-ios-i386:         function_ref @$sSo7getBoolSbyFTo : $@convention(c) () -> Bool
 
 // CHECK-macosx-x86_64-LABEL: sil hidden [ossa] @$s13objc_bridging5boolsySb_SbtSbF
-// CHECK-macosx-x86_64:         function_ref @$sSo7useBOOLyySo0B0VFTo : $@convention(c) (ObjCBool) -> ()
+// CHECK-macosx-x86_64:         function_ref @$sSo7useBOOLyySbFTo : $@convention(c) (ObjCBool) -> ()
 // CHECK-macosx-x86_64:         function_ref @$sSo7useBoolyySbFTo : $@convention(c) (Bool) -> ()
-// CHECK-macosx-x86_64:         function_ref @$sSo7getBOOLSo0B0VyFTo : $@convention(c) () -> ObjCBool
+// CHECK-macosx-x86_64:         function_ref @$sSo7getBOOLSbyFTo : $@convention(c) () -> ObjCBool
 // CHECK-macosx-x86_64:         function_ref @$sSo7getBoolSbyFTo : $@convention(c) () -> Bool
 
 // FIXME: no distinction on x86_64, arm64 or watchos-i386, since SILGen looks
diff --git a/test/SILOptimizer/c_string_optimization.swift b/test/SILOptimizer/c_string_optimization.swift

Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,4 @@ public func test() {`
`25`	`25`	`_ = x.test()`
`26`	`26`	`}`
`27`	`27`
`28`		`-// CHECK-LABEL: sil [available 13.3.0] [asmname "_ZN8MoveOnly6createEv"] [clang MoveOnly.create] @$sSo8MoveOnlyV6createAByFZTo : $@convention(c) () -> MoveOnly`
	`28`	`+// CHECK-LABEL: sil {{.}}[asmname "{{.}}create{{.*}}"] [clang MoveOnly.create] @$sSo8MoveOnlyV6createAByFZTo : $@convention(c) () -> MoveOnly`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,4 @@ public func test() {`
`32`	`32`	`_ = x.test()`
`33`	`33`	`}`
`34`	`34`
`35`		`-// CHECK-LABEL: sil [available 13.3.0] [asmname "_ZN7IntPair6createEv"] [clang IntPair.create] @$sSo7IntPairV6createAByFZTo : $@convention(c) () -> IntPair`
	`35`	`+// CHECK-LABEL: sil {{.}}[asmname "{{.}}create{{.*}}"] [clang IntPair.create] @$sSo7IntPairV6createAByFZTo : $@convention(c) () -> IntPair`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public func test() {`
`31`	`31`	`mutateIt(x)`
`32`	`32`	`}`
`33`	`33`
`34`		`-// CHECK-LABEL: sil [available 13.3.0] [asmname "_ZN21DeletedSpecialMembers6createEv"] [clang DeletedSpecialMembers.create] @$sSo21DeletedSpecialMembersV6createAByFZTo : $@convention(c) () -> DeletedSpecialMembers`
	`34`	`+// CHECK-LABEL: sil {{.}}[asmname "{{.}}create{{.*}}"] [clang DeletedSpecialMembers.create] @$sSo21DeletedSpecialMembersV6createAByFZTo : $@convention(c) () -> DeletedSpecialMembers`
`35`	`35`
`36`		`-// CHECK-LABEL: sil [available 13.3.0] [asmname "_ZNK21DeletedSpecialMembers4testEv"] [clang DeletedSpecialMembers.test] @$sSo21DeletedSpecialMembersV4tests5Int32VyFTo : $@convention(cxx_method) (DeletedSpecialMembers) -> Int32`
	`36`	`+// CHECK-LABEL: sil {{.}}[asmname "{{.}}test{{.*}}"] [clang DeletedSpecialMembers.test] @$sSo21DeletedSpecialMembersV4tests5Int32VyFTo : $@convention(cxx_method) (DeletedSpecialMembers) -> Int32`
`37`	`37`
`38`		`-// CHECK-LABEL: sil [serialized] [asmname "_Z8mutateItR21DeletedSpecialMembers"] [clang mutateIt] @$sSo8mutateItyySo21DeletedSpecialMembersVFTo : $@convention(c) (DeletedSpecialMembers) -> ()`
	`38`	`+// CHECK-LABEL: sil [serialized] [asmname "{{.}}mutate{{.}}"] [clang mutateIt] @$sSo8mutateItyySo21DeletedSpecialMembersVFTo : $@convention(c) (DeletedSpecialMembers) -> ()`