Merge pull request #66865 from aschwaighofer/fix_opaque_pointer_irgen_armv7k

Fix some IRGen tests on armv7k for opaque pointers

Author: swift-ci

test/IRGen/abi_v7k.swift

@@ -296,7 +296,7 @@ func testRet3() -> MyRect2 {
 }
 
 // Returning tuple?: (Int x 6)?
-// CHECK-LABEL: define hidden swiftcc void @"$s8test_v7k7minMax2{{.*}}"({{%TSi.*}} noalias nocapture sret({{.*}}) %0, i32 %1, i32 %2)
+// CHECK-LABEL: define hidden swiftcc void @"$s8test_v7k7minMax2{{.*}}"(ptr noalias nocapture sret({{.*}}) %0, i32 %1, i32 %2)
 // V7K-LABEL: _$s8test_v7k7minMax2
 // We will indirectly return an optional with the address in r0, input parameters will be in r1 and r2
 // V7K: str r0, [sp, [[IDX:#[0-9]+]]]
@@ -324,7 +324,7 @@ func minMax2(x : Int, y : Int) -> (min: Int, max: Int, min2: Int, max2: Int, min
 }
 
 // Returning struct?: {Int x 6}?
-// CHECK-LABEL: define hidden swiftcc void @"$s8test_v7k7minMax3{{.*}}"({{%T.*}} noalias nocapture sret({{.*}}) %0, i32 %1, i32 %2)
+// CHECK-LABEL: define hidden swiftcc void @"$s8test_v7k7minMax3{{.*}}"(ptr noalias nocapture sret({{.*}}) %0, i32 %1, i32 %2)
 // V7K-LABEL: _$s8test_v7k7minMax3
 struct Ret {
   var min:Int

test/IRGen/abitypes.swift

@@ -175,8 +175,7 @@ class Foo {
   // armv7k-watchos:      load ptr, ptr @"\01L_selector(newRect)", align 4
   // armv7k-watchos:      [[RESULT:%.*]] = call [[ARMV7K_MYRECT]] @objc_msgSend
   // armv7k-watchos:      store [[ARMV7K_MYRECT]] [[RESULT]]
-  // armv7k-watchos:      [[CAST:%.*]] = bitcast ptr
-  // armv7k-watchos:      load { float, float, float, float }, ptr [[CAST]]
+  // armv7k-watchos:      load { float, float, float, float }, ptr
   // armv7k-watchos:      ret float
   func barc(_ p: StructReturns) -> Float {
     return p.newRect().y

test/IRGen/class_isa_pointers_armv7k_watchos.sil

@@ -17,11 +17,9 @@ class Purebred {
 }
 sil_vtable Purebred {}
 
-// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @purebred_method(%T33class_isa_pointers_armv7k_watchos8PurebredC* %0) {{.*}} {
-// CHECK:         [[ISA_PTR:%.*]] = bitcast %T33class_isa_pointers_armv7k_watchos8PurebredC* %0 to %swift.type**
-// CHECK:         [[ISA:%.*]] = load %swift.type*, %swift.type** [[ISA_PTR]]
-// CHECK:         [[VTABLE:%.*]] = bitcast %swift.type* [[ISA]]
-// CHECK:         getelementptr inbounds {{.*}} [[VTABLE]]
+// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @purebred_method(ptr %0) {{.*}} {
+// CHECK:         [[ISA:%.*]] = load ptr, ptr %0
+// CHECK:         getelementptr inbounds {{.*}} [[ISA]]
 sil @purebred_method : $@convention(thin) (@owned Purebred) -> () {
 entry(%0 : $Purebred):
   %m = class_method %0 : $Purebred, #Purebred.method : (Purebred) -> () -> (), $@convention(method) (@guaranteed Purebred) -> ()
@@ -38,12 +36,9 @@ class Mongrel: Gizmo {
 }
 sil_vtable Mongrel {}
 
-// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @mongrel_method(%T33class_isa_pointers_armv7k_watchos7MongrelC* %0) {{.*}} {
-// CHECK:         [[T0:%.*]] = bitcast {{.*}} %0 to %objc_object*
-// CHECK:         [[T1:%.*]] = call %objc_class* @object_getClass(%objc_object* [[T0]])
-// CHECK:         [[ISA:%.*]] = bitcast %objc_class* [[T1]] to %swift.type*
-// CHECK:         [[VTABLE:%.*]] = bitcast %swift.type* [[ISA]]
-// CHECK:         getelementptr inbounds {{.*}} [[VTABLE]]
+// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @mongrel_method(ptr %0) {{.*}} {
+// CHECK:         [[T1:%.*]] = call ptr @object_getClass(ptr %0)
+// CHECK:         getelementptr inbounds {{.*}} [[T1]]
 sil @mongrel_method : $@convention(thin) (@owned Mongrel) -> () {
 entry(%0 : $Mongrel):
   %m = class_method %0 : $Mongrel, #Mongrel.method : (Mongrel) -> () -> (), $@convention(method) (@guaranteed Mongrel) -> ()

test/IRGen/objc_object_getClass.swift

@@ -18,5 +18,5 @@ func test(_ o: ObjCSubclass) {
   o.field = 10
 }
 
-// CHECK-DAG: declare i8* @object_getClass(i8*{{.*}})
-// CHECK-DAG: call %objc_class* bitcast (i8* (i8*)* @object_getClass to %objc_class* (%objc_object*)*)(%objc_object* %{{.*}})
+// CHECK-DAG: declare ptr @object_getClass(ptr{{.*}})
+// CHECK-DAG: call ptr @object_getClass(ptr %{{.*}})