Merge pull request swiftlang#21541 from sarveshtamba/master

jrose-apple · web-flow · commit fb0fb0a425ad · 2019-01-17T11:14:48.000-08:00
Changes for #SR-9413:Swift 5.0 test failures on PowerPC
diff --git a/test/ClangImporter/cfuncs_parse.swift b/test/ClangImporter/cfuncs_parse.swift
@@ -1,3 +1,4 @@
+// XFAIL: CPU=powerpc64le
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs %s
 
 import cfuncs
diff --git a/test/ClangImporter/inlinable_bitfields.swift b/test/ClangImporter/inlinable_bitfields.swift
@@ -10,4 +10,4 @@ public func g(_ m: MM) -> UInt32 {
 
 // Just make sure this is a definition and not a declaration...
 
-// CHECK: define internal i32 @"$ModRM$rm$getter"
+// CHECK: define internal{{( zeroext)?}} i32 @"$ModRM$rm$getter"
diff --git a/test/Constraints/diagnostics.swift b/test/Constraints/diagnostics.swift
@@ -659,7 +659,7 @@ example21890157.property = "confusing"  // expected-error {{value of optional ty
 struct UnaryOp {}
 
 _ = -UnaryOp() // expected-error {{unary operator '-' cannot be applied to an operand of type 'UnaryOp'}}
-// expected-note@-1 {{overloads for '-' exist with these partially matching parameter lists: (Double), (Float), (Float80)}}
+// expected-note@-1 {{overloads for '-' exist with these partially matching parameter lists: (Double), (Float)}}
 
 
 // <rdar://problem/23433271> Swift compiler segfault in failure diagnosis
diff --git a/test/Driver/fuzzer.swift b/test/Driver/fuzzer.swift
@@ -1,4 +1,5 @@
 // UNSUPPORTED: win32
+// UNSUPPORTED: CPU=powerpc64le
 // RUN: %swiftc_driver -driver-print-jobs -sanitize=fuzzer,address -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=LIBFUZZER %s
 
 // LIBFUZZER: libclang_rt.fuzzer
diff --git a/test/IRGen/big_types_corner_cases.swift b/test/IRGen/big_types_corner_cases.swift
@@ -1,4 +1,4 @@
-
+// XFAIL: CPU=powerpc64le
 // RUN: %target-swift-frontend -enable-large-loadable-types %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
 // REQUIRES: optimized_stdlib
 
diff --git a/test/IRGen/clang_inline_opt.swift b/test/IRGen/clang_inline_opt.swift
@@ -7,7 +7,7 @@ func return10() -> UInt32 {
 // Sanity check that we tell Clang to generate optimizable code when
 // we're optimizing.
 
-// CHECK: define internal i32 @return7() [[CLANG_ATTRS:#[0-9]+]] {
+// CHECK: define internal{{( zeroext)?}} i32 @return7() [[CLANG_ATTRS:#[0-9]+]] {
 
 // CHECK: attributes [[CLANG_ATTRS]] = {
 // CHECK-NOT: noinline
diff --git a/test/IRGen/class_resilience_objc.swift b/test/IRGen/class_resilience_objc.swift
@@ -1,6 +1,7 @@
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -emit-ir -o - -primary-file %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
 
 // XFAIL: CPU=armv7k
+// XFAIL: CPU=powerpc64le
 
 // CHECK: %swift.type = type { [[INT:i32|i64]] }
 
diff --git a/test/IRGen/errors.sil b/test/IRGen/errors.sil
@@ -1,3 +1,4 @@
+// XFAIL: CPU=powerpc64le
 // RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime --check-prefix=CHECK-%target-cpu
 
 sil_stage canonical
diff --git a/test/IRGen/objc_simd.sil b/test/IRGen/objc_simd.sil
@@ -57,7 +57,7 @@ entry(%x : $float3):
 // armv7s-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc { float, float, float, float } @simd_native_args(float, float, float, float)
 // armv7k-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc { float, float, float, float } @simd_native_args(float, float, float, float)
 // powerpc64-LABEL: define{{( dllexport)?}}{{( protected)?}} void @simd_native_args(%T4simd6float4V* noalias nocapture sret, %T4simd6float4V* noalias nocapture dereferenceable({{.*}}))
-// powerpc64le-LABEL: define{{( dllexport)?}}{{( protected)?}} void @simd_native_args(%T4simd6float4V* noalias nocapture sret, %T4simd6float4V* noalias nocapture dereferenceable({{.*}}))
+// powerpc64le-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc { float, float, float, float } @simd_native_args(float, float, float, float)
 // s390x-LABEL: define{{( dllexport)?}}{{( protected)?}} void @simd_native_args(%T4simd6float4V* noalias nocapture sret, %T4simd6float4V* noalias nocapture dereferenceable({{.*}}))
 sil @simd_native_args : $@convention(thin) (float4) -> float4 {
 entry(%x : $float4):
diff --git a/test/IRGen/pic.swift b/test/IRGen/pic.swift
@@ -60,3 +60,7 @@ public func use_global() -> Int {
 // aarch64:        str [[REG2]], [sp]
 // aarch64:        bl swift_endAccess
 // aarch64:        ldr x0, [sp]
+
+// powerpc64le-LABEL: {{_?}}$s4main10use_globalSiyF:
+// powerpc64le:        bl swift_beginAccess
+// powerpc64le:       addi 3, 3, ($s4main6globalSivp)@toc@l
diff --git a/test/Index/Store/output-failure.swift b/test/Index/Store/output-failure.swift
@@ -1,3 +1,4 @@
+// XFAIL: CPU=powerpc64le
 // RUN: %empty-directory(%t)
 // RUN: mkdir %t/idx
 
diff --git a/test/Inputs/clang-importer-sdk/swift-modules/CoreGraphics.swift b/test/Inputs/clang-importer-sdk/swift-modules/CoreGraphics.swift
@@ -8,7 +8,7 @@ public func == (lhs: CGPoint, rhs: CGPoint) -> Bool {
 public struct CGFloat {
 #if arch(i386) || arch(arm)
   public typealias UnderlyingType = Float
-#elseif arch(x86_64) || arch(arm64)
+#elseif arch(x86_64) || arch(arm64) || arch(powerpc64le)
   public typealias UnderlyingType = Double
 #endif
 
diff --git a/test/Interpreter/generic_casts.swift b/test/Interpreter/generic_casts.swift
@@ -3,6 +3,7 @@
 // RUN: %target-codesign %t/a.out.optimized
 // RUN: %target-run %t/a.out.optimized | %FileCheck %s
 // REQUIRES: executable_test
+// XFAIL: CPU=powerpc64le
 
 // FIXME: rdar://problem/19648117 Needs splitting objc parts out
 
diff --git a/test/ParseableInterface/ModuleCache/force-module-loading-mode-archs.swift b/test/ParseableInterface/ModuleCache/force-module-loading-mode-archs.swift
@@ -1,4 +1,5 @@
 // RUN: %empty-directory(%t)
+// XFAIL: CPU=powerpc64le
 
 // 1. Not finding things is okay.
 // RUN: not env SWIFT_FORCE_MODULE_LOADING=prefer-parseable %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s 2>&1 | %FileCheck -check-prefix=NO-SUCH-MODULE %s
diff --git a/test/ParseableInterface/ModuleCache/force-module-loading-mode-framework.swift b/test/ParseableInterface/ModuleCache/force-module-loading-mode-framework.swift
@@ -1,4 +1,5 @@
 // RUN: %empty-directory(%t)
+// XFAIL: CPU=powerpc64le
 
 // 1. Not finding things is okay.
 // RUN: not env SWIFT_FORCE_MODULE_LOADING=prefer-parseable %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s 2>&1 | %FileCheck -check-prefix=NO-SUCH-MODULE %s
diff --git a/test/ParseableInterface/ModuleCache/force-module-loading-mode.swift b/test/ParseableInterface/ModuleCache/force-module-loading-mode.swift
@@ -1,4 +1,5 @@
 // RUN: %empty-directory(%t)
+// XFAIL: CPU=powerpc64le
 
 // 1. Not finding things is okay.
 // RUN: not env SWIFT_FORCE_MODULE_LOADING=prefer-parseable %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s 2>&1 | %FileCheck -check-prefix=NO-SUCH-MODULE %s
diff --git a/test/Runtime/linux-fatal-backtrace.swift b/test/Runtime/linux-fatal-backtrace.swift
@@ -4,6 +4,7 @@
 // REQUIRES: executable_test
 // REQUIRES: OS=linux-gnu
 // REQUIRES: lldb
+// XFAIL: CPU=powerpc64le
 
 // Backtraces are not emitted when optimizations are enabled. This test can not
 // run when optimizations are enabled.
diff --git a/test/SIL/Serialization/opaque_values_serialize.sil b/test/SIL/Serialization/opaque_values_serialize.sil
@@ -1,3 +1,4 @@
+// XFAIL: CPU=powerpc64le
 // First parse this and then emit a *.sib. Then read in the *.sib, then recreate
 // RUN: %empty-directory(%t)
 // FIXME: <rdar://problem/29281364> sil-opt -verify is broken
diff --git a/test/Sanitizers/tsan.swift b/test/Sanitizers/tsan.swift
@@ -4,6 +4,7 @@
 // REQUIRES: executable_test
 // REQUIRES: tsan_runtime
 // UNSUPPORTED: OS=tvos
+// UNSUPPORTED: CPU=powerpc64le
 
 // FIXME: This should be covered by "tsan_runtime"; older versions of Apple OSs
 // don't support TSan.
diff --git a/test/remote-run/upload-stderr.test-sh b/test/remote-run/upload-stderr.test-sh
@@ -1,4 +1,5 @@
 REQUIRES: sftp_server
+// XFAIL: CPU=powerpc64le
 
 RUN: %empty-directory(%t)
 RUN: %empty-directory(%t/REMOTE/input)
diff --git a/validation-test/Sanitizers/witness_table_lookup.swift b/validation-test/Sanitizers/witness_table_lookup.swift
@@ -3,6 +3,7 @@
 // REQUIRES: executable_test
 // REQUIRES: stress_test
 // REQUIRES: tsan_runtime
+// UNSUPPORTED: CPU=powerpc64le
 
 // Check that TSan does not report spurious races in witness table lookup.
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// XFAIL: CPU=powerpc64le`
`1`	`2`	`// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs %s`
`2`	`3`
`3`	`4`	`import cfuncs`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@ public func g(_ m: MM) -> UInt32 {`
`10`	`10`
`11`	`11`	`// Just make sure this is a definition and not a declaration...`
`12`	`12`
`13`		`-// CHECK: define internal i32 @"$ModRM$rm$getter"`
	`13`	`+// CHECK: define internal{{( zeroext)?}} i32 @"$ModRM$rm$getter"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// UNSUPPORTED: win32`
	`2`	`+// UNSUPPORTED: CPU=powerpc64le`
`2`	`3`	`// RUN: %swiftc_driver -driver-print-jobs -sanitize=fuzzer,address -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s \| %FileCheck -check-prefix=LIBFUZZER %s`
`3`	`4`
`4`	`5`	`// LIBFUZZER: libclang_rt.fuzzer`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-`
	`1`	`+// XFAIL: CPU=powerpc64le`
`2`	`2`	`// RUN: %target-swift-frontend -enable-large-loadable-types %s -emit-ir \| %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize`
`3`	`3`	`// REQUIRES: optimized_stdlib`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// XFAIL: CPU=powerpc64le`
`1`	`2`	`// RUN: %target-swift-frontend -primary-file %s -emit-ir \| %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime --check-prefix=CHECK-%target-cpu`
`2`	`3`
`3`	`4`	`sil_stage canonical`