Fix validation-test/IRGen tests

Author: aschwaighofer

validation-test/IRGen/issue-49393.swift

@@ -1,5 +1,4 @@
-// RUN: %target-swift-frontend %use_no_opaque_pointers -target %target-swift-abi-5.8-triple -emit-ir %s -module-name M -import-objc-header %S/Inputs/issue-49393.h | %FileCheck %s --check-prefix=CHECK-%is-darwin --check-prefix=CHECK
-// RUN: %target-swift-frontend -target %target-swift-abi-5.8-triple -emit-ir %s -module-name M -import-objc-header %S/Inputs/issue-49393.h
+// RUN: %target-swift-frontend -target %target-swift-abi-5.8-triple -emit-ir %s -module-name M -import-objc-header %S/Inputs/issue-49393.h | %FileCheck %s --check-prefix=CHECK-%is-darwin --check-prefix=CHECK
 // REQUIRES: objc_interop
 
 // https://github.com/apple/swift/issues/49393

validation-test/IRGen/pack_stack_metadata_alloc_loop.sil

@@ -1,6 +1,5 @@
 // RUN: %target-run-simple-swift(-parse-sil -Xfrontend -enable-pack-metadata-stack-promotion=true)
-// RUN: %target-swift-frontend %use_no_opaque_pointers -parse-sil -enable-pack-metadata-stack-promotion=true -emit-ir -primary-file %s | %IRGenFileCheck %s
-// RUN: %target-swift-frontend -parse-sil -enable-pack-metadata-stack-promotion=true -emit-ir -primary-file %s
+// RUN: %target-swift-frontend -parse-sil -enable-pack-metadata-stack-promotion=true -emit-ir -primary-file %s | %IRGenFileCheck %s
 
 // REQUIRES: executable_test
 
@@ -31,30 +30,30 @@ sil @callee : $@convention(thin) <each T> () -> () {
 }
 
 // CHECK-LABEL: define {{.*}}@looper(
-// CHECK-SAME:      [[INT]] %0, [[INT]] %1, %swift.type** %"each T_1", %swift.type** %"each T_2") {{.*}} {
+// CHECK-SAME:      [[INT]] %0, [[INT]] %1, ptr %"each T_1", ptr %"each T_2") {{.*}} {
 // CHECK:       [[ENTRY:entry]]:
 // CHECK:         br label %[[HEADER:[^,]+]]
 // CHECK:       [[HEADER]]:
 // CHECK:         [[PREVIOUS:%[^,]+]] = phi i64 [ 10000000, %[[ENTRY]] ], [ [[REMAINING:%[^,]+]], %{{[^,]+}} ]
 // CHECK:         [[COMBINED_PACK_SIZE:%[^,]+]] = add [[INT]] %0, %1
-// CHECK:         [[STACK_BEFORE_FIRST_ALLOCA:%[^,]+]] = call i8* @llvm.stacksave()
-// CHECK:         [[FIRST_ALLOCA_METADATA_PACK:%[^,]+]] = alloca %swift.type*, [[INT]] [[COMBINED_PACK_SIZE]]
-// CHECK:         call swiftcc void @callee([[INT]] [[COMBINED_PACK_SIZE]], %swift.type** [[FIRST_ALLOCA_METADATA_PACK]])
+// CHECK:         [[STACK_BEFORE_FIRST_ALLOCA:%[^,]+]] = call ptr @llvm.stacksave()
+// CHECK:         [[FIRST_ALLOCA_METADATA_PACK:%[^,]+]] = alloca ptr, [[INT]] [[COMBINED_PACK_SIZE]]
+// CHECK:         call swiftcc void @callee([[INT]] [[COMBINED_PACK_SIZE]], ptr [[FIRST_ALLOCA_METADATA_PACK]])
 // CHECK:         [[COMBINED_PACK_SIZE_2:%[^,]+]] = add [[INT]] %1, %0
-// CHECK:         [[STACK_BEFORE_SECOND_ALLOCA:%[^,]+]] = call i8* @llvm.stacksave()
-// CHECK:         [[SECOND_ALLOCA_METADATA_PACK:%[^,]+]] = alloca %swift.type*, [[INT]] [[COMBINED_PACK_SIZE_2]]
-// CHECK:         call swiftcc void @callee([[INT]] [[COMBINED_PACK_SIZE_2]], %swift.type** [[SECOND_ALLOCA_METADATA_PACK]])
+// CHECK:         [[STACK_BEFORE_SECOND_ALLOCA:%[^,]+]] = call ptr @llvm.stacksave()
+// CHECK:         [[SECOND_ALLOCA_METADATA_PACK:%[^,]+]] = alloca ptr, [[INT]] [[COMBINED_PACK_SIZE_2]]
+// CHECK:         call swiftcc void @callee([[INT]] [[COMBINED_PACK_SIZE_2]], ptr [[SECOND_ALLOCA_METADATA_PACK]])
 // CHECK:         [[REMAINING_AND_OVERFLOW:%[^,]+]] = call { i64, i1 } @llvm.ssub.with.overflow.i64(i64 [[PREVIOUS]], i64 1)
 // CHECK:         [[REMAINING]] = extractvalue { i64, i1 } [[REMAINING_AND_OVERFLOW]], 0
 // CHECK:         [[IS_ZERO:%[^,]+]] = icmp eq i64 [[REMAINING]], 0
 // CHECK:         br i1 [[IS_ZERO]], label %[[EXIT:[^,]+]], label %[[BACKEDGE:[^,]+]]
 // CHECK:       [[BACKEDGE]]:
-// CHECK:         call void @llvm.stackrestore(i8* [[STACK_BEFORE_SECOND_ALLOCA]])
-// CHECK:         call void @llvm.stackrestore(i8* [[STACK_BEFORE_FIRST_ALLOCA]])
+// CHECK:         call void @llvm.stackrestore(ptr [[STACK_BEFORE_SECOND_ALLOCA]])
+// CHECK:         call void @llvm.stackrestore(ptr [[STACK_BEFORE_FIRST_ALLOCA]])
 // CHECK:         br label %[[HEADER]]
 // CHECK:       [[EXIT]]:
-// CHECK:         call void @llvm.stackrestore(i8* [[STACK_BEFORE_SECOND_ALLOCA]])
-// CHECK:         call void @llvm.stackrestore(i8* [[STACK_BEFORE_FIRST_ALLOCA]])
+// CHECK:         call void @llvm.stackrestore(ptr [[STACK_BEFORE_SECOND_ALLOCA]])
+// CHECK:         call void @llvm.stackrestore(ptr [[STACK_BEFORE_FIRST_ALLOCA]])
 // CHECK:         ret void
 // CHECK:       }
 sil @looper : $@convention(thin) <each T_1, each T_2> () -> () {