swiftlang · aschwaighofer · Mar 22, 2019 · Mar 18, 2019 · Mar 20, 2019 · Mar 21, 2019
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -135,6 +135,7 @@ set(profdata_merge_worker
 
 set(TEST_MODES
     optimize_none optimize optimize_unchecked optimize_size
+    optimize_none_with_implicit_dynamic
     only_executable only_non_executable
 )
 set(TEST_SUBSETS

diff --git a/test/IRGen/report_dead_method_call.swift b/test/IRGen/report_dead_method_call.swift
@@ -11,6 +11,8 @@
 // RUN: %target-run %t/report_dead_method_call
 // REQUIRES: executable_test
 
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 private protocol PrivateProto {
 	func abc()
 }

diff --git a/test/Interpreter/SDK/mapkit_header_static.swift b/test/Interpreter/SDK/mapkit_header_static.swift
@@ -4,6 +4,9 @@
 // REQUIRES: objc_interop
 // UNSUPPORTED: OS=tvos
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import MapKit
 
 let rect = MKMapRectMake(1.0, 2.0, 3.0, 4.0)

diff --git a/test/Interpreter/SDK/mixed_mode_class_with_missing_properties.swift b/test/Interpreter/SDK/mixed_mode_class_with_missing_properties.swift
@@ -11,6 +11,9 @@
 // REQUIRES: objc_interop
 // REQUIRES: executable_test
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import UsingObjCStuff
 
 print("Let's go") // CHECK: Let's go

diff --git a/test/Interpreter/SDK/objc_factory_method.swift b/test/Interpreter/SDK/objc_factory_method.swift
@@ -4,6 +4,9 @@
 // REQUIRES: executable_test
 // REQUIRES: OS=macosx
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import AppKit
 
 let image = NSImage(named: NSImage.Name.trashEmpty)

diff --git a/test/Interpreter/SDK/objc_swift3_deprecated_objc_inference.swift b/test/Interpreter/SDK/objc_swift3_deprecated_objc_inference.swift
@@ -15,14 +15,17 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+// Requires explicit swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import Foundation
 
 var DeprecatedObjCInferenceTestSuite = TestSuite("DeprecatedObjCInferenceTestSuite")
 
 class MyClass : NSObject {
   // The line numbers of the next two methods are mentioned in the CHECK lines
-  // below. Please keep them as 26 and 27.
+  // below. Please keep them as 29 and 30.
   func foo() { }
   class func bar() { }
 }
@@ -42,15 +45,15 @@ DeprecatedObjCInferenceTestSuite.test("messagingObjCInference") {
 	// CHECK_CRASH: ---Begin 
 	fputs("---Begin\n", stderr)
 
-	// CHECK_WARNINGS: .swift:26:3: implicit Objective-C entrypoint -[a.MyClass foo]
-	// CHECK_CRASH: .swift:26:3: implicit Objective-C entrypoint -[a.MyClass foo]
+	// CHECK_WARNINGS: .swift:29:3: implicit Objective-C entrypoint -[a.MyClass foo]
+	// CHECK_CRASH: .swift:29:3: implicit Objective-C entrypoint -[a.MyClass foo]
 	x.perform(Selector(fooSel))
-	// CHECK_WARNINGS-NOT: .swift:26:3: implicit Objective-C entrypoint -[a.MyClass foo]
+	// CHECK_WARNINGS-NOT: .swift:29:3: implicit Objective-C entrypoint -[a.MyClass foo]
 	x.perform(Selector(fooSel))
 
-	// CHECK_WARNINGS: .swift:27:3: implicit Objective-C entrypoint +[a.MyClass bar]
+	// CHECK_WARNINGS: .swift:30:3: implicit Objective-C entrypoint +[a.MyClass bar]
 	type(of: x).perform(Selector(barSel))
-	// CHECK_WARNINGS-NOT: .swift:27:3: implicit Objective-C entrypoint +[a.MyClass bar]
+	// CHECK_WARNINGS-NOT: .swift:30:3: implicit Objective-C entrypoint +[a.MyClass bar]
 	type(of: x).perform(Selector(barSel))
 
 	// CHECK_NOTHING-NEXT: ---End 

diff --git a/test/Interpreter/SDK/object_literals.swift b/test/Interpreter/SDK/object_literals.swift
@@ -7,6 +7,9 @@
 // REQUIRES: executable_test
 // REQUIRES: OS=macosx
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import AppKit
 import StdlibUnittest
 

diff --git a/test/Interpreter/dynamicReplacement_property_observer.swift b/test/Interpreter/dynamicReplacement_property_observer.swift
@@ -7,6 +7,8 @@
 
 // REQUIRES: executable_test
 
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 @_private(sourceFile: "dynamic_replacement_property_observer_orig.swift") import TestDidWillSet
 
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)

diff --git a/test/Interpreter/dynamic_cast_optionals_to_nsobject.swift b/test/Interpreter/dynamic_cast_optionals_to_nsobject.swift
@@ -2,6 +2,9 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+// Requires swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import Foundation
 
 // rdar://problem/36477954

diff --git a/test/Interpreter/dynamic_replacement_chaining.swift b/test/Interpreter/dynamic_replacement_chaining.swift
@@ -18,6 +18,9 @@
 
 // REQUIRES: executable_test
 
+// This test flips the chaining flag.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import A
 
 import StdlibUnittest

diff --git a/test/Interpreter/enforce_exclusive_access.swift b/test/Interpreter/enforce_exclusive_access.swift
@@ -5,6 +5,9 @@
 // RUN: %target-run %t/a.out
 // REQUIRES: executable_test
 
+// Requires explicit swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 // Tests for traps at run time when enforcing exclusive access.
 
 import StdlibUnittest

diff --git a/test/Interpreter/fractal.swift b/test/Interpreter/fractal.swift
@@ -8,6 +8,9 @@
 // REQUIRES: executable_test
 // REQUIRES: swift_interpreter
 
+// JIT runs in swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import complex
 
 func printDensity(_ d: Int) {

diff --git a/test/Interpreter/mandelbrot.swift b/test/Interpreter/mandelbrot.swift
@@ -8,6 +8,9 @@
 // REQUIRES: executable_test
 // REQUIRES: swift_interpreter
 
+// JIT runs in swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import complex
 
 func printDensity(_ d: Int) {

diff --git a/test/Interpreter/synthesized_extension_conformances.swift b/test/Interpreter/synthesized_extension_conformances.swift
@@ -6,6 +6,9 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+// Requires explicit swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import Foundation
 
 #if FOUNDATION_XCTEST

diff --git a/test/Profiler/pgo_foreach.swift b/test/Profiler/pgo_foreach.swift
@@ -19,6 +19,8 @@
 // REQUIRES: executable_test
 // REQUIRES: OS=macosx
 
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 // SIL-LABEL: // pgo_foreach.guessForEach1
 // SIL-LABEL: sil @$s11pgo_foreach13guessForEach11xs5Int32VAE_tF : $@convention(thin) (Int32) -> Int32 !function_entry_count(42) {
 // IR-LABEL: define swiftcc i32 @$s9pgo_foreach10guessWhiles5Int32VAD1x_tF

diff --git a/test/Prototypes/BigInt.swift b/test/Prototypes/BigInt.swift
@@ -16,6 +16,8 @@
 // REQUIRES: executable_test
 // REQUIRES: CPU=x86_64
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
 import StdlibUnittest
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
   import Darwin

diff --git a/test/lit.cfg b/test/lit.cfg
@@ -493,6 +493,14 @@ if swift_test_mode == 'optimize_none':
     # optimize mode for a cpu.
     config.available_features.add("swift_test_mode_optimize_none_" + run_cpu)
     swift_execution_tests_extra_flags = ''
+elif swift_test_mode == 'optimize_none_with_implicit_dynamic':
+    config.available_features.add("executable_test")
+    config.limit_to_features.add("executable_test")
+    config.available_features.add("swift_test_mode_optimize_none_with_implicit_dynamic")
+    # Add the cpu as a feature so we can selectively disable tests in an
+    # optimize mode for a cpu.
+    config.available_features.add("swift_test_mode_optimize_none_" + run_cpu)
+    swift_execution_tests_extra_flags = '-Xfrontend -enable-implicit-dynamic -Xfrontend -enable-private-imports -Xfrontend -enable-dynamic-replacement-chaining -swift-version 5'
 elif swift_test_mode == 'optimize':
     config.available_features.add("executable_test")
     config.limit_to_features.add("executable_test")

diff --git a/test/stdlib/AVFoundation_Swift4.swift b/test/stdlib/AVFoundation_Swift4.swift
@@ -7,6 +7,9 @@
 // CoreMedia is not present on watchOS.
 // UNSUPPORTED: OS=watchos
 
+// Requires swift-version 5
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import AVFoundation
 import StdlibUnittest
 

diff --git a/test/stdlib/ArrayBridge.swift.gyb b/test/stdlib/ArrayBridge.swift.gyb
@@ -21,6 +21,9 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import Foundation
 import ArrayBridgeObjC
 import StdlibUnittest

diff --git a/test/stdlib/Filter.swift b/test/stdlib/Filter.swift
@@ -12,6 +12,9 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 
 

diff --git a/test/stdlib/Inputs/KeyPathMultiFile_b.swift b/test/stdlib/Inputs/KeyPathMultiFile_b.swift
@@ -11,9 +11,9 @@ struct A {
 }
 
 func A_x_keypath() -> WritableKeyPath<A, Int> {
-  return \A.x
+  return \A.x as! WritableKeyPath<A, Int>
 }
 
 func A_subscript_0_keypath() -> WritableKeyPath<A, Int> {
-  return \A.[0]
+  return \A.[0] as! WritableKeyPath<A, Int>
 }
diff --git a/test/stdlib/Integers.swift.gyb b/test/stdlib/Integers.swift.gyb
@@ -17,6 +17,9 @@
 
 // FIXME: this test runs forever on iOS arm64
 // REQUIRES: OS=macosx
+
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
 %{
 word_bits = int(WORD_BITS) / 2
 from SwiftIntTypes import all_integer_types

diff --git a/test/stdlib/Map.swift b/test/stdlib/Map.swift
@@ -12,6 +12,9 @@
 // RUN: %target-run-simple-swift | %FileCheck %s
 // REQUIRES: executable_test
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 // Check that the generic parameters are called 'Base' and 'Element'.
 protocol TestProtocol1 {}
 

diff --git a/test/stdlib/MapFilterLayerFoldingCompatibilty.swift b/test/stdlib/MapFilterLayerFoldingCompatibilty.swift
@@ -3,6 +3,9 @@
 // RUN: %target-build-swift %s -o %t/a.out5 -swift-version 5 && %target-codesign %t/a.out5 && %target-run %t/a.out5
 // REQUIRES: executable_test
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 
 #if swift(>=5)

diff --git a/test/stdlib/Metal.swift b/test/stdlib/Metal.swift
@@ -5,6 +5,9 @@
 
 // REQUIRES: executable_test
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 
 import Metal

diff --git a/test/stdlib/MetalKit.swift b/test/stdlib/MetalKit.swift
@@ -5,6 +5,9 @@
 
 // REQUIRES: executable_test
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 
 import Metal

diff --git a/test/stdlib/NSStringAPI+Substring.swift b/test/stdlib/NSStringAPI+Substring.swift
@@ -4,6 +4,9 @@
 
 // REQUIRES: objc_interop
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 //
 // Tests for the NSString APIs on Substring
 //

diff --git a/test/stdlib/Reflection_objc.swift b/test/stdlib/Reflection_objc.swift
@@ -9,6 +9,9 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 //
 // DO NOT add more tests to this file.  Add them to test/1_stdlib/Runtime.swift.
 //

diff --git a/test/stdlib/ReverseCompatibility.swift b/test/stdlib/ReverseCompatibility.swift
@@ -3,6 +3,9 @@
 // RUN: %target-build-swift %s -o %t/a.out5 -swift-version 5 && %target-codesign %t/a.out5 && %target-run %t/a.out5
 // REQUIRES: executable_test
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 
 #if swift(>=4.2)

diff --git a/test/stdlib/RuntimeObjC.swift b/test/stdlib/RuntimeObjC.swift
@@ -7,6 +7,9 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import Swift
 import StdlibUnittest
 

diff --git a/test/stdlib/StringCompatibility.swift b/test/stdlib/StringCompatibility.swift
@@ -1,6 +1,9 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-build-swift %s -o %t/a.out4 -swift-version 4 && %target-codesign %t/a.out4 && %target-run %t/a.out4
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 // REQUIRES: executable_test
 
 import StdlibUnittest

diff --git a/test/stdlib/StringFlatMap.swift b/test/stdlib/StringFlatMap.swift
@@ -3,6 +3,9 @@
 
 // REQUIRES: executable_test
 
+// Needs swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 
 

diff --git a/test/stdlib/TestData.swift b/test/stdlib/TestData.swift
@@ -17,6 +17,9 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import Foundation
 import Dispatch
 import ObjectiveC

diff --git a/test/stdlib/TestIndexSet.swift b/test/stdlib/TestIndexSet.swift
@@ -10,6 +10,9 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import Foundation
 
 #if FOUNDATION_XCTEST

diff --git a/test/stdlib/TestMeasurement.swift b/test/stdlib/TestMeasurement.swift
@@ -10,6 +10,9 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import Foundation
 
 #if FOUNDATION_XCTEST

diff --git a/test/stdlib/UnsafePointer.swift.gyb b/test/stdlib/UnsafePointer.swift.gyb
@@ -1,6 +1,9 @@
 // RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest