diff --git a/include/swift/Basic/Features.def b/include/swift/Basic/Features.def index f39a7187cfe..79feed48fa1 100644 --- a/include/swift/Basic/Features.def +++ b/include/swift/Basic/Features.def @@ -179,6 +179,7 @@ LANGUAGE_FEATURE(MoveOnlyPartialConsumption, 429, "Partial consumption of noncop /// Enable bitwise-copyable feature. LANGUAGE_FEATURE(BitwiseCopyable, 426, "BitwiseCopyable protocol") SUPPRESSIBLE_LANGUAGE_FEATURE(ConformanceSuppression, 426, "Suppressible inferred conformances") +SUPPRESSIBLE_LANGUAGE_FEATURE(NoncopyableGenerics, 427, "Noncopyable generics") // Swift 6 UPCOMING_FEATURE(ConciseMagicFile, 274, 6) @@ -324,9 +325,6 @@ EXPERIMENTAL_FEATURE(Embedded, true) /// Enables importing the Volatile module EXPERIMENTAL_FEATURE(Volatile, true) -/// Enables noncopyable generics -SUPPRESSIBLE_EXPERIMENTAL_FEATURE(NoncopyableGenerics, true) - // Alias for NoncopyableGenerics EXPERIMENTAL_FEATURE(NoncopyableGenerics2, true) diff --git a/test/Concurrency/transfernonsendable_instruction_matching.sil b/test/Concurrency/transfernonsendable_instruction_matching.sil index 5f45db83b8a..5295850c5a3 100644 --- a/test/Concurrency/transfernonsendable_instruction_matching.sil +++ b/test/Concurrency/transfernonsendable_instruction_matching.sil @@ -1,5 +1,4 @@ // RUN: %target-sil-opt -transfer-non-sendable -enable-upcoming-feature RegionBasedIsolation -strict-concurrency=complete %s -verify -o /dev/null -// RUN: %target-sil-opt -enable-experimental-feature NoncopyableGenerics -transfer-non-sendable -enable-upcoming-feature RegionBasedIsolation -strict-concurrency=complete %s -verify -o /dev/null // REQUIRES: concurrency // REQUIRES: asserts @@ -1797,4 +1796,4 @@ bb0: %9999 = tuple () return %9999 : $() -} \ No newline at end of file +} diff --git a/test/Generics/copyable_and_self_conforming_protocols.swift b/test/Generics/copyable_and_self_conforming_protocols.swift index 12b645f4297..0edfdf0c3db 100644 --- a/test/Generics/copyable_and_self_conforming_protocols.swift +++ b/test/Generics/copyable_and_self_conforming_protocols.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NonescapableTypes %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -enable-experimental-feature NonescapableTypes %s -verify // REQUIRES: objc_interop // REQUIRES: asserts diff --git a/test/Generics/inverse_associatedtype_restriction.swift b/test/Generics/inverse_associatedtype_restriction.swift index b7bf6fc758e..4a005e1cb51 100644 --- a/test/Generics/inverse_associatedtype_restriction.swift +++ b/test/Generics/inverse_associatedtype_restriction.swift @@ -1,5 +1,4 @@ // RUN: %target-typecheck-verify-swift \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes // The restriction is that we don't permit suppression requirements on diff --git a/test/Generics/inverse_classes1.swift b/test/Generics/inverse_classes1.swift index b2157bc6efb..a303e88a25e 100644 --- a/test/Generics/inverse_classes1.swift +++ b/test/Generics/inverse_classes1.swift @@ -1,7 +1,6 @@ // RUN: %target-typecheck-verify-swift \ // RUN: -parse-stdlib -module-name Swift \ -// RUN: -enable-experimental-feature MoveOnlyClasses \ -// RUN: -enable-experimental-feature NoncopyableGenerics +// RUN: -enable-experimental-feature MoveOnlyClasses // NOTE: -parse-stdlib is a transitional workaround and should not be required. diff --git a/test/Generics/inverse_classes2.swift b/test/Generics/inverse_classes2.swift index 99d02e82cc3..454be2ade26 100644 --- a/test/Generics/inverse_classes2.swift +++ b/test/Generics/inverse_classes2.swift @@ -1,6 +1,5 @@ // RUN: %target-typecheck-verify-swift \ -// RUN: -parse-stdlib -module-name Swift \ -// RUN: -enable-experimental-feature NoncopyableGenerics +// RUN: -parse-stdlib -module-name Swift // NOTE: -parse-stdlib is a transitional workaround and should not be required. diff --git a/test/Generics/inverse_conditional_conformance_restriction.swift b/test/Generics/inverse_conditional_conformance_restriction.swift index b11d7741013..f1face72c74 100644 --- a/test/Generics/inverse_conditional_conformance_restriction.swift +++ b/test/Generics/inverse_conditional_conformance_restriction.swift @@ -1,5 +1,4 @@ // RUN: %target-typecheck-verify-swift \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes diff --git a/test/Generics/inverse_copyable_requirement.swift b/test/Generics/inverse_copyable_requirement.swift index fab8234090c..67f18c82748 100644 --- a/test/Generics/inverse_copyable_requirement.swift +++ b/test/Generics/inverse_copyable_requirement.swift @@ -1,5 +1,4 @@ // RUN: %target-typecheck-verify-swift -// RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics // a concrete move-only type struct MO: ~Copyable { diff --git a/test/Generics/inverse_copyable_requirement_errors.swift b/test/Generics/inverse_copyable_requirement_errors.swift index 96935e9dcea..b038f22ba5e 100644 --- a/test/Generics/inverse_copyable_requirement_errors.swift +++ b/test/Generics/inverse_copyable_requirement_errors.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics +// RUN: %target-typecheck-verify-swift // a concrete move-only type struct MO: ~Copyable { diff --git a/test/Generics/inverse_extension_signatures.swift b/test/Generics/inverse_extension_signatures.swift index 07e405a852f..779b93dc622 100644 --- a/test/Generics/inverse_extension_signatures.swift +++ b/test/Generics/inverse_extension_signatures.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-frontend \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -verify -typecheck %s -debug-generic-signatures \ // RUN: -debug-inverse-requirements 2>&1 | %FileCheck %s --implicit-check-not "error:" diff --git a/test/Generics/inverse_extensions.swift b/test/Generics/inverse_extensions.swift index e0078771879..7ff07abcee4 100644 --- a/test/Generics/inverse_extensions.swift +++ b/test/Generics/inverse_extensions.swift @@ -1,5 +1,4 @@ // RUN: %target-typecheck-verify-swift \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes diff --git a/test/Generics/inverse_generics.swift b/test/Generics/inverse_generics.swift index 06aa5ef2b27..52d73f3db5c 100644 --- a/test/Generics/inverse_generics.swift +++ b/test/Generics/inverse_generics.swift @@ -1,5 +1,4 @@ // RUN: %target-typecheck-verify-swift \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes diff --git a/test/Generics/inverse_generics_stdlib.swift b/test/Generics/inverse_generics_stdlib.swift index 090356a39ce..3eea8b8f792 100644 --- a/test/Generics/inverse_generics_stdlib.swift +++ b/test/Generics/inverse_generics_stdlib.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -parse-stdlib -module-name Swift -enable-experimental-feature BuiltinModule -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NonescapableTypes +// RUN: %target-typecheck-verify-swift -parse-stdlib -module-name Swift -enable-experimental-feature BuiltinModule -enable-experimental-feature NonescapableTypes diff --git a/test/Generics/inverse_protocols.swift b/test/Generics/inverse_protocols.swift index 0a86cc967b6..ac75e49ed8d 100644 --- a/test/Generics/inverse_protocols.swift +++ b/test/Generics/inverse_protocols.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics +// RUN: %target-typecheck-verify-swift diff --git a/test/Generics/inverse_protocols_errors.swift b/test/Generics/inverse_protocols_errors.swift index 7f68670687d..a2fe0d6f391 100644 --- a/test/Generics/inverse_protocols_errors.swift +++ b/test/Generics/inverse_protocols_errors.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics +// RUN: %target-typecheck-verify-swift diff --git a/test/Generics/inverse_rdar119950540.swift b/test/Generics/inverse_rdar119950540.swift index b03ac0c36e2..d514373a896 100644 --- a/test/Generics/inverse_rdar119950540.swift +++ b/test/Generics/inverse_rdar119950540.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen -enable-experimental-feature NoncopyableGenerics > /dev/null +// RUN: %target-swift-frontend %s -emit-silgen > /dev/null diff --git a/test/Generics/inverse_scoping.swift b/test/Generics/inverse_scoping.swift index e21222bfb54..dbe4df360ca 100644 --- a/test/Generics/inverse_scoping.swift +++ b/test/Generics/inverse_scoping.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NonescapableTypes -enable-experimental-feature SuppressedAssociatedTypes +// RUN: %target-typecheck-verify-swift -enable-experimental-feature NonescapableTypes -enable-experimental-feature SuppressedAssociatedTypes diff --git a/test/Generics/inverse_signatures.swift b/test/Generics/inverse_signatures.swift index f7556bb30ac..4ee2394cac8 100644 --- a/test/Generics/inverse_signatures.swift +++ b/test/Generics/inverse_signatures.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-frontend \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes \ // RUN: -verify -typecheck %s -debug-generic-signatures \ diff --git a/test/IRGen/existential_shape_metadata_noncopyable.swift b/test/IRGen/existential_shape_metadata_noncopyable.swift index d7015e6dcb3..f8aed6f4aa3 100644 --- a/test/IRGen/existential_shape_metadata_noncopyable.swift +++ b/test/IRGen/existential_shape_metadata_noncopyable.swift @@ -1,7 +1,6 @@ // RUN: %target-swift-frontend \ // RUN: -emit-ir %s -swift-version 5 \ // RUN: -disable-availability-checking \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes \ // RUN: -module-name existential_shape_metadata | %IRGenFileCheck %s diff --git a/test/IRGen/mangling_inverse_generics_evolution.swift b/test/IRGen/mangling_inverse_generics_evolution.swift index 958450ebe56..c45882a3efe 100644 --- a/test/IRGen/mangling_inverse_generics_evolution.swift +++ b/test/IRGen/mangling_inverse_generics_evolution.swift @@ -1,6 +1,5 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-ir -o - %s -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -parse-as-library \ diff --git a/test/IRGen/moveonly_enum_deinits.swift b/test/IRGen/moveonly_enum_deinits.swift index 0478ffcda23..7e1d18f4942 100644 --- a/test/IRGen/moveonly_enum_deinits.swift +++ b/test/IRGen/moveonly_enum_deinits.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-emit-irgen \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -disable-type-layout \ // RUN: %s \ // RUN: | \ diff --git a/test/IRGen/moveonly_value_functions.swift b/test/IRGen/moveonly_value_functions.swift index b0b8e03a04e..7033e8a91ec 100644 --- a/test/IRGen/moveonly_value_functions.swift +++ b/test/IRGen/moveonly_value_functions.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-emit-irgen -O \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -disable-type-layout \ // RUN: %s \ // RUN: | \ diff --git a/test/IRGen/moveonly_value_functions_onone.swift b/test/IRGen/moveonly_value_functions_onone.swift index f93e993baff..9530a4b82bc 100644 --- a/test/IRGen/moveonly_value_functions_onone.swift +++ b/test/IRGen/moveonly_value_functions_onone.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-emit-irgen -Onone \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: %s \ // RUN: | \ // RUN: %IRGenFileCheck %s diff --git a/test/IRGen/noncopyable_field_descriptors.swift b/test/IRGen/noncopyable_field_descriptors.swift index 7afa4521a69..a8da62e8760 100644 --- a/test/IRGen/noncopyable_field_descriptors.swift +++ b/test/IRGen/noncopyable_field_descriptors.swift @@ -1,6 +1,5 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-ir -o - %s -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -parse-as-library \ // RUN: -enable-library-evolution \ diff --git a/test/Interop/Cxx/class/move-only/inherited-field-access-irgen.swift b/test/Interop/Cxx/class/move-only/inherited-field-access-irgen.swift index 4fb2c0ac5ed..77d89f906d4 100644 --- a/test/Interop/Cxx/class/move-only/inherited-field-access-irgen.swift +++ b/test/Interop/Cxx/class/move-only/inherited-field-access-irgen.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-emit-irgen -I %S/Inputs -cxx-interoperability-mode=swift-6 -enable-experimental-feature NoncopyableGenerics %s -validate-tbd-against-ir=none -Xcc -fignore-exceptions | %FileCheck %s -// RUN: %target-swift-emit-irgen -I %S/Inputs -cxx-interoperability-mode=upcoming-swift -enable-experimental-feature NoncopyableGenerics %s -validate-tbd-against-ir=none -Xcc -fignore-exceptions | %FileCheck %s +// RUN: %target-swift-emit-irgen -I %S/Inputs -cxx-interoperability-mode=swift-6 %s -validate-tbd-against-ir=none -Xcc -fignore-exceptions | %FileCheck %s +// RUN: %target-swift-emit-irgen -I %S/Inputs -cxx-interoperability-mode=upcoming-swift %s -validate-tbd-against-ir=none -Xcc -fignore-exceptions | %FileCheck %s import MoveOnlyCxxValueType diff --git a/test/Interop/Cxx/class/move-only/inherited-field-access-silgen.swift b/test/Interop/Cxx/class/move-only/inherited-field-access-silgen.swift index 4ab21095e0e..b003a1d08f9 100644 --- a/test/Interop/Cxx/class/move-only/inherited-field-access-silgen.swift +++ b/test/Interop/Cxx/class/move-only/inherited-field-access-silgen.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-emit-sil -I %S/Inputs -cxx-interoperability-mode=swift-6 -enable-experimental-feature NoncopyableGenerics %s -validate-tbd-against-ir=none | %FileCheck %s -// RUN: %target-swift-emit-sil -I %S/Inputs -cxx-interoperability-mode=upcoming-swift -enable-experimental-feature NoncopyableGenerics %s -validate-tbd-against-ir=none | %FileCheck %s +// RUN: %target-swift-emit-sil -I %S/Inputs -cxx-interoperability-mode=swift-6 %s -validate-tbd-against-ir=none | %FileCheck %s +// RUN: %target-swift-emit-sil -I %S/Inputs -cxx-interoperability-mode=upcoming-swift %s -validate-tbd-against-ir=none | %FileCheck %s import MoveOnlyCxxValueType diff --git a/test/Interpreter/currying_generics.swift b/test/Interpreter/currying_generics.swift index c2e648b1b98..5742330fe9a 100644 --- a/test/Interpreter/currying_generics.swift +++ b/test/Interpreter/currying_generics.swift @@ -1,5 +1,4 @@ // RUN: %target-run-simple-swift | %FileCheck %s -// RUN: %target-run-simple-swift -enable-experimental-feature NoncopyableGenerics | %FileCheck %s // REQUIRES: executable_test diff --git a/test/Interpreter/escapable_generics_casting.swift b/test/Interpreter/escapable_generics_casting.swift index 462688e2e1c..2826469986c 100644 --- a/test/Interpreter/escapable_generics_casting.swift +++ b/test/Interpreter/escapable_generics_casting.swift @@ -1,5 +1,5 @@ -// RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NonescapableTypes) | %FileCheck %s -// RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NonescapableTypes) | %FileCheck %s +// RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all -enable-experimental-feature NonescapableTypes) | %FileCheck %s +// RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all -enable-experimental-feature NonescapableTypes) | %FileCheck %s // REQUIRES: executable_test, asserts diff --git a/test/Interpreter/existential_member_accesses_self_assoctype.swift b/test/Interpreter/existential_member_accesses_self_assoctype.swift index 5e6df4da88b..231156dde70 100644 --- a/test/Interpreter/existential_member_accesses_self_assoctype.swift +++ b/test/Interpreter/existential_member_accesses_self_assoctype.swift @@ -1,5 +1,4 @@ // RUN: %target-run-simple-swift -// RUN: %target-run-simple-swift -enable-experimental-feature NoncopyableGenerics // REQUIRES: executable_test import StdlibUnittest diff --git a/test/Interpreter/generic_casts.swift b/test/Interpreter/generic_casts.swift index 4d4c45b5571..b27abbe1466 100644 --- a/test/Interpreter/generic_casts.swift +++ b/test/Interpreter/generic_casts.swift @@ -7,8 +7,8 @@ // RUN: %target-run %t/a.out | %FileCheck --check-prefix CHECK %s // RUN: %target-run %t/a.out.optimized | %FileCheck --check-prefix CHECK %s -// RUN: %target-build-swift -enable-experimental-feature NoncopyableGenerics -Onone %s -o %t/a.out -// RUN: %target-build-swift -enable-experimental-feature NoncopyableGenerics -O %s -o %t/a.out.optimized +// RUN: %target-build-swift -Onone %s -o %t/a.out +// RUN: %target-build-swift -O %s -o %t/a.out.optimized // RUN: %target-codesign %t/a.out // RUN: %target-codesign %t/a.out.optimized // diff --git a/test/Interpreter/generic_casts_objc.swift b/test/Interpreter/generic_casts_objc.swift index 67dad3618db..efeef4a3c6a 100644 --- a/test/Interpreter/generic_casts_objc.swift +++ b/test/Interpreter/generic_casts_objc.swift @@ -6,10 +6,10 @@ // RUN: %target-codesign %t/a.out.optimized // RUN: %target-run %t/a.out.optimized | %FileCheck %s -// RUN: %target-build-swift -enable-experimental-feature NoncopyableGenerics -Onone %s -o %t/a.out +// RUN: %target-build-swift -Onone %s -o %t/a.out // RUN: %target-codesign %t/a.out // RUN: %target-run %t/a.out | %FileCheck %s -// RUN: %target-build-swift -enable-experimental-feature NoncopyableGenerics -O %s -o %t/a.out.optimized +// RUN: %target-build-swift -O %s -o %t/a.out.optimized // RUN: %target-codesign %t/a.out.optimized // RUN: %target-run %t/a.out.optimized | %FileCheck %s diff --git a/test/Interpreter/moveonly_address_maximize.swift b/test/Interpreter/moveonly_address_maximize.swift index af528546b1b..30072e9b579 100644 --- a/test/Interpreter/moveonly_address_maximize.swift +++ b/test/Interpreter/moveonly_address_maximize.swift @@ -1,9 +1,6 @@ // RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all) | %FileCheck %s // RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all) | %FileCheck %s -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -Xfrontend -sil-verify-all) | %FileCheck %s -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -O -Xfrontend -sil-verify-all) | %FileCheck %s - // REQUIRES: executable_test struct S : ~Copyable { diff --git a/test/Interpreter/moveonly_bufferview.swift b/test/Interpreter/moveonly_bufferview.swift index d8db4b97438..b120ee9ac87 100644 --- a/test/Interpreter/moveonly_bufferview.swift +++ b/test/Interpreter/moveonly_bufferview.swift @@ -1,9 +1,6 @@ // RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all) | %FileCheck %s // RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all) | %FileCheck %s -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -Xfrontend -sil-verify-all) | %FileCheck %s -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -O -Xfrontend -sil-verify-all) | %FileCheck %s - // REQUIRES: executable_test public struct BufferView: ~Copyable { diff --git a/test/Interpreter/moveonly_computed_property_in_class.swift b/test/Interpreter/moveonly_computed_property_in_class.swift index 80589a08a1d..08cc881ed04 100644 --- a/test/Interpreter/moveonly_computed_property_in_class.swift +++ b/test/Interpreter/moveonly_computed_property_in_class.swift @@ -1,9 +1,6 @@ // RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all) // RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all) -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -Xfrontend -sil-verify-all) -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -O -Xfrontend -sil-verify-all) - // REQUIRES: executable_test @_moveOnly struct FileDescriptor { diff --git a/test/Interpreter/moveonly_consuming_param.swift b/test/Interpreter/moveonly_consuming_param.swift index e89198c8a0b..4a7f50e9c57 100644 --- a/test/Interpreter/moveonly_consuming_param.swift +++ b/test/Interpreter/moveonly_consuming_param.swift @@ -1,9 +1,6 @@ // RUN: %target-run-simple-swift | %FileCheck %s // RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all) | %FileCheck %s -// RUN: %target-run-simple-swift -enable-experimental-feature NoncopyableGenerics | %FileCheck %s -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -O -Xfrontend -sil-verify-all) | %FileCheck %s - // REQUIRES: executable_test @_moveOnly diff --git a/test/Interpreter/moveonly_deinit_autoclosure.swift b/test/Interpreter/moveonly_deinit_autoclosure.swift index 82c6a36870e..3c89be208b8 100644 --- a/test/Interpreter/moveonly_deinit_autoclosure.swift +++ b/test/Interpreter/moveonly_deinit_autoclosure.swift @@ -1,5 +1,4 @@ // RUN: %target-run-simple-swift -// RUN: %target-run-simple-swift -enable-experimental-feature NoncopyableGenerics // REQUIRES: executable_test diff --git a/test/Interpreter/moveonly_discard.swift b/test/Interpreter/moveonly_discard.swift index c642a704ee2..d0c530c2ed8 100644 --- a/test/Interpreter/moveonly_discard.swift +++ b/test/Interpreter/moveonly_discard.swift @@ -1,9 +1,6 @@ // RUN: %target-run-simple-swift(-Xfrontend -enable-experimental-feature -Xfrontend MoveOnlyEnumDeinits -Xfrontend -sil-verify-all) | %FileCheck %s --implicit-check-not closing // RUN: %target-run-simple-swift(-O -Xfrontend -enable-experimental-feature -Xfrontend MoveOnlyEnumDeinits -Xfrontend -sil-verify-all) | %FileCheck %s --implicit-check-not closing -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -Xfrontend -enable-experimental-feature -Xfrontend MoveOnlyEnumDeinits -Xfrontend -sil-verify-all) | %FileCheck %s --implicit-check-not closing -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -O -Xfrontend -enable-experimental-feature -Xfrontend MoveOnlyEnumDeinits -Xfrontend -sil-verify-all) | %FileCheck %s --implicit-check-not closing - // REQUIRES: executable_test // NOTE: it's important that this test has the `--implicit-check-not closing` flag to catch double deinits!! diff --git a/test/Interpreter/moveonly_escaping_capture_lifetimes.swift b/test/Interpreter/moveonly_escaping_capture_lifetimes.swift index 9c1ffc29205..620349b8e65 100644 --- a/test/Interpreter/moveonly_escaping_capture_lifetimes.swift +++ b/test/Interpreter/moveonly_escaping_capture_lifetimes.swift @@ -1,9 +1,6 @@ // RUN: %target-run-simple-swift | %FileCheck %s // RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all) | %FileCheck %s -// RUN: %target-run-simple-swift -enable-experimental-feature NoncopyableGenerics | %FileCheck %s -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -O -Xfrontend -sil-verify-all) | %FileCheck %s - // REQUIRES: executable_test @_moveOnly diff --git a/test/Interpreter/moveonly_escaping_definite_initialization.swift b/test/Interpreter/moveonly_escaping_definite_initialization.swift index d59c21a768d..4b8f9e8e3ce 100644 --- a/test/Interpreter/moveonly_escaping_definite_initialization.swift +++ b/test/Interpreter/moveonly_escaping_definite_initialization.swift @@ -1,9 +1,6 @@ // RUN: %target-run-simple-swift | %FileCheck %s // RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all) | %FileCheck %s -// RUN: %target-run-simple-swift -enable-experimental-feature NoncopyableGenerics | %FileCheck %s -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -O -Xfrontend -sil-verify-all) | %FileCheck %s - // REQUIRES: executable_test @_moveOnly diff --git a/test/Interpreter/moveonly_field_in_class_reflection.swift b/test/Interpreter/moveonly_field_in_class_reflection.swift index 4990faef4a9..4ff8ad178df 100644 --- a/test/Interpreter/moveonly_field_in_class_reflection.swift +++ b/test/Interpreter/moveonly_field_in_class_reflection.swift @@ -1,9 +1,6 @@ // RUN: %target-run-simple-swift(-Xfrontend -enable-experimental-move-only) // RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all -Xfrontend -enable-experimental-move-only) -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -Xfrontend -enable-experimental-move-only) -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -O -Xfrontend -sil-verify-all -Xfrontend -enable-experimental-move-only) - // REQUIRES: executable_test // Verify that iterating through the fields of an object whose class has diff --git a/test/Interpreter/moveonly_generics.swift b/test/Interpreter/moveonly_generics.swift index 476b9357024..5dfcc1b7a88 100644 --- a/test/Interpreter/moveonly_generics.swift +++ b/test/Interpreter/moveonly_generics.swift @@ -1,5 +1,5 @@ -// RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all -enable-experimental-feature NoncopyableGenerics) -// RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all -enable-experimental-feature NoncopyableGenerics) +// RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all) +// RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all) // REQUIRES: executable_test // REQUIRES: asserts diff --git a/test/Interpreter/moveonly_generics_associatedtype.swift b/test/Interpreter/moveonly_generics_associatedtype.swift index 4ee540498cf..4dfd34e7d97 100644 --- a/test/Interpreter/moveonly_generics_associatedtype.swift +++ b/test/Interpreter/moveonly_generics_associatedtype.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-emit-sil %s -DBAD_COPY -verify -sil-verify-all -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature SuppressedAssociatedTypes -// RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature SuppressedAssociatedTypes) | %FileCheck %s -// RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature SuppressedAssociatedTypes) | %FileCheck %s +// RUN: %target-swift-emit-sil %s -DBAD_COPY -verify -sil-verify-all -enable-experimental-feature SuppressedAssociatedTypes +// RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all -enable-experimental-feature SuppressedAssociatedTypes) | %FileCheck %s +// RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all -enable-experimental-feature SuppressedAssociatedTypes) | %FileCheck %s // REQUIRES: executable_test // REQUIRES: asserts diff --git a/test/Interpreter/moveonly_generics_casting.swift b/test/Interpreter/moveonly_generics_casting.swift index e8acdce8d85..1b838817a30 100644 --- a/test/Interpreter/moveonly_generics_casting.swift +++ b/test/Interpreter/moveonly_generics_casting.swift @@ -1,5 +1,5 @@ -// RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all -enable-experimental-feature NoncopyableGenerics) | %FileCheck %s -// RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all -enable-experimental-feature NoncopyableGenerics) | %FileCheck %s +// RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all) | %FileCheck %s +// RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all) | %FileCheck %s // REQUIRES: executable_test diff --git a/test/Interpreter/moveonly_generics_casting_assoctypes.swift b/test/Interpreter/moveonly_generics_casting_assoctypes.swift index 6a161ecaf09..9be076723e7 100644 --- a/test/Interpreter/moveonly_generics_casting_assoctypes.swift +++ b/test/Interpreter/moveonly_generics_casting_assoctypes.swift @@ -1,5 +1,5 @@ -// RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature SuppressedAssociatedTypes) -// RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature SuppressedAssociatedTypes) +// RUN: %target-run-simple-swift(-Xfrontend -sil-verify-all -enable-experimental-feature SuppressedAssociatedTypes) +// RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all -enable-experimental-feature SuppressedAssociatedTypes) // REQUIRES: executable_test diff --git a/test/Interpreter/moveonly_linkedlist.swift b/test/Interpreter/moveonly_linkedlist.swift index baac8232b84..d3be7489ef4 100644 --- a/test/Interpreter/moveonly_linkedlist.swift +++ b/test/Interpreter/moveonly_linkedlist.swift @@ -2,10 +2,6 @@ // RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all) // RUN: %target-run-simple-swift(-O -Xfrontend -sil-verify-all -Xfrontend -enable-ossa-modules) -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -Xfrontend -sil-verify-all) -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -O -Xfrontend -sil-verify-all) -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics -O -Xfrontend -sil-verify-all -Xfrontend -enable-ossa-modules) - // REQUIRES: executable_test /// A class that we use as a box to store the memory for one of our linked list diff --git a/test/Interpreter/moveonly_linkedlist_2_simple.swift b/test/Interpreter/moveonly_linkedlist_2_simple.swift index f0e43dc8934..806e3358267 100644 --- a/test/Interpreter/moveonly_linkedlist_2_simple.swift +++ b/test/Interpreter/moveonly_linkedlist_2_simple.swift @@ -1,14 +1,13 @@ // RUN: %target-swift-emit-irgen \ // RUN: -parse-as-library \ // RUN: -enable-builtin-module \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature BorrowingSwitch \ // RUN: %s \ // RUN: | \ // RUN: %FileCheck %s --check-prefix=CHECK-IR -// RUN: %target-run-simple-swift(-parse-as-library -enable-builtin-module -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature BorrowingSwitch -Xfrontend -sil-verify-all) | %FileCheck %s -// RUN: %target-run-simple-swift(-O -parse-as-library -enable-builtin-module -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature BorrowingSwitch -Xfrontend -sil-verify-all) | %FileCheck %s -// RUN: %target-run-simple-swift(-O -parse-as-library -enable-builtin-module -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature BorrowingSwitch -Xfrontend -sil-verify-all -Xfrontend -enable-ossa-modules) | %FileCheck %s +// RUN: %target-run-simple-swift(-parse-as-library -enable-builtin-module -enable-experimental-feature BorrowingSwitch -Xfrontend -sil-verify-all) | %FileCheck %s +// RUN: %target-run-simple-swift(-O -parse-as-library -enable-builtin-module -enable-experimental-feature BorrowingSwitch -Xfrontend -sil-verify-all) | %FileCheck %s +// RUN: %target-run-simple-swift(-O -parse-as-library -enable-builtin-module -enable-experimental-feature BorrowingSwitch -Xfrontend -sil-verify-all -Xfrontend -enable-ossa-modules) | %FileCheck %s // REQUIRES: executable_test diff --git a/test/Interpreter/moveonly_swiftskell.swift b/test/Interpreter/moveonly_swiftskell.swift index 1b6f390c4b6..c72da983a3a 100644 --- a/test/Interpreter/moveonly_swiftskell.swift +++ b/test/Interpreter/moveonly_swiftskell.swift @@ -6,7 +6,6 @@ // RUN: -module-name Swiftskell \ // RUN: -parse-as-library \ // RUN: %S/../Inputs/Swiftskell.swift -c -o %t/Swiftskell.o \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -enable-experimental-feature BorrowingSwitch @@ -26,4 +25,4 @@ import Swiftskell print("hello, world") -// CHECK: hello, world \ No newline at end of file +// CHECK: hello, world diff --git a/test/Interpreter/protocol_extensions.swift b/test/Interpreter/protocol_extensions.swift index 1857bdf25ae..e657f1e0f4e 100644 --- a/test/Interpreter/protocol_extensions.swift +++ b/test/Interpreter/protocol_extensions.swift @@ -1,5 +1,4 @@ // RUN: %target-run-simple-swift -// RUN: %target-run-simple-swift -enable-experimental-feature NoncopyableGenerics // REQUIRES: executable_test import StdlibUnittest diff --git a/test/ModuleInterface/invertible_constraints.swift b/test/ModuleInterface/invertible_constraints.swift index 61b2e82bc79..890567057e3 100644 --- a/test/ModuleInterface/invertible_constraints.swift +++ b/test/ModuleInterface/invertible_constraints.swift @@ -1,5 +1,5 @@ // RUN: %empty-directory(%t) -// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s -module-name Test -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature SuppressedAssociatedTypes +// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s -module-name Test -enable-experimental-feature SuppressedAssociatedTypes // RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -module-name Test // RUN: %FileCheck %s < %t.swiftinterface diff --git a/test/ModuleInterface/invertible_protocols.swift b/test/ModuleInterface/invertible_protocols.swift index 28d337232d8..712d0b2c9bf 100644 --- a/test/ModuleInterface/invertible_protocols.swift +++ b/test/ModuleInterface/invertible_protocols.swift @@ -2,7 +2,6 @@ // RUN: -swift-version 5 \ // RUN: -enable-library-evolution \ // RUN: -emit-module -module-name Swift -parse-stdlib \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -o %t/Swift.swiftmodule \ // RUN: -emit-module-interface-path %t/Swift.swiftinterface diff --git a/test/ModuleInterface/lifetime_dependence_test.swift b/test/ModuleInterface/lifetime_dependence_test.swift index 3cc3f29a9f1..f1198012c45 100644 --- a/test/ModuleInterface/lifetime_dependence_test.swift +++ b/test/ModuleInterface/lifetime_dependence_test.swift @@ -1,7 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -emit-module \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -o %t/lifetime_dependence.swiftmodule \ // RUN: -emit-module-interface-path %t/lifetime_dependence.swiftinterface \ @@ -15,12 +14,10 @@ // See if we can compile a module through just the interface and typecheck using it. // RUN: %target-swift-frontend -compile-module-from-interface \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: %t/lifetime_dependence.swiftinterface -o %t/lifetime_dependence.swiftmodule // RUN: %target-swift-frontend -typecheck -I %t %s \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes import lifetime_dependence diff --git a/test/ModuleInterface/noncopyable_generics.swift b/test/ModuleInterface/noncopyable_generics.swift index 2425eb2dd58..dfc46a4414e 100644 --- a/test/ModuleInterface/noncopyable_generics.swift +++ b/test/ModuleInterface/noncopyable_generics.swift @@ -1,7 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -emit-module \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -o %t/NoncopyableGenerics_Misc.swiftmodule \ @@ -9,7 +8,6 @@ // RUN: %S/Inputs/NoncopyableGenerics_Misc.swift // RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -emit-module \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -enable-experimental-feature BorrowingSwitch \ @@ -25,19 +23,16 @@ // See if we can compile a module through just the interface and typecheck using it. // RUN: %target-swift-frontend -compile-module-from-interface \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: %t/NoncopyableGenerics_Misc.swiftinterface -o %t/NoncopyableGenerics_Misc.swiftmodule // RUN: %target-swift-frontend -compile-module-from-interface \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: %t/Swiftskell.swiftinterface -o %t/Swiftskell.swiftmodule // RUN: %target-swift-frontend -emit-silgen -I %t %s \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -o %t/final.silgen diff --git a/test/Parse/explicit_lifetime_dependence_specifiers.swift b/test/Parse/explicit_lifetime_dependence_specifiers.swift index 3012a185804..41ce8e787aa 100644 --- a/test/Parse/explicit_lifetime_dependence_specifiers.swift +++ b/test/Parse/explicit_lifetime_dependence_specifiers.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature NonescapableTypes -enable-experimental-feature NoncopyableGenerics -enable-builtin-module +// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature NonescapableTypes -enable-builtin-module // REQUIRES: asserts import Builtin diff --git a/test/Parse/inverse_escapable_feature.swift b/test/Parse/inverse_escapable_feature.swift index d719f418d05..a55198ab4f5 100644 --- a/test/Parse/inverse_escapable_feature.swift +++ b/test/Parse/inverse_escapable_feature.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics +// RUN: %target-typecheck-verify-swift diff --git a/test/Parse/inverses.swift b/test/Parse/inverses.swift index 9262dadf826..0d92571e05d 100644 --- a/test/Parse/inverses.swift +++ b/test/Parse/inverses.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature SuppressedAssociatedTypes +// RUN: %target-typecheck-verify-swift -enable-experimental-feature SuppressedAssociatedTypes protocol U {} diff --git a/test/SIL/Parser/basic2_noncopyable_generics.sil b/test/SIL/Parser/basic2_noncopyable_generics.sil index e65e1bc8283..949f988a5e7 100644 --- a/test/SIL/Parser/basic2_noncopyable_generics.sil +++ b/test/SIL/Parser/basic2_noncopyable_generics.sil @@ -1,15 +1,13 @@ // RUN: %target-sil-opt \ // RUN: %s \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: | \ // RUN: %target-sil-opt \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: | \ // RUN: %FileCheck %s -// For -enable-experimental-feature NoncopyableGenerics/NonescapableTypes +// For -enable-experimental-feature NonescapableTypes // REQUIRES: asserts // TODO: Once NoncopyableGenerics/NonescapableTypes is no longer behind a feature flag, merge this into basic2. diff --git a/test/SIL/Parser/lifetime_dependence.sil b/test/SIL/Parser/lifetime_dependence.sil index 08067259bd3..09a575090d0 100644 --- a/test/SIL/Parser/lifetime_dependence.sil +++ b/test/SIL/Parser/lifetime_dependence.sil @@ -1,6 +1,5 @@ // RUN: %target-sil-opt %s \ -// RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics | %FileCheck %s +// RUN: -enable-experimental-feature NonescapableTypes | %FileCheck %s sil_stage canonical diff --git a/test/SIL/explicit_lifetime_dependence_specifiers.swift b/test/SIL/explicit_lifetime_dependence_specifiers.swift index bbad74cd79d..d0e837b8e4b 100644 --- a/test/SIL/explicit_lifetime_dependence_specifiers.swift +++ b/test/SIL/explicit_lifetime_dependence_specifiers.swift @@ -1,8 +1,7 @@ // RUN: %target-swift-frontend %s \ // RUN: -emit-sil \ // RUN: -enable-builtin-module \ -// RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics | %FileCheck %s +// RUN: -enable-experimental-feature NonescapableTypes | %FileCheck %s import Builtin diff --git a/test/SIL/implicit_lifetime_dependence.swift b/test/SIL/implicit_lifetime_dependence.swift index 1edff52b774..9c140741c0d 100644 --- a/test/SIL/implicit_lifetime_dependence.swift +++ b/test/SIL/implicit_lifetime_dependence.swift @@ -1,7 +1,6 @@ // RUN: %target-swift-frontend %s \ // RUN: -emit-sil -disable-availability-checking \ -// RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics | %FileCheck %s +// RUN: -enable-experimental-feature NonescapableTypes | %FileCheck %s // REQUIRES: asserts struct BufferView : ~Escapable { diff --git a/test/SIL/lifetime_dependence_buffer_view_test.swift b/test/SIL/lifetime_dependence_buffer_view_test.swift index 529697c9e7a..737b42a427a 100644 --- a/test/SIL/lifetime_dependence_buffer_view_test.swift +++ b/test/SIL/lifetime_dependence_buffer_view_test.swift @@ -1,6 +1,5 @@ // RUN: %target-swift-frontend %s -emit-sil \ -// RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics +// RUN: -enable-experimental-feature NonescapableTypes // REQUIRES: asserts // REQUIRES: swift_in_compiler diff --git a/test/SIL/lifetime_dependence_generics.swift b/test/SIL/lifetime_dependence_generics.swift index cb58f2dbc35..63cf426c0d6 100644 --- a/test/SIL/lifetime_dependence_generics.swift +++ b/test/SIL/lifetime_dependence_generics.swift @@ -1,7 +1,6 @@ // RUN: %target-swift-frontend %s -emit-sil \ // RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature SuppressedAssociatedTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics | %FileCheck %s +// RUN: -enable-experimental-feature SuppressedAssociatedTypes | %FileCheck %s protocol P { diff --git a/test/SIL/type_lowering_unit.sil b/test/SIL/type_lowering_unit.sil index 39c2ef0e77b..e4cdb1996d2 100644 --- a/test/SIL/type_lowering_unit.sil +++ b/test/SIL/type_lowering_unit.sil @@ -1,5 +1,5 @@ // RUN: %target-sil-opt -test-runner \ -// RUN: -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NonescapableTypes \ +// RUN: -enable-experimental-feature NonescapableTypes \ // RUN: %s -o /dev/null 2>&1 | %FileCheck %s sil_stage raw diff --git a/test/SILGen/bitwise_copyable_stdlib.swift b/test/SILGen/bitwise_copyable_stdlib.swift index b6a7b280701..22c6d08789c 100644 --- a/test/SILGen/bitwise_copyable_stdlib.swift +++ b/test/SILGen/bitwise_copyable_stdlib.swift @@ -1,4 +1,4 @@ -// R N: %target-swift-frontend -enable-experimental-feature NonescapableTypes -enable-experimental-feature BuiltinModule -enable-experimental-feature NoncopyableGenerics -parse-stdlib -module-name Swift -DEMPTY -emit-sil -verify %s +// R N: %target-swift-frontend -enable-experimental-feature NonescapableTypes -enable-experimental-feature BuiltinModule -parse-stdlib -module-name Swift -DEMPTY -emit-sil -verify %s // RUN: %target-swift-frontend \ // RUN: -emit-sil \ @@ -7,7 +7,6 @@ // RUN: -module-name Swift \ // RUN: -disable-availability-checking \ // RUN: -enable-experimental-feature BuiltinModule \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -enable-builtin-module diff --git a/test/SILGen/borrowing_switch_return_binding_compat.swift b/test/SILGen/borrowing_switch_return_binding_compat.swift index fbc405e7276..3df872e6e10 100644 --- a/test/SILGen/borrowing_switch_return_binding_compat.swift +++ b/test/SILGen/borrowing_switch_return_binding_compat.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-emit-silgen -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature BorrowingSwitch -verify %s +// RUN: %target-swift-emit-silgen -enable-experimental-feature BorrowingSwitch -verify %s func orElse( x: consuming T?, defaultValue: @autoclosure () throws -> T? diff --git a/test/SILGen/borrowing_switch_return_on_all_paths.swift b/test/SILGen/borrowing_switch_return_on_all_paths.swift index b69dc533459..277e2ad7bed 100644 --- a/test/SILGen/borrowing_switch_return_on_all_paths.swift +++ b/test/SILGen/borrowing_switch_return_on_all_paths.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-emit-silgen -enable-experimental-feature BorrowingSwitch -enable-experimental-feature NoncopyableGenerics -verify %s +// RUN: %target-swift-emit-silgen -enable-experimental-feature BorrowingSwitch -verify %s struct Box: ~Copyable { var wrapped: Wrapped { diff --git a/test/SILGen/mangling_inverse_generics.swift b/test/SILGen/mangling_inverse_generics.swift index b3e5d9af0ad..1395654d30d 100644 --- a/test/SILGen/mangling_inverse_generics.swift +++ b/test/SILGen/mangling_inverse_generics.swift @@ -1,6 +1,5 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-emit-silgen %s -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -parse-as-library \ // RUN: > %t/test.silgen diff --git a/test/SILGen/mangling_inverse_generics_basic.swift b/test/SILGen/mangling_inverse_generics_basic.swift index 1600a1a9a72..153c796f146 100644 --- a/test/SILGen/mangling_inverse_generics_basic.swift +++ b/test/SILGen/mangling_inverse_generics_basic.swift @@ -1,6 +1,5 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-emit-silgen %s -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: > %t/test.silgen diff --git a/test/SILGen/moveonly_basics.swift b/test/SILGen/moveonly_basics.swift index 6e1138a2d1f..fcbe22a1b2e 100644 --- a/test/SILGen/moveonly_basics.swift +++ b/test/SILGen/moveonly_basics.swift @@ -1,8 +1,4 @@ // RUN: %target-swift-emit-silgen -module-name test %s | %FileCheck %s --enable-var-scope -// RUN: %target-swift-emit-silgen -enable-experimental-feature NoncopyableGenerics -module-name test %s | %FileCheck %s --enable-var-scope - -// For -enable-experimental-feature NoncopyableGenerics - class Retainable {} diff --git a/test/SILGen/moveonly_consuming_switch.swift b/test/SILGen/moveonly_consuming_switch.swift index d515f50b7af..fde14d7be09 100644 --- a/test/SILGen/moveonly_consuming_switch.swift +++ b/test/SILGen/moveonly_consuming_switch.swift @@ -2,7 +2,6 @@ // RUN: -emit-silgen \ // RUN: %s \ // RUN: -enable-experimental-feature BorrowingSwitch \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: | %FileCheck %s enum MaybeMaybeVoid: ~Copyable { diff --git a/test/SILGen/moveonly_empty_conditionally_copyable.swift b/test/SILGen/moveonly_empty_conditionally_copyable.swift index febb040e578..6715a13336f 100644 --- a/test/SILGen/moveonly_empty_conditionally_copyable.swift +++ b/test/SILGen/moveonly_empty_conditionally_copyable.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -emit-sil -verify -primary-file %s +// RUN: %target-swift-frontend -emit-sil -verify -primary-file %s struct G: ~Copyable { } diff --git a/test/SILGen/moveonly_optional_operations.swift b/test/SILGen/moveonly_optional_operations.swift index 2795e1edbf3..079529aa495 100644 --- a/test/SILGen/moveonly_optional_operations.swift +++ b/test/SILGen/moveonly_optional_operations.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -enable-experimental-feature NoncopyableGenerics -parse-stdlib -module-name Swift -verify %s +// RUN: %target-swift-frontend -emit-sil -parse-stdlib -module-name Swift -verify %s @_marker protocol Copyable {} @_marker protocol Escapable {} diff --git a/test/SILGen/moveonly_optional_operations_2.swift b/test/SILGen/moveonly_optional_operations_2.swift index 182bdddd737..a9bd0df8645 100644 --- a/test/SILGen/moveonly_optional_operations_2.swift +++ b/test/SILGen/moveonly_optional_operations_2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -enable-experimental-feature NoncopyableGenerics -parse-stdlib -module-name Swift %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -parse-stdlib -module-name Swift %s | %FileCheck %s @_marker protocol Copyable {} @_marker protocol Escapable {} diff --git a/test/SILGen/typelowering_inverses.swift b/test/SILGen/typelowering_inverses.swift index ed8bb5ed001..fc6a4b235d2 100644 --- a/test/SILGen/typelowering_inverses.swift +++ b/test/SILGen/typelowering_inverses.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NonescapableTypes -disable-availability-checking -module-name main %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -enable-experimental-feature NonescapableTypes -disable-availability-checking -module-name main %s | %FileCheck %s protocol NoCopyP: ~Copyable {} diff --git a/test/SILOptimizer/capture_promotion_ownership.sil b/test/SILOptimizer/capture_promotion_ownership.sil index 2f105549fb7..cb614a440e4 100644 --- a/test/SILOptimizer/capture_promotion_ownership.sil +++ b/test/SILOptimizer/capture_promotion_ownership.sil @@ -1,5 +1,5 @@ // RUN: %target-sil-opt -enable-sil-verify-all %s -capture-promotion \ -// RUN: -enable-experimental-feature NonescapableTypes -enable-experimental-feature NoncopyableGenerics -module-name Swift \ +// RUN: -enable-experimental-feature NonescapableTypes -module-name Swift \ // RUN: | %FileCheck %s // Check to make sure that the process of promoting closure captures results in diff --git a/test/SILOptimizer/lifetime_dependence.sil b/test/SILOptimizer/lifetime_dependence.sil index 85155044bd9..6bbe541698c 100644 --- a/test/SILOptimizer/lifetime_dependence.sil +++ b/test/SILOptimizer/lifetime_dependence.sil @@ -2,8 +2,7 @@ // RUN: -o /dev/null \ // RUN: -sil-verify-all \ // RUN: -module-name Swift \ -// RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics +// RUN: -enable-experimental-feature NonescapableTypes // REQUIRES: asserts // REQUIRES: swift_in_compiler diff --git a/test/SILOptimizer/lifetime_dependence_borrow.swift b/test/SILOptimizer/lifetime_dependence_borrow.swift index 89d82d5d9cf..f9b66eae9e2 100644 --- a/test/SILOptimizer/lifetime_dependence_borrow.swift +++ b/test/SILOptimizer/lifetime_dependence_borrow.swift @@ -3,7 +3,6 @@ // RUN: -verify \ // RUN: -sil-verify-all \ // RUN: -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes // REQUIRES: asserts diff --git a/test/SILOptimizer/lifetime_dependence_borrow_fail.swift b/test/SILOptimizer/lifetime_dependence_borrow_fail.swift index 4c16fdc1f5e..20b7e714980 100644 --- a/test/SILOptimizer/lifetime_dependence_borrow_fail.swift +++ b/test/SILOptimizer/lifetime_dependence_borrow_fail.swift @@ -3,8 +3,7 @@ // RUN: -verify \ // RUN: -sil-verify-all \ // RUN: -module-name test \ -// RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics +// RUN: -enable-experimental-feature NonescapableTypes // REQUIRES: asserts // REQUIRES: swift_in_compiler diff --git a/test/SILOptimizer/lifetime_dependence_closure.swift b/test/SILOptimizer/lifetime_dependence_closure.swift index 143ed9aecce..26f8462e6a7 100644 --- a/test/SILOptimizer/lifetime_dependence_closure.swift +++ b/test/SILOptimizer/lifetime_dependence_closure.swift @@ -3,7 +3,6 @@ // RUN: -verify \ // RUN: -sil-verify-all \ // RUN: -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes // REQUIRES: asserts diff --git a/test/SILOptimizer/lifetime_dependence_diagnostics.swift b/test/SILOptimizer/lifetime_dependence_diagnostics.swift index d93f3e362f3..df8d62a590b 100644 --- a/test/SILOptimizer/lifetime_dependence_diagnostics.swift +++ b/test/SILOptimizer/lifetime_dependence_diagnostics.swift @@ -1,7 +1,6 @@ // RUN: %target-swift-frontend %s -emit-sil \ // RUN: -sil-verify-all \ // RUN: -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: 2>&1 | %FileCheck %s diff --git a/test/SILOptimizer/lifetime_dependence_generic.swift b/test/SILOptimizer/lifetime_dependence_generic.swift index 8729b0de22a..b339c749ad2 100644 --- a/test/SILOptimizer/lifetime_dependence_generic.swift +++ b/test/SILOptimizer/lifetime_dependence_generic.swift @@ -3,7 +3,6 @@ // RUN: -verify \ // RUN: -sil-verify-all \ // RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes \ // RUN: -parse-stdlib -module-name Swift diff --git a/test/SILOptimizer/lifetime_dependence_inherit.swift b/test/SILOptimizer/lifetime_dependence_inherit.swift index 2cfa3df99cc..6294ca35604 100644 --- a/test/SILOptimizer/lifetime_dependence_inherit.swift +++ b/test/SILOptimizer/lifetime_dependence_inherit.swift @@ -3,7 +3,6 @@ // RUN: -verify \ // RUN: -sil-verify-all \ // RUN: -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes // REQUIRES: asserts diff --git a/test/SILOptimizer/lifetime_dependence_inherit_fail.swift b/test/SILOptimizer/lifetime_dependence_inherit_fail.swift index 6efb40dc982..a2cb0883f64 100644 --- a/test/SILOptimizer/lifetime_dependence_inherit_fail.swift +++ b/test/SILOptimizer/lifetime_dependence_inherit_fail.swift @@ -3,7 +3,6 @@ // RUN: -verify \ // RUN: -sil-verify-all \ // RUN: -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes // REQUIRES: asserts diff --git a/test/SILOptimizer/lifetime_dependence_insertion.swift b/test/SILOptimizer/lifetime_dependence_insertion.swift index ee2d78e8f0d..aa26bbc32ae 100644 --- a/test/SILOptimizer/lifetime_dependence_insertion.swift +++ b/test/SILOptimizer/lifetime_dependence_insertion.swift @@ -2,7 +2,6 @@ // RUN: -Xllvm -sil-print-after=lifetime-dependence-insertion \ // RUN: -sil-verify-all \ // RUN: -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -o /dev/null 2>&1 | %FileCheck %s diff --git a/test/SILOptimizer/lifetime_dependence_mutate.swift b/test/SILOptimizer/lifetime_dependence_mutate.swift index 19fe035db0f..3ba6d86d1ff 100644 --- a/test/SILOptimizer/lifetime_dependence_mutate.swift +++ b/test/SILOptimizer/lifetime_dependence_mutate.swift @@ -3,7 +3,6 @@ // RUN: -verify \ // RUN: -sil-verify-all \ // RUN: -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes // REQUIRES: asserts diff --git a/test/SILOptimizer/lifetime_dependence_optional.swift b/test/SILOptimizer/lifetime_dependence_optional.swift index 089f3d4ba3e..83f298ff9ed 100644 --- a/test/SILOptimizer/lifetime_dependence_optional.swift +++ b/test/SILOptimizer/lifetime_dependence_optional.swift @@ -2,7 +2,6 @@ // RUN: -verify \ // RUN: -sil-verify-all \ // RUN: -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -enable-experimental-feature BorrowingSwitch diff --git a/test/SILOptimizer/lifetime_dependence_param.swift b/test/SILOptimizer/lifetime_dependence_param.swift index e5cc8fea55e..a5eca8b748d 100644 --- a/test/SILOptimizer/lifetime_dependence_param.swift +++ b/test/SILOptimizer/lifetime_dependence_param.swift @@ -3,7 +3,6 @@ // RUN: -verify \ // RUN: -sil-verify-all \ // RUN: -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes // REQUIRES: asserts diff --git a/test/SILOptimizer/lifetime_dependence_param_fail.swift b/test/SILOptimizer/lifetime_dependence_param_fail.swift index 76a1802931f..7883e09ba4f 100644 --- a/test/SILOptimizer/lifetime_dependence_param_fail.swift +++ b/test/SILOptimizer/lifetime_dependence_param_fail.swift @@ -3,7 +3,6 @@ // RUN: -verify \ // RUN: -sil-verify-all \ // RUN: -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes // REQUIRES: asserts diff --git a/test/SILOptimizer/lifetime_dependence_scope.swift b/test/SILOptimizer/lifetime_dependence_scope.swift index f9507124e4c..88fd5affbd5 100644 --- a/test/SILOptimizer/lifetime_dependence_scope.swift +++ b/test/SILOptimizer/lifetime_dependence_scope.swift @@ -1,7 +1,6 @@ // RUN: %target-swift-frontend %s -emit-sil \ // RUN: -sil-verify-all \ // RUN: -module-name test \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: 2>&1 | %FileCheck %s diff --git a/test/SILOptimizer/lifetime_dependence_scope_fixup.swift b/test/SILOptimizer/lifetime_dependence_scope_fixup.swift index 44ef7b7da64..9a843e0b712 100644 --- a/test/SILOptimizer/lifetime_dependence_scope_fixup.swift +++ b/test/SILOptimizer/lifetime_dependence_scope_fixup.swift @@ -1,6 +1,5 @@ // RUN: %target-swift-frontend %s -emit-sil -o /dev/null -verify \ -// RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics +// RUN: -enable-experimental-feature NonescapableTypes // REQUIRES: asserts diff --git a/test/SILOptimizer/lifetime_dependence_todo.swift b/test/SILOptimizer/lifetime_dependence_todo.swift index 39445543711..34da180feab 100644 --- a/test/SILOptimizer/lifetime_dependence_todo.swift +++ b/test/SILOptimizer/lifetime_dependence_todo.swift @@ -2,7 +2,6 @@ // RUN: -o /dev/null \ // RUN: -verify \ // RUN: -sil-verify-all \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes // REQUIRES: asserts diff --git a/test/SILOptimizer/lifetime_dependence_util.sil b/test/SILOptimizer/lifetime_dependence_util.sil index 727baf9e46a..f82e10eed9e 100644 --- a/test/SILOptimizer/lifetime_dependence_util.sil +++ b/test/SILOptimizer/lifetime_dependence_util.sil @@ -1,6 +1,5 @@ // RUN: %target-sil-opt -test-runner %s \ // RUN: -module-name Swift \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature NonescapableTypes \ // RUN: -o /dev/null 2>&1 | %FileCheck %s diff --git a/test/SILOptimizer/moveonly_addresschecker_debuginfo.sil b/test/SILOptimizer/moveonly_addresschecker_debuginfo.sil index a1f720baca0..d0b4e2e23ec 100644 --- a/test/SILOptimizer/moveonly_addresschecker_debuginfo.sil +++ b/test/SILOptimizer/moveonly_addresschecker_debuginfo.sil @@ -1,6 +1,4 @@ // RUN: %target-sil-opt -module-name moveonly_addresschecker -emit-verbose-sil -sil-move-only-checker -enable-sil-verify-all %s | %FileCheck %s -// RUN: %target-sil-opt -enable-experimental-feature NoncopyableGenerics -module-name moveonly_addresschecker -emit-verbose-sil -sil-move-only-checker -enable-sil-verify-all %s | %FileCheck %s - sil_stage raw diff --git a/test/SILOptimizer/moveonly_addresschecker_destructure_through_deinit_diagnostics.swift b/test/SILOptimizer/moveonly_addresschecker_destructure_through_deinit_diagnostics.swift index cf295eba16b..bb16dcbe55f 100644 --- a/test/SILOptimizer/moveonly_addresschecker_destructure_through_deinit_diagnostics.swift +++ b/test/SILOptimizer/moveonly_addresschecker_destructure_through_deinit_diagnostics.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-emit-sil -sil-verify-all -verify -enable-experimental-feature MoveOnlyClasses -enable-experimental-feature MoveOnlyTuples %s -// RUN: %target-swift-emit-sil -enable-experimental-feature NoncopyableGenerics -sil-verify-all -verify -enable-experimental-feature MoveOnlyClasses -enable-experimental-feature MoveOnlyTuples %s // This test validates that we properly emit errors if we partially invalidate // through a type with a deinit. diff --git a/test/SILOptimizer/moveonly_addresschecker_di_interactions.sil b/test/SILOptimizer/moveonly_addresschecker_di_interactions.sil index bdb3f4f748e..76ddbc20cc7 100644 --- a/test/SILOptimizer/moveonly_addresschecker_di_interactions.sil +++ b/test/SILOptimizer/moveonly_addresschecker_di_interactions.sil @@ -1,5 +1,4 @@ // RUN: %target-sil-opt -definite-init %s | %FileCheck %s -// RUN: %target-sil-opt -enable-experimental-feature NoncopyableGenerics -definite-init %s | %FileCheck %s // Make sure that DI properly converts mark_unresolved_non_copyable_value // [assignable_but_not_consumable] -> mark_unresolved_non_copyable_value diff --git a/test/SILOptimizer/moveonly_addresschecker_di_interactions.swift b/test/SILOptimizer/moveonly_addresschecker_di_interactions.swift index 276cf2b4de9..cb76feec115 100644 --- a/test/SILOptimizer/moveonly_addresschecker_di_interactions.swift +++ b/test/SILOptimizer/moveonly_addresschecker_di_interactions.swift @@ -1,6 +1,4 @@ // RUN: %target-swift-emit-sil -sil-verify-all -verify -enable-experimental-feature NoImplicitCopy %s -// RUN: %target-swift-emit-sil -enable-experimental-feature NoncopyableGenerics -sil-verify-all -verify -enable-experimental-feature NoImplicitCopy %s - // This testStruct specifically testStructs how DI and the move checkers interact with each other diff --git a/test/SILOptimizer/moveonly_addresschecker_diagnostics.sil b/test/SILOptimizer/moveonly_addresschecker_diagnostics.sil index 1a5405180a8..b52cad60674 100644 --- a/test/SILOptimizer/moveonly_addresschecker_diagnostics.sil +++ b/test/SILOptimizer/moveonly_addresschecker_diagnostics.sil @@ -1,9 +1,6 @@ // RUN: %target-sil-opt -sil-move-only-address-checker -enable-experimental-feature MoveOnlyClasses -enable-sil-verify-all %s -verify // RUN: %target-sil-opt -sil-move-only-address-checker -enable-experimental-feature MoveOnlyClasses -enable-sil-verify-all -move-only-diagnostics-silently-emit-diagnostics %s | %FileCheck %s -// RUN: %target-sil-opt -enable-experimental-feature NoncopyableGenerics -sil-move-only-address-checker -enable-experimental-feature MoveOnlyClasses -enable-sil-verify-all %s -verify -// RUN: %target-sil-opt -enable-experimental-feature NoncopyableGenerics -sil-move-only-address-checker -enable-experimental-feature MoveOnlyClasses -enable-sil-verify-all -move-only-diagnostics-silently-emit-diagnostics %s | %FileCheck %s - // This file contains specific SIL test cases that we expect to emit // diagnostics. These are cases where we want to make it easy to validate // independent of potential changes in the frontend's emission that this diff --git a/test/SILOptimizer/moveonly_addresschecker_diagnostics.swift b/test/SILOptimizer/moveonly_addresschecker_diagnostics.swift index 70dff20d471..c311f58d833 100644 --- a/test/SILOptimizer/moveonly_addresschecker_diagnostics.swift +++ b/test/SILOptimizer/moveonly_addresschecker_diagnostics.swift @@ -1,5 +1,4 @@ -// RUN: %target-swift-emit-sil -O -sil-verify-all -verify -enable-experimental-feature BorrowingSwitch -enable-experimental-feature MoveOnlyPartialReinitialization -enable-experimental-feature NoImplicitCopy -enable-experimental-feature MoveOnlyClasses %s -// RUN: %target-swift-emit-sil -enable-experimental-feature BorrowingSwitch -enable-experimental-feature NoncopyableGenerics -O -sil-verify-all -verify -enable-experimental-feature MoveOnlyPartialReinitialization -enable-experimental-feature NoImplicitCopy -enable-experimental-feature MoveOnlyClasses %s +// RUN: %target-swift-emit-sil %s -O -sil-verify-all -verify -enable-experimental-feature BorrowingSwitch -enable-experimental-feature MoveOnlyPartialReinitialization -enable-experimental-feature NoImplicitCopy -enable-experimental-feature MoveOnlyClasses ////////////////// // Declarations // diff --git a/test/SILOptimizer/moveonly_addresschecker_diagnostics_library_evolution.swift b/test/SILOptimizer/moveonly_addresschecker_diagnostics_library_evolution.swift index 0887695a2ea..cf07fb7e950 100644 --- a/test/SILOptimizer/moveonly_addresschecker_diagnostics_library_evolution.swift +++ b/test/SILOptimizer/moveonly_addresschecker_diagnostics_library_evolution.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-emit-sil -enable-experimental-feature NoImplicitCopy -sil-verify-all -verify -enable-library-evolution %s -// RUN: %target-swift-emit-sil -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NoImplicitCopy -sil-verify-all -verify -enable-library-evolution %s // This test is used to validate that we properly handle library evolution code // until we can get all of the normal moveonly_addresschecker_diagnostics test diff --git a/test/SILOptimizer/moveonly_addresschecker_diagnostics_without_partial.swift b/test/SILOptimizer/moveonly_addresschecker_diagnostics_without_partial.swift index f24cd7625d7..77d584c4624 100644 --- a/test/SILOptimizer/moveonly_addresschecker_diagnostics_without_partial.swift +++ b/test/SILOptimizer/moveonly_addresschecker_diagnostics_without_partial.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-emit-sil -O -sil-verify-all -verify -enable-experimental-feature NoImplicitCopy -enable-experimental-feature MoveOnlyClasses %s -// RUN: %target-swift-emit-sil -enable-experimental-feature NoncopyableGenerics -O -sil-verify-all -verify -enable-experimental-feature NoImplicitCopy -enable-experimental-feature MoveOnlyClasses %s struct Test: ~Copyable { public let baseAddress: UnsafeRawPointer diff --git a/test/SILOptimizer/moveonly_addresschecker_diagnostics_without_partial_reinit.swift b/test/SILOptimizer/moveonly_addresschecker_diagnostics_without_partial_reinit.swift index d8b9df17a71..f53c74c57e5 100644 --- a/test/SILOptimizer/moveonly_addresschecker_diagnostics_without_partial_reinit.swift +++ b/test/SILOptimizer/moveonly_addresschecker_diagnostics_without_partial_reinit.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-emit-sil -O -sil-verify-all -verify -enable-experimental-feature NoImplicitCopy -enable-experimental-feature MoveOnlyClasses %s -// RUN: %target-swift-emit-sil -enable-experimental-feature NoncopyableGenerics -O -sil-verify-all -verify -enable-experimental-feature NoImplicitCopy -enable-experimental-feature MoveOnlyClasses %s // Test diagnostics for partial-consumption without partial-reinitialization. diff --git a/test/SILOptimizer/moveonly_addressonly_subscript_diagnostics.swift b/test/SILOptimizer/moveonly_addressonly_subscript_diagnostics.swift index 8e0d36b3ede..3bd23f5817e 100644 --- a/test/SILOptimizer/moveonly_addressonly_subscript_diagnostics.swift +++ b/test/SILOptimizer/moveonly_addressonly_subscript_diagnostics.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-emit-sil -sil-verify-all -verify %s -// RUN: %target-swift-emit-sil -enable-experimental-feature NoncopyableGenerics -sil-verify-all -verify %s class CopyableKlass {} diff --git a/test/SILOptimizer/moveonly_addressors.swift b/test/SILOptimizer/moveonly_addressors.swift index cc14b8ef2b0..ebfe1ddfed9 100644 --- a/test/SILOptimizer/moveonly_addressors.swift +++ b/test/SILOptimizer/moveonly_addressors.swift @@ -1,7 +1,7 @@ -// RUN: %target-swift-frontend -enable-experimental-feature NonescapableTypes -enable-experimental-feature BuiltinModule -enable-experimental-feature NoncopyableGenerics -parse-stdlib -module-name Swift -DADDRESS_ONLY -emit-sil -verify %s -// RUN: %target-swift-frontend -enable-experimental-feature NonescapableTypes -enable-experimental-feature BuiltinModule -enable-experimental-feature NoncopyableGenerics -parse-stdlib -module-name Swift -DLOADABLE -emit-sil -verify %s -// RUN: %target-swift-frontend -enable-experimental-feature NonescapableTypes -enable-experimental-feature BuiltinModule -enable-experimental-feature NoncopyableGenerics -parse-stdlib -module-name Swift -DTRIVIAL -emit-sil -verify %s -// RUN: %target-swift-frontend -enable-experimental-feature NonescapableTypes -enable-experimental-feature BuiltinModule -enable-experimental-feature NoncopyableGenerics -parse-stdlib -module-name Swift -DEMPTY -emit-sil -verify %s +// RUN: %target-swift-frontend -enable-experimental-feature NonescapableTypes -enable-experimental-feature BuiltinModule -parse-stdlib -module-name Swift -DADDRESS_ONLY -emit-sil -verify %s +// RUN: %target-swift-frontend -enable-experimental-feature NonescapableTypes -enable-experimental-feature BuiltinModule -parse-stdlib -module-name Swift -DLOADABLE -emit-sil -verify %s +// RUN: %target-swift-frontend -enable-experimental-feature NonescapableTypes -enable-experimental-feature BuiltinModule -parse-stdlib -module-name Swift -DTRIVIAL -emit-sil -verify %s +// RUN: %target-swift-frontend -enable-experimental-feature NonescapableTypes -enable-experimental-feature BuiltinModule -parse-stdlib -module-name Swift -DEMPTY -emit-sil -verify %s // REQUIRES: asserts diff --git a/test/SILOptimizer/moveonly_borrowing_switch.swift b/test/SILOptimizer/moveonly_borrowing_switch.swift index 437182e4240..e0e7f28830e 100644 --- a/test/SILOptimizer/moveonly_borrowing_switch.swift +++ b/test/SILOptimizer/moveonly_borrowing_switch.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-frontend -emit-sil -verify -enable-experimental-feature BorrowingSwitch %s -// RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -emit-sil -verify -enable-experimental-feature BorrowingSwitch %s struct Payload: ~Copyable { var x: Int diff --git a/test/SILOptimizer/moveonly_borrowing_switch_copyable_subpattern.swift b/test/SILOptimizer/moveonly_borrowing_switch_copyable_subpattern.swift index 0c0e69d9cd4..48c8f19a4df 100644 --- a/test/SILOptimizer/moveonly_borrowing_switch_copyable_subpattern.swift +++ b/test/SILOptimizer/moveonly_borrowing_switch_copyable_subpattern.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-frontend -emit-sil -verify -enable-experimental-feature BorrowingSwitch %s -// RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -emit-sil -verify -enable-experimental-feature BorrowingSwitch %s struct Payload: ~Copyable { var x: Int diff --git a/test/SILOptimizer/moveonly_borrowing_switch_load_borrow.swift b/test/SILOptimizer/moveonly_borrowing_switch_load_borrow.swift index 31f49c0272b..5c864df8603 100644 --- a/test/SILOptimizer/moveonly_borrowing_switch_load_borrow.swift +++ b/test/SILOptimizer/moveonly_borrowing_switch_load_borrow.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -enable-experimental-feature BorrowingSwitch -enable-experimental-feature NoncopyableGenerics -emit-sil -verify %s +// RUN: %target-swift-frontend -enable-experimental-feature BorrowingSwitch -emit-sil -verify %s struct Box: ~Copyable { init(_ element: consuming Wrapped) { } diff --git a/test/SILOptimizer/moveonly_borrowing_switch_yield.swift b/test/SILOptimizer/moveonly_borrowing_switch_yield.swift index 3f5d373bc20..372ab9cc781 100644 --- a/test/SILOptimizer/moveonly_borrowing_switch_yield.swift +++ b/test/SILOptimizer/moveonly_borrowing_switch_yield.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature BorrowingSwitch -parse-as-library -O -emit-sil -verify %s +// RUN: %target-swift-frontend -enable-experimental-feature BorrowingSwitch -parse-as-library -O -emit-sil -verify %s extension List { var peek: Element { diff --git a/test/SILOptimizer/moveonly_builtins.swift b/test/SILOptimizer/moveonly_builtins.swift index 025134fe12f..32e0f6d0ba1 100644 --- a/test/SILOptimizer/moveonly_builtins.swift +++ b/test/SILOptimizer/moveonly_builtins.swift @@ -1,10 +1,8 @@ // RUN: %target-swift-frontend-typecheck -verify %s -DILLEGAL \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-builtin-module \ // RUN: -verify-additional-prefix illegal- // RUN: %target-swift-frontend -emit-sil -sil-verify-all -verify %s \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-builtin-module import Builtin diff --git a/test/SILOptimizer/moveonly_computed_property.swift b/test/SILOptimizer/moveonly_computed_property.swift index 545647f7adb..eea49afea99 100644 --- a/test/SILOptimizer/moveonly_computed_property.swift +++ b/test/SILOptimizer/moveonly_computed_property.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-frontend -emit-sil -verify %s > /dev/null -// RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -emit-sil -verify %s > /dev/null diff --git a/test/SILOptimizer/moveonly_consuming_switch.swift b/test/SILOptimizer/moveonly_consuming_switch.swift index 0e57f0453ae..61b36fefa3b 100644 --- a/test/SILOptimizer/moveonly_consuming_switch.swift +++ b/test/SILOptimizer/moveonly_consuming_switch.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature BorrowingSwitch -verify %s +// RUN: %target-swift-frontend -emit-sil -enable-experimental-feature BorrowingSwitch -verify %s // TODO: Remove this and just use the real `UnsafeMutablePointer` when // noncopyable type support has been upstreamed. diff --git a/test/SILOptimizer/moveonly_discard.swift b/test/SILOptimizer/moveonly_discard.swift index 4d3fd3c6cbd..9d384af16dc 100644 --- a/test/SILOptimizer/moveonly_discard.swift +++ b/test/SILOptimizer/moveonly_discard.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-frontend -sil-verify-all -verify -emit-sil -enable-experimental-feature MoveOnlyEnumDeinits %s -// RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -sil-verify-all -verify -emit-sil -enable-experimental-feature MoveOnlyEnumDeinits %s func posix_close(_ t: Int) {} diff --git a/test/SILOptimizer/moveonly_generics_basic.swift b/test/SILOptimizer/moveonly_generics_basic.swift index 40b7e18e9dd..78ab46a4276 100644 --- a/test/SILOptimizer/moveonly_generics_basic.swift +++ b/test/SILOptimizer/moveonly_generics_basic.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -sil-verify-all -verify -emit-sil -enable-experimental-feature MoveOnlyPartialReinitialization -enable-experimental-feature NoncopyableGenerics +// RUN: %target-swift-frontend %s -sil-verify-all -verify -emit-sil -enable-experimental-feature MoveOnlyPartialReinitialization // REQUIRES: asserts diff --git a/test/SILOptimizer/moveonly_generics_complex.swift b/test/SILOptimizer/moveonly_generics_complex.swift index 89579858ebe..938340c2b31 100644 --- a/test/SILOptimizer/moveonly_generics_complex.swift +++ b/test/SILOptimizer/moveonly_generics_complex.swift @@ -2,7 +2,6 @@ // RUN: -emit-sil -verify \ // RUN: %s \ // RUN: -enable-experimental-feature BuiltinModule \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -sil-verify-all // REQUIRES: asserts diff --git a/test/SILOptimizer/moveonly_partial_consumption_deinit.swift b/test/SILOptimizer/moveonly_partial_consumption_deinit.swift index 79b7bada883..e8c5b7616a0 100644 --- a/test/SILOptimizer/moveonly_partial_consumption_deinit.swift +++ b/test/SILOptimizer/moveonly_partial_consumption_deinit.swift @@ -1,6 +1,5 @@ // RUN: %target-swift-emit-sil \ // RUN: %s \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -sil-verify-all \ // RUN: -verify diff --git a/test/SILOptimizer/moveonly_raw_layout.swift b/test/SILOptimizer/moveonly_raw_layout.swift index 7e89e144e68..b5a05836e72 100644 --- a/test/SILOptimizer/moveonly_raw_layout.swift +++ b/test/SILOptimizer/moveonly_raw_layout.swift @@ -1,6 +1,4 @@ // RUN: %target-swift-frontend -enable-experimental-feature BuiltinModule -enable-experimental-feature RawLayout -emit-sil %s | %FileCheck %s -// RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature BuiltinModule -enable-experimental-feature RawLayout -emit-sil %s | %FileCheck %s - import Builtin diff --git a/test/SILOptimizer/moveonly_trivial_addresschecker_diagnostics.swift b/test/SILOptimizer/moveonly_trivial_addresschecker_diagnostics.swift index d19511d1ce6..5944d4cab14 100644 --- a/test/SILOptimizer/moveonly_trivial_addresschecker_diagnostics.swift +++ b/test/SILOptimizer/moveonly_trivial_addresschecker_diagnostics.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-emit-sil -enable-experimental-feature BorrowingSwitch -enable-experimental-feature MoveOnlyPartialReinitialization -sil-verify-all -verify %s -// RUN: %target-swift-emit-sil -enable-experimental-feature BorrowingSwitch -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature MoveOnlyPartialReinitialization -sil-verify-all -verify %s ////////////////// // Declarations // diff --git a/test/SILOptimizer/moveonly_trivial_objectchecker_diagnostics.swift b/test/SILOptimizer/moveonly_trivial_objectchecker_diagnostics.swift index 71ecf22e61e..cfe2b501e2a 100644 --- a/test/SILOptimizer/moveonly_trivial_objectchecker_diagnostics.swift +++ b/test/SILOptimizer/moveonly_trivial_objectchecker_diagnostics.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-emit-sil -enable-experimental-feature BorrowingSwitch -sil-verify-all -verify %s -// RUN: %target-swift-emit-sil -enable-experimental-feature BorrowingSwitch -enable-experimental-feature NoncopyableGenerics -sil-verify-all -verify %s ////////////////// // Declarations // diff --git a/test/SILOptimizer/noimplicitcopy.swift b/test/SILOptimizer/noimplicitcopy.swift index d33d798286d..675419a39a6 100644 --- a/test/SILOptimizer/noimplicitcopy.swift +++ b/test/SILOptimizer/noimplicitcopy.swift @@ -1,5 +1,4 @@ // RUN: %target-swift-frontend -sil-verify-all -enable-experimental-move-only -verify %s -parse-stdlib -emit-sil -// RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -sil-verify-all -enable-experimental-move-only -verify %s -parse-stdlib -emit-sil import Swift diff --git a/test/SILOptimizer/sil_combine_concrete_existential_noncopyable.swift b/test/SILOptimizer/sil_combine_concrete_existential_noncopyable.swift index f6ff6e901a9..061a7d5081d 100644 --- a/test/SILOptimizer/sil_combine_concrete_existential_noncopyable.swift +++ b/test/SILOptimizer/sil_combine_concrete_existential_noncopyable.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -O %s -enable-experimental-feature NoncopyableGenerics | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s protocol P: ~Copyable {} diff --git a/test/SILOptimizer/stdlib/Cell.swift b/test/SILOptimizer/stdlib/Cell.swift index f22b10afb17..d31e1ddb839 100644 --- a/test/SILOptimizer/stdlib/Cell.swift +++ b/test/SILOptimizer/stdlib/Cell.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil -disable-availability-checking %s -enable-builtin-module -enable-experimental-feature RawLayout -enable-experimental-feature NoncopyableGenerics | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil -disable-availability-checking %s -enable-builtin-module -enable-experimental-feature RawLayout | %FileCheck %s import Builtin diff --git a/test/Sema/bitwise_copyable.swift b/test/Sema/bitwise_copyable.swift index d0104a7692e..6d5672539bb 100644 --- a/test/Sema/bitwise_copyable.swift +++ b/test/Sema/bitwise_copyable.swift @@ -1,7 +1,6 @@ // RUN: %target-typecheck-verify-swift \ // RUN: -disable-availability-checking \ // RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature Sensitive \ // RUN: -enable-builtin-module \ // RUN: -debug-diagnostic-names diff --git a/test/Sema/conditionally_copyable.swift b/test/Sema/conditionally_copyable.swift index da8f7d42f0d..73ccd71c228 100644 --- a/test/Sema/conditionally_copyable.swift +++ b/test/Sema/conditionally_copyable.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics +// RUN: %target-typecheck-verify-swift struct G: ~Copyable {} @@ -19,4 +19,4 @@ struct IsCopyable {} func f(_: T.Type) {} f(G.self) // expected-error {{global function 'f' requires that 'NotCopyable' conform to 'Copyable'}} -f(G.self) // accepted \ No newline at end of file +f(G.self) // accepted diff --git a/test/Sema/explicit_lifetime_dependence_specifiers1.swift b/test/Sema/explicit_lifetime_dependence_specifiers1.swift index d1ab2bfbc03..32c6de929f1 100644 --- a/test/Sema/explicit_lifetime_dependence_specifiers1.swift +++ b/test/Sema/explicit_lifetime_dependence_specifiers1.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature NonescapableTypes -enable-experimental-feature NoncopyableGenerics +// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature NonescapableTypes // REQUIRES: asserts struct Container { diff --git a/test/Sema/explicit_lifetime_dependence_specifiers2.swift b/test/Sema/explicit_lifetime_dependence_specifiers2.swift index aec0cfb260e..40d22916b51 100644 --- a/test/Sema/explicit_lifetime_dependence_specifiers2.swift +++ b/test/Sema/explicit_lifetime_dependence_specifiers2.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature NonescapableTypes -enable-experimental-feature NoncopyableGenerics +// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature NonescapableTypes // REQUIRES: asserts // REQUIRES: nonescapable_types diff --git a/test/Sema/implicit_lifetime_dependence.swift b/test/Sema/implicit_lifetime_dependence.swift index ee885731d92..a89d44e1ad7 100644 --- a/test/Sema/implicit_lifetime_dependence.swift +++ b/test/Sema/implicit_lifetime_dependence.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-experimental-feature NonescapableTypes -enable-experimental-feature NoncopyableGenerics +// RUN: %target-typecheck-verify-swift -enable-experimental-feature NonescapableTypes // REQUIRES: asserts struct BufferView : ~Escapable, ~Copyable { diff --git a/test/Sema/invertible_no_stdlib.swift b/test/Sema/invertible_no_stdlib.swift index 2ce088eb719..9db0c22cd29 100644 --- a/test/Sema/invertible_no_stdlib.swift +++ b/test/Sema/invertible_no_stdlib.swift @@ -1,6 +1,5 @@ // RUN: %target-typecheck-verify-swift -enable-builtin-module \ -// RUN: -parse-stdlib -module-name Ghost \ -// RUN: -enable-experimental-feature NoncopyableGenerics +// RUN: -parse-stdlib -module-name Ghost diff --git a/test/Sema/move_expr_moveonly_partial_consumption.swift b/test/Sema/move_expr_moveonly_partial_consumption.swift index c9fd0d6206b..e6856f57fa5 100644 --- a/test/Sema/move_expr_moveonly_partial_consumption.swift +++ b/test/Sema/move_expr_moveonly_partial_consumption.swift @@ -1,7 +1,6 @@ // RUN: %target-typecheck-verify-swift \ // RUN: -disable-availability-checking \ // RUN: -enable-experimental-feature NoImplicitCopy \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -debug-diagnostic-names @_silgen_name("get") diff --git a/test/Sema/moveonly_sendable_legacy.swift b/test/Sema/moveonly_sendable_legacy.swift index facbb67a55b..b8346034d91 100644 --- a/test/Sema/moveonly_sendable_legacy.swift +++ b/test/Sema/moveonly_sendable_legacy.swift @@ -1,6 +1,5 @@ // RUN: %target-typecheck-verify-swift \ -// RUN: -parse-stdlib -module-name Swift \ -// RUN: -enable-experimental-feature NoncopyableGenerics +// RUN: -parse-stdlib -module-name Swift @_marker protocol Copyable {} diff --git a/test/Sema/suppressed_assoc_stdlib.swift b/test/Sema/suppressed_assoc_stdlib.swift index e76e47f3394..029dda3df68 100644 --- a/test/Sema/suppressed_assoc_stdlib.swift +++ b/test/Sema/suppressed_assoc_stdlib.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -parse-stdlib -module-name Swift -enable-experimental-feature NoncopyableGenerics +// RUN: %target-typecheck-verify-swift -parse-stdlib -module-name Swift public protocol Hello { associatedtype Req: ~Copyable diff --git a/test/Serialization/explicit_lifetime_dependence.swift b/test/Serialization/explicit_lifetime_dependence.swift index 4ce04205d32..1285c006525 100644 --- a/test/Serialization/explicit_lifetime_dependence.swift +++ b/test/Serialization/explicit_lifetime_dependence.swift @@ -1,14 +1,12 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_explicit_lifetime_dependence.swift \ // RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -disable-lifetime-dependence-diagnostics // RUN: llvm-bcanalyzer %t/def_explicit_lifetime_dependence.swiftmodule // RUN: %target-swift-frontend -module-name lifetime-dependence -emit-sil -I %t %s \ -// RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics | %FileCheck %s +// RUN: -enable-experimental-feature NonescapableTypes | %FileCheck %s import def_explicit_lifetime_dependence func testBasic() { diff --git a/test/Serialization/implicit_lifetime_dependence.swift b/test/Serialization/implicit_lifetime_dependence.swift index 105612b152e..60eb5d76bb8 100644 --- a/test/Serialization/implicit_lifetime_dependence.swift +++ b/test/Serialization/implicit_lifetime_dependence.swift @@ -1,14 +1,12 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_implicit_lifetime_dependence.swift \ // RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -disable-lifetime-dependence-diagnostics // RUN: llvm-bcanalyzer %t/def_implicit_lifetime_dependence.swiftmodule // RUN: %target-swift-frontend -module-name lifetime-dependence -emit-sil -I %t %s \ -// RUN: -enable-experimental-feature NonescapableTypes \ -// RUN: -enable-experimental-feature NoncopyableGenerics | %FileCheck %s +// RUN: -enable-experimental-feature NonescapableTypes | %FileCheck %s import def_implicit_lifetime_dependence diff --git a/test/Serialization/noncopyable_generics.swift b/test/Serialization/noncopyable_generics.swift index d9f310c5f8e..a408df1d7ed 100644 --- a/test/Serialization/noncopyable_generics.swift +++ b/test/Serialization/noncopyable_generics.swift @@ -1,17 +1,14 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend %S/Inputs/ncgenerics.swift \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes \ // RUN: -emit-module -module-name ncgenerics \ // RUN: -o %t // RUN: llvm-bcanalyzer %t/ncgenerics.swiftmodule | %FileCheck %s -// *** Notice that we're checking when _not_ using NoncopyableGenerics! *** // RUN: %target-typecheck-verify-swift -I %t // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -enable-experimental-feature SuppressedAssociatedTypes \ // RUN: -print-module -module-to-print=ncgenerics \ // RUN: -I %t -source-filename=%s \ diff --git a/test/api-digester/compare-dump-abi-parsable-interface.swift b/test/api-digester/compare-dump-abi-parsable-interface.swift index 4b6f0de3d0e..cf2ec38a0c5 100644 --- a/test/api-digester/compare-dump-abi-parsable-interface.swift +++ b/test/api-digester/compare-dump-abi-parsable-interface.swift @@ -6,7 +6,7 @@ // RUN: %empty-directory(%t.module-cache) // RUN: %target-swift-frontend -typecheck -emit-module-interface-path %t.mod1/cake.swiftinterface %S/Inputs/cake_baseline/cake.swift -I %S/Inputs/APINotesLeft %clang-importer-sdk-nosource -parse-as-library -enable-library-evolution -disable-objc-attr-requires-foundation-module -module-cache-path %t.module-cache -// RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -typecheck -emit-module-interface-path %t.mod2/cake.swiftinterface %S/Inputs/cake_current/cake.swift -I %S/Inputs/APINotesRight %clang-importer-sdk-nosource -parse-as-library -enable-library-evolution -disable-objc-attr-requires-foundation-module -module-cache-path %t.module-cache +// RUN: %target-swift-frontend -typecheck -emit-module-interface-path %t.mod2/cake.swiftinterface %S/Inputs/cake_current/cake.swift -I %S/Inputs/APINotesRight %clang-importer-sdk-nosource -parse-as-library -enable-library-evolution -disable-objc-attr-requires-foundation-module -module-cache-path %t.module-cache // RUN: %api-digester -diagnose-sdk -print-module -module cake -BI %t.mod1 -BI %S/Inputs/APINotesLeft -I %t.mod2 -I %S/Inputs/APINotesRight -sdk %clang-importer-sdk-path -bsdk %clang-importer-sdk-path -module-cache-path %t.module-cache -o %t.result -abi // RUN: %clang -E -P -x c %S/Outputs/Cake-abi.txt -o - | sed '/^\s*$/d' > %t.expected diff --git a/test/api-digester/compare-dump-abi.swift b/test/api-digester/compare-dump-abi.swift index 5d469696a01..9c791ac15a3 100644 --- a/test/api-digester/compare-dump-abi.swift +++ b/test/api-digester/compare-dump-abi.swift @@ -7,7 +7,7 @@ // RUN: %empty-directory(%t.baseline/ABI) // RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -emit-module -o %t.mod1/cake.swiftmodule %S/Inputs/cake_baseline/cake.swift -parse-as-library -enable-library-evolution -I %S/Inputs/APINotesLeft %clang-importer-sdk-nosource -emit-module-source-info -emit-module-source-info-path %t.mod1/cake.swiftsourceinfo 2> %t.compiler-diags -// RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -disable-objc-attr-requires-foundation-module -emit-module -o %t.mod2/cake.swiftmodule %S/Inputs/cake_current/cake.swift -parse-as-library -enable-library-evolution -I %S/Inputs/APINotesRight %clang-importer-sdk-nosource -emit-module-source-info -emit-module-source-info-path %t.mod2/cake.swiftsourceinfo +// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -emit-module -o %t.mod2/cake.swiftmodule %S/Inputs/cake_current/cake.swift -parse-as-library -enable-library-evolution -I %S/Inputs/APINotesRight %clang-importer-sdk-nosource -emit-module-source-info -emit-module-source-info-path %t.mod2/cake.swiftsourceinfo // RUN: %api-digester -dump-sdk -module cake -output-dir %t.baseline -module-cache-path %t.module-cache %clang-importer-sdk-nosource -I %t.mod1 -I %S/Inputs/APINotesLeft -abi // RUN: %api-digester -diagnose-sdk -print-module -baseline-dir %t.baseline -module cake -I %t.mod2 -I %S/Inputs/APINotesLeft -module-cache-path %t.module-cache %clang-importer-sdk-nosource -abi -o %t.result // RUN: %clang -E -P -w -x c %S/Outputs/Cake-abi.txt -o - | sed '/^\s*$/d' > %t.abi.expected diff --git a/test/api-digester/compare-dump-parsable-interface.swift b/test/api-digester/compare-dump-parsable-interface.swift index 32715e32bde..57fa2439acc 100644 --- a/test/api-digester/compare-dump-parsable-interface.swift +++ b/test/api-digester/compare-dump-parsable-interface.swift @@ -6,7 +6,7 @@ // RUN: %empty-directory(%t.module-cache) // RUN: %target-swift-frontend -typecheck -emit-module-interface-path %t.mod1/cake.swiftinterface %S/Inputs/cake_baseline/cake.swift -I %S/Inputs/APINotesLeft %clang-importer-sdk-nosource -parse-as-library -enable-library-evolution -disable-objc-attr-requires-foundation-module -module-cache-path %t.module-cache -// RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -typecheck -emit-module-interface-path %t.mod2/cake.swiftinterface %S/Inputs/cake_current/cake.swift -I %S/Inputs/APINotesRight %clang-importer-sdk-nosource -parse-as-library -enable-library-evolution -disable-objc-attr-requires-foundation-module -module-cache-path %t.module-cache +// RUN: %target-swift-frontend -typecheck -emit-module-interface-path %t.mod2/cake.swiftinterface %S/Inputs/cake_current/cake.swift -I %S/Inputs/APINotesRight %clang-importer-sdk-nosource -parse-as-library -enable-library-evolution -disable-objc-attr-requires-foundation-module -module-cache-path %t.module-cache // RUN: %api-digester -diagnose-sdk -print-module -module cake -BI %t.mod1 -BI %S/Inputs/APINotesLeft -I %t.mod2 -I %S/Inputs/APINotesRight -sdk %clang-importer-sdk-path -bsdk %clang-importer-sdk-path -module-cache-path %t.module-cache -o %t.result // RUN: %clang -E -P -x c %S/Outputs/Cake.txt -o - | sed '/^\s*$/d' > %t.expected diff --git a/test/api-digester/compare-dump.swift b/test/api-digester/compare-dump.swift index 6d75fbccc7c..de256c7fca0 100644 --- a/test/api-digester/compare-dump.swift +++ b/test/api-digester/compare-dump.swift @@ -5,7 +5,7 @@ // RUN: %empty-directory(%t.sdk) // RUN: %empty-directory(%t.module-cache) // RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -emit-module -o %t.mod1/cake.swiftmodule %S/Inputs/cake_baseline/cake.swift -parse-as-library -enable-library-evolution -I %S/Inputs/APINotesLeft %clang-importer-sdk-nosource -module-name cake -// RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -disable-objc-attr-requires-foundation-module -emit-module -o %t.mod2/cake.swiftmodule %S/Inputs/cake_current/cake.swift -parse-as-library -enable-library-evolution -I %S/Inputs/APINotesRight %clang-importer-sdk-nosource -module-name cake +// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -emit-module -o %t.mod2/cake.swiftmodule %S/Inputs/cake_current/cake.swift -parse-as-library -enable-library-evolution -I %S/Inputs/APINotesRight %clang-importer-sdk-nosource -module-name cake // RUN: %api-digester -dump-sdk -module cake -o %t.dump1.json -module-cache-path %t.module-cache %clang-importer-sdk-nosource -I %t.mod1 -I %S/Inputs/APINotesLeft // RUN: %api-digester -dump-sdk -module cake -o %t.dump2.json -module-cache-path %t.module-cache %clang-importer-sdk-nosource -I %t.mod2 -I %S/Inputs/APINotesRight // RUN: %api-digester -diagnose-sdk -print-module --input-paths %t.dump1.json -input-paths %t.dump2.json -o %t.result diff --git a/test/attr/attr_nonEscapable.swift b/test/attr/attr_nonEscapable.swift index 6623e77655c..60175a3d667 100644 --- a/test/attr/attr_nonEscapable.swift +++ b/test/attr/attr_nonEscapable.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-experimental-feature NonescapableTypes -enable-experimental-feature NoncopyableGenerics +// RUN: %target-typecheck-verify-swift -enable-experimental-feature NonescapableTypes // REQUIRES: asserts diff --git a/test/stdlib/Noncopyables/MemoryLayout.swift b/test/stdlib/Noncopyables/MemoryLayout.swift index 7c042b408dd..30f1ab3d21a 100644 --- a/test/stdlib/Noncopyables/MemoryLayout.swift +++ b/test/stdlib/Noncopyables/MemoryLayout.swift @@ -1,5 +1,5 @@ // RUN: %empty-directory(%t) -// RUN: %target-run-simple-swift(-enable-experimental-feature NoncopyableGenerics) | %FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test struct A: ~Copyable { diff --git a/test/type/explicit_existential_swift6.swift b/test/type/explicit_existential_swift6.swift index 433432681cb..90e98414fc3 100644 --- a/test/type/explicit_existential_swift6.swift +++ b/test/type/explicit_existential_swift6.swift @@ -1,5 +1,4 @@ // RUN: %target-typecheck-verify-swift -enable-upcoming-feature ExistentialAny -// RUN: %target-typecheck-verify-swift -enable-upcoming-feature ExistentialAny -enable-experimental-feature NoncopyableGenerics protocol HasSelfRequirements { func foo(_ x: Self) diff --git a/validation-test/IRGen/moveonly_partial_consumption_linked_list.swift b/validation-test/IRGen/moveonly_partial_consumption_linked_list.swift index f077efc3a4b..2a7603094c8 100644 --- a/validation-test/IRGen/moveonly_partial_consumption_linked_list.swift +++ b/validation-test/IRGen/moveonly_partial_consumption_linked_list.swift @@ -2,7 +2,6 @@ // RUN: %s \ // RUN: -enable-builtin-module \ // RUN: -enable-experimental-feature BorrowingSwitch \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -sil-verify-all \ // RUN: -verify diff --git a/validation-test/SILOptimizer/moveonly_partial_consumption_linked_list.swift b/validation-test/SILOptimizer/moveonly_partial_consumption_linked_list.swift index b21450b7485..7bde959c2b8 100644 --- a/validation-test/SILOptimizer/moveonly_partial_consumption_linked_list.swift +++ b/validation-test/SILOptimizer/moveonly_partial_consumption_linked_list.swift @@ -2,7 +2,6 @@ // RUN: %s \ // RUN: -enable-builtin-module \ // RUN: -enable-experimental-feature BorrowingSwitch \ -// RUN: -enable-experimental-feature NoncopyableGenerics \ // RUN: -sil-verify-all \ // RUN: -verify