Merge pull request swiftlang#84350 from kateinoigakukun/yt/rebranch-wasm-tests-adjusts-main

Author: kateinoigakukun

test/IRGen/class_resilience_objc_armv7k.swift

@@ -16,7 +16,7 @@ public class FixedLayoutObjCSubclass : NSObject {
 // CHECK:      [[OFFSET:%.*]] = load [[INT]], ptr @"$s28class_resilience_objc_armv7k23FixedLayoutObjCSubclassC5fields5Int32VvpWvd"
 // CHECK-NEXT: [[ADDR:%.*]] = getelementptr inbounds i8, ptr %0, [[INT]] [[OFFSET]]
 // CHECK:      call void @swift_beginAccess
-// CHECK-NEXT: [[PAYLOAD_ADDR:%.*]] = getelementptr inbounds %Ts5Int32V, ptr [[ADDR]], i32 0, i32 0
+// CHECK-NEXT: [[PAYLOAD_ADDR:%.*]] = getelementptr inbounds{{.*}} %Ts5Int32V, ptr [[ADDR]], i32 0, i32 0
 // CHECK-NEXT: store i32 10, ptr [[PAYLOAD_ADDR]]
 
 func testConstantDirectFieldAccess(_ o: FixedLayoutObjCSubclass) {
@@ -33,7 +33,7 @@ public class NonFixedLayoutObjCSubclass : NSCoder {
 // CHECK:      [[OFFSET:%.*]] = load [[INT]], ptr @"$s28class_resilience_objc_armv7k26NonFixedLayoutObjCSubclassC5fields5Int32VvpWvd"
 // CHECK-NEXT: [[ADDR:%.*]] = getelementptr inbounds i8, ptr %0, [[INT]] [[OFFSET]]
 // CHECK:      call void @swift_beginAccess
-// CHECK-NEXT: [[PAYLOAD_ADDR:%.*]] = getelementptr inbounds %Ts5Int32V, ptr [[ADDR]], i32 0, i32 0
+// CHECK-NEXT: [[PAYLOAD_ADDR:%.*]] = getelementptr inbounds{{.*}} %Ts5Int32V, ptr [[ADDR]], i32 0, i32 0
 // CHECK-NEXT: store i32 10, ptr [[PAYLOAD_ADDR]]
 
 func testNonConstantDirectFieldAccess(_ o: NonFixedLayoutObjCSubclass) {
@@ -60,7 +60,7 @@ public class GenericObjCSubclass<T> : NSCoder {
 // CHECK-NEXT: [[FIELD_OFFSET:%.*]] = load [[INT]], ptr [[FIELD_OFFSET_ADDR:%.*]]
 // CHECK-NEXT: [[ADDR:%.*]] = getelementptr inbounds i8, ptr %0, [[INT]] [[FIELD_OFFSET]]
 // CHECK:      call void @swift_beginAccess
-// CHECK-NEXT: [[PAYLOAD_ADDR:%.*]] = getelementptr inbounds %Ts5Int32V, ptr [[ADDR]], i32 0, i32 0
+// CHECK-NEXT: [[PAYLOAD_ADDR:%.*]] = getelementptr inbounds{{.*}} %Ts5Int32V, ptr [[ADDR]], i32 0, i32 0
 // CHECK-NEXT: store i32 10, ptr [[PAYLOAD_ADDR]]
 
 func testConstantIndirectFieldAccess<T>(_ o: GenericObjCSubclass<T>) {

test/IRGen/sanitize_coverage.swift

@@ -8,8 +8,6 @@
 // RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge,indirect-calls %s | %FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_INDIRECT_CALLS
 // RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge,8bit-counters %s | %FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_8BIT_COUNTERS
 // RUN: %target-swift-frontend -emit-ir -sanitize=fuzzer %s | %FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_TRACE_CMP
-// These sanitizers aren't supported when targeting Wasm.
-// UNSUPPORTED: wasm
 
 #if canImport(Darwin)
   import Darwin
@@ -19,6 +17,8 @@
   import Android
 #elseif os(Windows)
   import CRT
+#elseif os(WASI)
+  import WASILibc
 #else
 #error("Unsupported platform")
 #endif

test/IRGen/typed_boxes.sil

@@ -38,7 +38,7 @@ sil @pod_box_32_16 : $@convention(thin) () -> () {
 entry:
   // CHECK: [[BOX:%.*]] = call noalias ptr @swift_allocObject(ptr {{.*}} [[POD_32_16_METADATA:@metadata[0-9.]*]], {{.*}} [[WORD]] 48, [[WORD]] 15)
   %a = alloc_box $<τ_0_0> { var τ_0_0 } <OverAligned>
-  // CHECK-32: [[BOX_DATA:%.*]] = getelementptr inbounds [[POD_32_16_LAYOUT:<\{ %swift.refcounted, \[8 x i8\], \[32 x i8\] \}>]], ptr [[BOX]], i32 0, i32 2
+  // CHECK-32: [[BOX_DATA:%.*]] = getelementptr inbounds{{.*}} [[POD_32_16_LAYOUT:<\{ %swift.refcounted, \[8 x i8\], \[32 x i8\] \}>]], ptr [[BOX]], i32 0, i32 2
   %b = project_box %a : $<τ_0_0> { var τ_0_0 } <OverAligned>, 0
   // CHECK: call void @swift_deallocUninitializedObject(ptr [[BOX]], [[WORD]] 48, [[WORD]] 15)
   dealloc_box %a : $<τ_0_0> { var τ_0_0 } <OverAligned>