Merge pull request #26460 from pschuh/cpp-7

Author: swift-ci

test/ClangImporter/cxx_interop_ir.swift

@@ -29,7 +29,7 @@ func accessNSMember() {
 // CHECK-LABEL: define hidden swiftcc i32 @"$s6cxx_ir12basicMethods1as5Int32VSpySo0D0VG_tF"(i8*)
 // CHECK: [[THIS_PTR1:%.*]] = bitcast i8* %0 to %TSo7MethodsV*
 // CHECK: [[THIS_PTR2:%.*]] = bitcast %TSo7MethodsV* [[THIS_PTR1]] to %class.Methods*
-// CHECK: [[RESULT:%.*]] = call i32 @_ZN7Methods12SimpleMethodEi(%class.Methods* [[THIS_PTR2]], i32 4)
+// CHECK: [[RESULT:%.*]] = call i32 @{{_ZN7Methods12SimpleMethodEi|"\?SimpleMethod@Methods@@QEAAHH@Z"}}(%class.Methods* [[THIS_PTR2]], i32 4)
 // CHECK: ret i32 [[RESULT]]
 func basicMethods(a: UnsafeMutablePointer<Methods>) -> Int32 {
   return a.pointee.SimpleMethod(4)
@@ -38,14 +38,14 @@ func basicMethods(a: UnsafeMutablePointer<Methods>) -> Int32 {
 // CHECK-LABEL: define hidden swiftcc i32 @"$s6cxx_ir17basicMethodsConst1as5Int32VSpySo0D0VG_tF"(i8*)
 // CHECK: [[THIS_PTR1:%.*]] = bitcast i8* %0 to %TSo7MethodsV*
 // CHECK: [[THIS_PTR2:%.*]] = bitcast %TSo7MethodsV* [[THIS_PTR1]] to %class.Methods*
-// CHECK: [[RESULT:%.*]] = call i32 @_ZNK7Methods17SimpleConstMethodEi(%class.Methods* [[THIS_PTR2]], i32 3)
+// CHECK: [[RESULT:%.*]] = call i32 @{{_ZNK7Methods17SimpleConstMethodEi|"\?SimpleConstMethod@Methods@@QEBAHH@Z"}}(%class.Methods* [[THIS_PTR2]], i32 3)
 // CHECK: ret i32 [[RESULT]]
 func basicMethodsConst(a: UnsafeMutablePointer<Methods>) -> Int32 {
   return a.pointee.SimpleConstMethod(3)
 }
 
 // CHECK-LABEL: define hidden swiftcc i32 @"$s6cxx_ir18basicMethodsStatics5Int32VyF"()
-// CHECK: [[RESULT:%.*]] = call i32 @_ZN7Methods18SimpleStaticMethodEi(i32 5)
+// CHECK: [[RESULT:%.*]] = call i32 @{{_ZN7Methods18SimpleStaticMethodEi|"\?SimpleStaticMethod@Methods@@SAHH@Z"}}(i32 5)
 // CHECK: ret i32 [[RESULT]]
 func basicMethodsStatic() -> Int32 {
   return Methods.SimpleStaticMethod(5)