Add a mode to test implicit dynamic with private imports

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

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()
 }

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)

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

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)

test/Interpreter/SDK/objc_swift3_deprecated_objc_inference.swift

@@ -15,6 +15,9 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+// Requires explicit swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import Foundation
 

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
 

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)

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

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

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

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) {

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) {

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

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

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

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")

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
 

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

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
 
 

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>
 }

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

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 {}
 

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)

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

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

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
 //

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.
 //

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)

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
 

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

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
 
 

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

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

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

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
 
 

test/stdlib/UnsafeRawPointer.swift

@@ -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
 
 var UnsafeMutableRawPointerExtraTestSuite =

validation-test/Evolution/test_backward_deploy_always_emit_into_client.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test --backward-deployment
 // REQUIRES: executable_test
 
+// Uses swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import backward_deploy_always_emit_into_client
 

validation-test/Evolution/test_backward_deploy_class.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test --backward-deployment
 // REQUIRES: executable_test
 
+// Uses swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import backward_deploy_class
 

validation-test/Evolution/test_backward_deploy_enum.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test --backward-deployment
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import backward_deploy_enum
 

validation-test/Evolution/test_backward_deploy_protocol.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test --backward-deployment
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import backward_deploy_protocol
 

validation-test/Evolution/test_backward_deploy_struct.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test --backward-deployment
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import backward_deploy_struct
 

validation-test/Evolution/test_backward_deploy_top_level.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test --backward-deployment
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import backward_deploy_top_level
 

validation-test/Evolution/test_bitwise_takable.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import bitwise_takable
 

validation-test/Evolution/test_change_default_argument_to_magic.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import change_default_argument_to_magic
 

validation-test/Evolution/test_class_add_convenience_init.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_add_convenience_init
 

validation-test/Evolution/test_class_add_deinit.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_add_deinit
 

validation-test/Evolution/test_class_add_property.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_add_property
 

validation-test/Evolution/test_class_add_property_attribute.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_add_property_attribute
 

validation-test/Evolution/test_class_add_property_subclass.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_add_property_subclass
 

validation-test/Evolution/test_class_change_lazy_to_computed.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_change_lazy_to_computed
 

validation-test/Evolution/test_class_change_size.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_change_size
 

validation-test/Evolution/test_class_change_stored_to_computed.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_change_stored_to_computed
 

validation-test/Evolution/test_class_change_stored_to_observed.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_change_stored_to_observed
 

validation-test/Evolution/test_class_fixed_layout_add_virtual_method.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_fixed_layout_add_virtual_method
 

validation-test/Evolution/test_class_fixed_layout_add_virtual_method_subclass.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_fixed_layout_add_virtual_method_subclass
 

validation-test/Evolution/test_class_fixed_layout_superclass_reorder_methods.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_fixed_layout_superclass_reorder_methods
 

validation-test/Evolution/test_class_insert_superclass.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_insert_superclass
 

validation-test/Evolution/test_class_remove_property.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_remove_property
 

validation-test/Evolution/test_class_resilient_add_override.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_resilient_add_override
 

validation-test/Evolution/test_class_resilient_add_virtual_method.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_resilient_add_virtual_method
 

validation-test/Evolution/test_class_resilient_add_virtual_method_subclass.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_resilient_add_virtual_method_subclass
 

validation-test/Evolution/test_class_resilient_superclass_methods.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_resilient_superclass_methods
 

validation-test/Evolution/test_class_resilient_superclass_properties.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_resilient_superclass_properties
 

validation-test/Evolution/test_class_resilient_superclass_reorder_methods.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_resilient_superclass_reorder_methods
 

validation-test/Evolution/test_conformance_reference.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test --no-symbol-diff
 // REQUIRES: executable_test
 
+// Uses swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import conformance_reference
 
@@ -36,4 +39,4 @@ ConformanceReferenceTest.test("EvenMoreDerivedConformance") {
   expectTrue(FirstGeneric<String>.self == useEvenMoreDerived(FirstGeneric<String>()))
 }
 
-runAllTests()
+runAllTests()

validation-test/Evolution/test_enum_add_cases.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import enum_add_cases
 

validation-test/Evolution/test_enum_add_cases_trap.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import enum_add_cases_trap
 

validation-test/Evolution/test_enum_change_size.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import enum_change_size
 

validation-test/Evolution/test_enum_reorder_cases.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import enum_reorder_cases
 import StdlibUnittest
 

validation-test/Evolution/test_function_change_transparent_body.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import function_change_transparent_body
 

validation-test/Evolution/test_generic_resilient_struct_add_property.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import generic_resilient_struct_add_property
 

validation-test/Evolution/test_global_change_size.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import global_change_size
 

validation-test/Evolution/test_global_stored_to_computed.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import global_stored_to_computed
 

validation-test/Evolution/test_keypath_default_argument.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import keypath_default_argument
 

validation-test/Evolution/test_keypaths.swift.gyb

@@ -7,6 +7,9 @@
 
 // REQUIRES: executable_test
 
+// Uses swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import keypaths
 import StdlibUnittest
 

validation-test/Evolution/test_move_method_to_extension.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import move_method_to_extension
 

validation-test/Evolution/test_protocol_add_requirements.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import protocol_add_requirements
 

validation-test/Evolution/test_protocol_reorder_requirements.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import protocol_reorder_requirements
 

