Merge pull request #36293 from CodaFi/silicon-pentanitride

[5.4] Apple Silicon Test Corrections

Author: shahmishal

test/ClangImporter/availability_macosx_canonical_versions.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules -target x86_64-apple-macosx10.15 %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules -target %target-cpu-apple-macosx10.15 %s
 
 // REQUIRES: OS=macosx
 

test/ClangImporter/availability_macosx_canonical_versions_appext.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules -target x86_64-apple-macosx10.15 -application-extension %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules -target %target-cpu-apple-macosx10.15 -application-extension %s
 
 // REQUIRES: OS=macosx
 

test/IRGen/fixed_class_initialization.swift

@@ -2,7 +2,7 @@
 // RUN: %target-swift-frontend -target x86_64-apple-macosx10.14 -module-name main -emit-ir %s | %FileCheck --check-prefix=CHECK --check-prefix=NO_OPT_SELF %s
 
 // REQUIRES: objc_interop
-// REQUIRES: OS=macosx
+// REQUIRES: OS=macosx && CPU=x86_64
 
 class C {
   var x: Int = 0

test/IRGen/macosx-sdk-version.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend %s -target x86_64-apple-macosx10.14 -target-sdk-version 10.15.4 -emit-ir | %FileCheck %s
+// RUN: %target-swift-frontend %s -target %target-cpu-apple-macosx10.14 -target-sdk-version 10.15.4 -emit-ir | %FileCheck %s
 
 // REQUIRES: OS=macosx
 

test/IRGen/opaque_result_type_availability.swift

@@ -1,6 +1,6 @@
-// RUN: %target-swift-frontend -enable-implicit-dynamic -target x86_64-apple-macosx10.9 -Onone -emit-ir %s | %FileCheck --check-prefix=MAYBE-AVAILABLE %s
+// RUN: %target-swift-frontend -enable-implicit-dynamic -target %target-cpu-apple-macosx10.9 -Onone -emit-ir %s | %FileCheck --check-prefix=MAYBE-AVAILABLE %s
 // RUN: %target-swift-frontend -enable-implicit-dynamic -target %target-cpu-apple-macosx10.15 -Onone -emit-ir %s | %FileCheck --check-prefix=ALWAYS-AVAILABLE %s
-// REQUIRES: OS=macosx
+// REQUIRES: OS=macosx && CPU=x86_64
 
 protocol P {}
 extension Int: P {}

test/Sanitizers/tsan-emptyarraystorage.swift

@@ -6,6 +6,9 @@
 // REQUIRES: foundation
 // UNSUPPORTED: OS=tvos
 
+// rdar://problem/75006869
+// XFAIL: OS=macosx && CPU=arm64
+
 import Foundation
 
 let sem = DispatchSemaphore(value: 0)

test/Sanitizers/tsan-libdispatch.swift

@@ -9,6 +9,9 @@
 // don't support TSan.
 // UNSUPPORTED: remote_run
 
+// rdar://problem/75006869
+// XFAIL: OS=macosx && CPU=arm64
+
 // Test ThreadSanitizer execution end-to-end with libdispatch.
 
 import Dispatch

test/Sanitizers/tsan-norace-block-release.swift

@@ -8,6 +8,9 @@
 // don't support TSan.
 // UNSUPPORTED: remote_run
 
+// rdar://problem/75006869
+// UNSUPPORTED: OS=macosx && CPU=arm64
+
 // Test that we do not report a race on block release operation.
 import Dispatch
 #if canImport(Darwin)

test/Sanitizers/tsan-norace-deinit-run-time.swift

@@ -8,6 +8,9 @@
 // don't support TSan.
 // UNSUPPORTED: remote_run
 
+// rdar://problem/75006869
+// XFAIL: OS=macosx && CPU=arm64
+
 // Test that we do not report a race on deinit; the synchronization is guaranteed by runtime.
 import Dispatch
 #if canImport(Darwin)

test/Sanitizers/tsan-static-exclusivity.swift

@@ -5,7 +5,6 @@
 // don't support TSan.
 // UNSUPPORTED: remote_run
 
-
 struct OtherStruct {
   mutating
   func mutableTakingClosure(_ c: () -> Void) { }

test/Sanitizers/tsan.swift

@@ -6,6 +6,9 @@
 // UNSUPPORTED: OS=tvos
 // UNSUPPORTED: CPU=powerpc64le
 
+// rdar://problem/75006869
+// XFAIL: OS=macosx && CPU=arm64
+
 // FIXME: This should be covered by "tsan_runtime"; older versions of Apple OSs
 // don't support TSan.
 // UNSUPPORTED: remote_run

test/stdlib/Reflection_objc.swift

@@ -9,6 +9,9 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+// rdar://problem/75006694
+// XFAIL: OS=macosx && CPU=arm64
+
 //
 // DO NOT add more tests to this file.  Add them to test/1_stdlib/Runtime.swift.
 //