Merge pull request #40509 from davezarzycki/pr40509

davezarzycki · web-flow · commit 04057211a3c5 · 2021-12-12T13:01:22.000-05:00
[testing] Better cross-platform testing
diff --git a/test/IRGen/exactcast2.sil b/test/IRGen/exactcast2.sil
@@ -1,4 +1,4 @@
-// RUN: %target-build-swift %s -Xfrontend -enable-objc-interop -emit-ir -o -
+// RUN: %target-build-swift %s -emit-ir -o -
 // REQUIRES: executable_test
 
 // Make sure we are not crashing here.
@@ -13,12 +13,12 @@ class Hash {
   init()
   func update()
   func hash()
-  @objc deinit
+  deinit
 }
 
 final class MD5 : Hash {
   override init()
-  @objc deinit
+  deinit
 }
 
 sil @_TFC4main4HashcfMS0_FT_S0_ : $@convention(method) (@owned Hash) -> @owned Hash
diff --git a/test/SILOptimizer/devirt_access.sil b/test/SILOptimizer/devirt_access.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -enable-objc-interop -enable-sil-verify-all %s -devirtualizer | %FileCheck %s
+// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer | %FileCheck %s
 
 sil_stage canonical
 
@@ -9,7 +9,7 @@ import SwiftShims
 class K {
   func ping() -> Int
   private func pong() -> Int
-  @objc deinit
+  deinit
   init()
 }
 
@@ -41,27 +41,27 @@ sil_vtable K {
 class X
 {
   private func ping() -> Int
-  @objc deinit
+  deinit
   init()
 }
 
 class Y : X
 {
-  @objc deinit
+  deinit
   override init()
 }
 
 class A
 {
   private func ping() -> Int
-  @objc deinit
+  deinit
   init()
 }
 
 class B : A
 {
   override func ping() -> Int
-  @objc deinit
+  deinit
   override init()
 }
 
diff --git a/test/SILOptimizer/devirt_access_ownership.sil b/test/SILOptimizer/devirt_access_ownership.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -enable-objc-interop -enable-sil-verify-all %s -devirtualizer | %FileCheck %s
+// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer | %FileCheck %s
 
 sil_stage canonical
 
@@ -9,7 +9,7 @@ import SwiftShims
 class K {
   func ping() -> Int
   private func pong() -> Int
-  @objc deinit
+  deinit
   init()
 }
 
@@ -41,27 +41,27 @@ sil_vtable K {
 class X
 {
   private func ping() -> Int
-  @objc deinit
+  deinit
   init()
 }
 
 class Y : X
 {
-  @objc deinit
+  deinit
   override init()
 }
 
 class A
 {
   private func ping() -> Int
-  @objc deinit
+  deinit
   init()
 }
 
 class B : A
 {
   override func ping() -> Int
-  @objc deinit
+  deinit
   override init()
 }
 
diff --git a/test/SILOptimizer/devirt_access_serialized.sil b/test/SILOptimizer/devirt_access_serialized.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -enable-objc-interop -enable-sil-verify-all %s -devirtualizer | %FileCheck %s
+// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer | %FileCheck %s
 
 sil_stage canonical
 
@@ -9,13 +9,13 @@ import SwiftShims
 class X
 {
   private func ping() -> Int
-  @objc deinit
+  deinit
   init()
 }
 
 class Y : X
 {
-  @objc deinit
+  deinit
   override init()
 }
 
diff --git a/test/SILOptimizer/devirt_access_serialized_ownership.sil b/test/SILOptimizer/devirt_access_serialized_ownership.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -enable-objc-interop -enable-sil-verify-all %s -devirtualizer | %FileCheck %s
+// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer | %FileCheck %s
 
 sil_stage canonical
 
@@ -9,13 +9,13 @@ import SwiftShims
 class X
 {
   private func ping() -> Int
-  @objc deinit
+  deinit
   init()
 }
 
 class Y : X
 {
-  @objc deinit
+  deinit
   override init()
 }
 
diff --git a/test/SILOptimizer/devirtualize_protocol_composition_two_stores.sil b/test/SILOptimizer/devirtualize_protocol_composition_two_stores.sil
@@ -1,15 +1,13 @@
 // RUN: %target-sil-opt -O -wmo -enable-sil-verify-all %s | %FileCheck %s
 
-// REQUIRES: objc_interop
-
 sil_stage canonical
 
 import Builtin
 import Swift
 import SwiftShims
 
 public class A {
-  @objc deinit
+  deinit
   init()
 }
 
@@ -19,13 +17,13 @@ public protocol P {
 
 public class B : A, P {
   public func foo() -> Int64
-  @objc deinit
+  deinit
   override init()
 }
 
 public class C : A, P {
   public func foo() -> Int64
-  @objc deinit
+  deinit
   override init()
 }
 
diff --git a/test/SILOptimizer/sil_combine_objc.sil b/test/SILOptimizer/sil_combine_objc.sil
@@ -1,5 +1,4 @@
-// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s
-// REQUIRES: objc_interop
+// RUN: %target-sil-opt -enable-objc-interop -enable-sil-verify-all %s -sil-combine | %FileCheck %s
 
 // See https://bugs.swift.org/browse/SR-5065, rdar://32511494
 // XFAIL: *
diff --git a/test/SILOptimizer/sil_combine_objc_ossa.sil b/test/SILOptimizer/sil_combine_objc_ossa.sil
@@ -1,5 +1,4 @@
-// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s
-// REQUIRES: objc_interop
+// RUN: %target-sil-opt -enable-objc-interop -enable-sil-verify-all %s -sil-combine | %FileCheck %s
 
 // See https://bugs.swift.org/browse/SR-5065, rdar://32511494
 // XFAIL: *
diff --git a/test/SILOptimizer/sil_simplify_instrs.sil b/test/SILOptimizer/sil_simplify_instrs.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -enable-objc-interop -enable-sil-verify-all %s -sil-combine | %FileCheck %s
+// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s
 
 import Builtin
 import Swift
@@ -132,7 +132,7 @@ bb0(%x : $Builtin.Int64):
 class IntClass {
   @_hasStorage var value: Builtin.Int32 { get set }
   init(value: Builtin.Int32)
-  @objc deinit
+  deinit
 }
 
 enum SortaOptional1 {
diff --git a/test/SILOptimizer/sil_simplify_instrs_ossa.sil b/test/SILOptimizer/sil_simplify_instrs_ossa.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -enable-objc-interop -enable-sil-verify-all %s -sil-combine | %FileCheck %s
+// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s
 
 sil_stage canonical
 
@@ -134,7 +134,7 @@ bb0(%x : $Builtin.Int64):
 class IntClass {
   @_hasStorage var value: Builtin.Int32 { get set }
   init(value: Builtin.Int32)
-  @objc deinit
+  deinit
 }
 
 enum SortaOptional1 {
diff --git a/test/SILOptimizer/simplify_cfg_address_phi.sil b/test/SILOptimizer/simplify_cfg_address_phi.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -enable-objc-interop -enable-sil-verify-all %s -jumpthread-simplify-cfg | %FileCheck %s
+// RUN: %target-sil-opt -enable-sil-verify-all %s -jumpthread-simplify-cfg | %FileCheck %s
 //
 // Test SimplifyCFG's handling of address-type phis. In other words, makes sure it doesn't create them at all!
 
@@ -10,7 +10,7 @@ import SwiftShims
 
 class C {
   @_hasStorage @_hasInitialValue var field: Int { get set }
-  @objc deinit
+  deinit
     init()
 }
 
diff --git a/test/SILOptimizer/sink.sil b/test/SILOptimizer/sink.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -enable-objc-interop -enable-sil-verify-all %s -code-sinking | %FileCheck %s
+// RUN: %target-sil-opt -enable-sil-verify-all %s -code-sinking | %FileCheck %s
 
 sil_stage canonical
 
@@ -9,13 +9,13 @@ import SwiftShims
 class X
 {
   private func ping() -> Int
-  @objc deinit
+  deinit
   init()
 }
 
 class Y : X
 {
-  @objc deinit
+  deinit
   override init()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-sil-opt -enable-objc-interop -enable-sil-verify-all %s -devirtualizer \| %FileCheck %s`
	`1`	`+// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer \| %FileCheck %s`
`2`	`2`
`3`	`3`	`sil_stage canonical`
`4`	`4`
`@@ -9,7 +9,7 @@ import SwiftShims`
`9`	`9`	`class K {`
`10`	`10`	`func ping() -> Int`
`11`	`11`	`private func pong() -> Int`
`12`		`- @objc deinit`
	`12`	`+ deinit`
`13`	`13`	`init()`
`14`	`14`	`}`
`15`	`15`
`@@ -41,27 +41,27 @@ sil_vtable K {`
`41`	`41`	`class X`
`42`	`42`	`{`
`43`	`43`	`private func ping() -> Int`
`44`		`- @objc deinit`
	`44`	`+ deinit`
`45`	`45`	`init()`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`class Y : X`
`49`	`49`	`{`
`50`		`- @objc deinit`
	`50`	`+ deinit`
`51`	`51`	`override init()`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`class A`
`55`	`55`	`{`
`56`	`56`	`private func ping() -> Int`
`57`		`- @objc deinit`
	`57`	`+ deinit`
`58`	`58`	`init()`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`class B : A`
`62`	`62`	`{`
`63`	`63`	`override func ping() -> Int`
`64`		`- @objc deinit`
	`64`	`+ deinit`
`65`	`65`	`override init()`
`66`	`66`	`}`
`67`	`67`