validation-test/Evolution/test_rth.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 // Check for the 'rth' tool itself, to make sure it's doing what we expect.
 
 import rth

validation-test/Evolution/test_struct_add_initializer.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_add_initializer
 

validation-test/Evolution/test_struct_add_property.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_add_property
 

validation-test/Evolution/test_struct_add_property_attribute.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_add_property_attribute
 

validation-test/Evolution/test_struct_change_lazy_to_computed.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_change_lazy_to_computed
 

validation-test/Evolution/test_struct_change_size.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_change_size
 

validation-test/Evolution/test_struct_change_stored_to_computed.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_change_stored_to_computed
 

validation-test/Evolution/test_struct_change_stored_to_computed_static.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_change_stored_to_computed_static
 

validation-test/Evolution/test_struct_change_stored_to_observed.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Uses swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_change_stored_to_observed
 

validation-test/Evolution/test_struct_fixed_layout_add_conformance.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_fixed_layout_add_conformance
 

validation-test/Evolution/test_struct_fixed_layout_remove_conformance.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_fixed_layout_remove_conformance
 

validation-test/Evolution/test_struct_remove_property.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_remove_property
 

validation-test/Evolution/test_struct_resilient_add_conformance.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_resilient_add_conformance
 

validation-test/Evolution/test_struct_resilient_remove_conformance.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_resilient_remove_conformance
 

validation-test/Evolution/test_struct_static_stored_to_computed.swift

@@ -1,6 +1,9 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import struct_static_stored_to_computed
 

validation-test/stdlib/ArrayNew.swift.gyb

@@ -10,6 +10,9 @@
 // RUN: %target-codesign %t/Array && %line-directive %t/main.swift -- %target-run %t/Array
 // REQUIRES: executable_test
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import StdlibCollectionUnittest
 

validation-test/stdlib/ArrayTrapsObjC.swift

@@ -4,6 +4,9 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+// Requires swift-version 4
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import Foundation
 

validation-test/stdlib/Collection/Inputs/LazyMapTemplate.swift.gyb

@@ -25,6 +25,9 @@ variations = [
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import StdlibCollectionUnittest
 

validation-test/stdlib/Collection/LazyMapBidirectionalCollection.swift

@@ -8,6 +8,9 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import StdlibCollectionUnittest
 
@@ -15,12 +18,12 @@ var CollectionTests = TestSuite("Collection")
 
 // Test collections using value types as elements.
 CollectionTests.addBidirectionalCollectionTests(
-  makeCollection: { (elements: [OpaqueValue<Int>]) -> LazyMapCollection<MinimalBidirectionalCollection<OpaqueValue<Int>>, OpaqueValue<Int>> in
+  makeCollection: { (elements: [OpaqueValue<Int>]) -> LazyMapBidirectionalCollection<MinimalBidirectionalCollection<OpaqueValue<Int>>, OpaqueValue<Int>> in
     MinimalBidirectionalCollection(elements: elements).lazy.map(identity)
   },
   wrapValue: identity,
   extractValue: identity,
-  makeCollectionOfEquatable: { (elements: [MinimalEquatableValue]) -> LazyMapCollection<MinimalBidirectionalCollection<MinimalEquatableValue>, MinimalEquatableValue> in
+  makeCollectionOfEquatable: { (elements: [MinimalEquatableValue]) -> LazyMapBidirectionalCollection<MinimalBidirectionalCollection<MinimalEquatableValue>, MinimalEquatableValue> in
     MinimalBidirectionalCollection(elements: elements).lazy.map(identityEq)
   },
   wrapValueIntoEquatable: identityEq,
@@ -29,7 +32,7 @@ CollectionTests.addBidirectionalCollectionTests(
 
 // Test collections using reference types as elements.
 CollectionTests.addBidirectionalCollectionTests(
-  makeCollection: { (elements: [LifetimeTracked]) -> LazyMapCollection<MinimalBidirectionalCollection<LifetimeTracked>, LifetimeTracked> in
+  makeCollection: { (elements: [LifetimeTracked]) -> LazyMapBidirectionalCollection<MinimalBidirectionalCollection<LifetimeTracked>, LifetimeTracked> in
     MinimalBidirectionalCollection(elements: elements).lazy.map { $0 }
   },
   wrapValue: { (element: OpaqueValue<Int>) in
@@ -38,7 +41,7 @@ CollectionTests.addBidirectionalCollectionTests(
   extractValue: { (element: LifetimeTracked) in
     OpaqueValue(element.value, identity: element.identity)
   },
-  makeCollectionOfEquatable: { (elements: [LifetimeTracked]) -> LazyMapCollection<MinimalBidirectionalCollection<LifetimeTracked>, LifetimeTracked> in
+  makeCollectionOfEquatable: { (elements: [LifetimeTracked]) -> LazyMapBidirectionalCollection<MinimalBidirectionalCollection<LifetimeTracked>, LifetimeTracked> in
     MinimalBidirectionalCollection(elements: elements).lazy.map { $0 }
   },
   wrapValueIntoEquatable: { (element: MinimalEquatableValue) in

validation-test/stdlib/Collection/LazyMapCollection.swift

@@ -8,6 +8,9 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import StdlibCollectionUnittest
 

validation-test/stdlib/Collection/LazyMapRandomAccessCollection.swift

@@ -8,6 +8,9 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
+// Use swift-version 4.
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import StdlibCollectionUnittest