Merge pull request #71286 from kavon/ncgenerics-require-matching-stdlib

kavon · web-flow · commit 5cbff99f542f · 2024-01-31T16:39:51.000-08:00
NCGenerics: force module mismatches
diff --git a/include/swift/Basic/Features.def b/include/swift/Basic/Features.def
@@ -237,14 +237,14 @@ EXPERIMENTAL_FEATURE(RawLayout, true)
 EXPERIMENTAL_FEATURE(Embedded, true)
 
 /// Enables noncopyable generics
-EXPERIMENTAL_FEATURE(NoncopyableGenerics, false)
+EXPERIMENTAL_FEATURE(NoncopyableGenerics, true)
 
 /// Allow destructuring stored `let` bindings in structs.
 EXPERIMENTAL_FEATURE(StructLetDestructuring, true)
 
 /// Enable non-escapable type attributes and function attributes that support
 /// lifetime-dependent results.
-EXPERIMENTAL_FEATURE(NonescapableTypes, false)
+EXPERIMENTAL_FEATURE(NonescapableTypes, true)
 
 // Infer Sendability of unapplied and partial applied methods,
 // global functions and key paths.
diff --git a/lib/Serialization/ModuleFileSharedCore.cpp b/lib/Serialization/ModuleFileSharedCore.cpp
@@ -425,12 +425,6 @@ static ValidationInfo validateControlBlock(
       break;
     }
     case control_block::HAS_NONCOPYABLE_GENERICS: {
-      // FIXME: temporary hack until the stdlib is actually building.
-      // This skips over the module mismatch error if the stdlib wasn't built
-      // with noncopyable generics, so that tests may still run in CI.
-      if (!SWIFT_ENABLE_EXPERIMENTAL_NONCOPYABLE_GENERICS)
-        break;
-
       auto hasNoncopyableGenerics = scratch[0];
       if (requiresNoncopyableGenerics && !hasNoncopyableGenerics)
         result.status = Status::NotUsingNoncopyableGenerics;
@@ -1829,4 +1823,3 @@ ModuleFileSharedCore::getTransitiveLoadingBehavior(
   // By default, imports are required dependencies.
   return ModuleLoadingBehavior::Required;
 }
-
diff --git a/lib/Serialization/ModuleFormat.h b/lib/Serialization/ModuleFormat.h
@@ -58,7 +58,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 845; // borrowing var introducer
+const uint16_t SWIFTMODULE_VERSION_MINOR = 846; // always trigger mismatch for NoncopyableGenerics
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
diff --git a/test/Generics/inverse_copyable_requirement.swift b/test/Generics/inverse_copyable_requirement.swift
@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 // a concrete move-only type
 struct MO: ~Copyable {
diff --git a/test/Generics/inverse_generics.swift b/test/Generics/inverse_generics.swift
@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NonescapableTypes
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 // Check support for explicit conditional conformance
 public struct ExplicitCond<T: ~Copyable>: ~Copyable {}
diff --git a/test/Generics/inverse_generics_stdlib.swift b/test/Generics/inverse_generics_stdlib.swift
@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift -parse-stdlib -module-name Swift -enable-experimental-feature BuiltinModule -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NonescapableTypes
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 /// This test specifically covers constructs that are only valid in the stdlib.
 
diff --git a/test/Generics/inverse_protocols.swift b/test/Generics/inverse_protocols.swift
@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 protocol Eq: ~Copyable {
   func same(as: borrowing Self) -> Bool
diff --git a/test/Generics/inverse_protocols_errors.swift b/test/Generics/inverse_protocols_errors.swift
@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 protocol RegularProto {}
 protocol NCProto: RegularProto
diff --git a/test/Generics/inverse_rdar119950540.swift b/test/Generics/inverse_rdar119950540.swift
@@ -1,7 +1,6 @@
 // RUN: %target-swift-frontend %s -emit-silgen -enable-experimental-feature NoncopyableGenerics > /dev/null
 
-// For -enable-experimental-feature NoncopyableGenerics
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 public protocol MyIteratorProtocol<Element> {
   associatedtype Element
diff --git a/test/Generics/inverse_scoping.swift b/test/Generics/inverse_scoping.swift
@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NonescapableTypes
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 protocol NoCopyReq: ~Copyable {}
 
diff --git a/test/Generics/inverse_signatures.swift b/test/Generics/inverse_signatures.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NonescapableTypes -verify -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s --implicit-check-not "error:"
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 // CHECK-LABEL: (file).genericFn@
 // CHECK: Generic signature: <T where T : Copyable, T : Escapable>
diff --git a/test/Interop/Cxx/class/move-only/move-only-cxx-value-type-generics.swift b/test/Interop/Cxx/class/move-only/move-only-cxx-value-type-generics.swift
@@ -4,8 +4,7 @@
 // REQUIRES: executable_test
 // REQUIRES: GH_ISSUE_70246
 
-// For -enable-experimental-feature NoncopyableGenerics
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 import MoveOnlyCxxValueType
 import StdlibUnittest
@@ -40,4 +39,3 @@ MoveOnlyCxxValueType.test("Test move only type ref return pointee borrow") {
 }
 
 runAllTests()
-
diff --git a/test/ModuleInterface/noncopyable_generics.swift b/test/ModuleInterface/noncopyable_generics.swift
@@ -35,7 +35,7 @@
 // RUN:    -enable-experimental-feature NoncopyableGenerics \
 // RUN:    -enable-experimental-feature NonescapableTypes
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 import NoncopyableGenerics_Misc
 
diff --git a/test/Parse/explicit_lifetime_dependence_specifiers.swift b/test/Parse/explicit_lifetime_dependence_specifiers.swift
@@ -1,5 +1,5 @@
 // RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature NonescapableTypes -disable-experimental-parser-round-trip   -enable-experimental-feature NoncopyableGenerics -enable-builtin-module
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 import Builtin
 
@@ -115,4 +115,3 @@ struct Wrapper : ~Escapable {
     return view
   }
 }
-
diff --git a/test/Parse/inverse_escapable_feature.swift b/test/Parse/inverse_escapable_feature.swift
@@ -1,5 +1,5 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 struct S: ~Escapable {} // expected-error {{type '~Escapable' requires -enable-experimental-feature NonescapableTypes}}
diff --git a/test/Parse/inverses.swift b/test/Parse/inverses.swift
@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics -warn-redundant-requirements
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 protocol U {}
 
diff --git a/test/Parse/inverses_legacy_ifdef.swift b/test/Parse/inverses_legacy_ifdef.swift
@@ -2,7 +2,7 @@
 // RUN: %swift-frontend -typecheck %s -DHAVE_NCGENERICS -enable-experimental-feature NoncopyableGenerics
 // RUN: %swift-frontend -typecheck %s -verify -DHAVE_NCGENERICS
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 /// This test checks that you can write ~Copyable in places that were illegal
 /// in Swift 5.9, as long as those illegal appearances are guarded within
diff --git a/test/SIL/Parser/basic2_noncopyable_generics.sil b/test/SIL/Parser/basic2_noncopyable_generics.sil
@@ -10,6 +10,7 @@
 // RUN: %FileCheck %s
 
 // For -enable-experimental-feature NoncopyableGenerics/NonescapableTypes
+// REQUIRES: noncopyable_generics
 // REQUIRES: asserts
 // TODO: Once NoncopyableGenerics/NonescapableTypes is no longer behind a feature flag, merge this into basic2.
 
@@ -30,4 +31,3 @@ struct NCG<T> : ~Copyable {
 struct NEG<T> : ~Escapable {
   var t: T
 }
-
diff --git a/test/SIL/explicit_lifetime_dependence_specifiers.swift b/test/SIL/explicit_lifetime_dependence_specifiers.swift
@@ -7,6 +7,7 @@
 // RUN: -enable-experimental-feature NoncopyableGenerics \
 // RUN: -enable-experimental-lifetime-dependence-inference | %FileCheck %s
 // REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 import Builtin
 
diff --git a/test/SIL/implicit_lifetime_dependence.swift b/test/SIL/implicit_lifetime_dependence.swift
@@ -7,6 +7,7 @@
 // RUN: -enable-experimental-feature NoncopyableGenerics \
 // RUN: -enable-experimental-lifetime-dependence-inference | %FileCheck %s
 // REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 import Builtin
 
@@ -75,4 +76,3 @@ struct Wrapper : ~Escapable {
     return view
   }
 }
-
diff --git a/test/SILGen/moveonly_basics.swift b/test/SILGen/moveonly_basics.swift
@@ -2,7 +2,7 @@
 // RUN: %target-swift-emit-silgen -enable-experimental-feature NoncopyableGenerics -module-name test %s | %FileCheck %s --enable-var-scope
 
 // For -enable-experimental-feature NoncopyableGenerics
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 class Retainable {}
 
diff --git a/test/SILGen/typelowering_inverses.swift b/test/SILGen/typelowering_inverses.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -emit-silgen -enable-experimental-feature NoncopyableGenerics -disable-availability-checking -module-name main %s | %FileCheck %s
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 struct NC: ~Copyable {}
 
diff --git a/test/SILOptimizer/lifetime_dependence_diagnostics_param.swift b/test/SILOptimizer/lifetime_dependence_diagnostics_param.swift
@@ -7,6 +7,7 @@
 // RUN:   -enable-experimental-feature NoncopyableGenerics
 
 // REQUIRES: swift_in_compiler
+// REQUIRES: noncopyable_generics
 
 import Builtin
 
diff --git a/test/SILOptimizer/lifetime_dependence_diagnostics_param_fail.swift b/test/SILOptimizer/lifetime_dependence_diagnostics_param_fail.swift
@@ -5,6 +5,7 @@
 // RUN:   -enable-experimental-feature NoncopyableGenerics
 
 // REQUIRES: swift_in_compiler
+// REQUIRES: noncopyable_generics
 
 import Builtin
 
diff --git a/test/SILOptimizer/lifetime_dependence_diagnostics_todo.swift b/test/SILOptimizer/lifetime_dependence_diagnostics_todo.swift
@@ -7,6 +7,7 @@
 // RUN:   -enable-experimental-feature NoncopyableGenerics
 
 // REQUIRES: swift_in_compiler
+// REQUIRES: noncopyable_generics
 
 // Future tests for LifetimeDependenceDiagnostics.
 // REQUIRES: disabled
diff --git a/test/SILOptimizer/lifetime_dependence_unit.sil b/test/SILOptimizer/lifetime_dependence_unit.sil
@@ -5,6 +5,7 @@
 // RUN:     -o /dev/null 2>&1 | %FileCheck %s
 
 // REQUIRES: swift_in_compiler
+// REQUIRES: noncopyable_generics
 
 sil_stage canonical
 
diff --git a/test/SILOptimizer/moveonly_addressors.swift b/test/SILOptimizer/moveonly_addressors.swift
@@ -4,6 +4,7 @@
 // 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
 
 // REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 // TODO: Use the real stdlib types once `UnsafePointer` supports noncopyable
 // types.
diff --git a/test/SILOptimizer/moveonly_computed_property.swift b/test/SILOptimizer/moveonly_computed_property.swift
@@ -1,7 +1,7 @@
 // RUN: %target-swift-frontend -emit-sil -verify %s > /dev/null
 // RUN: %target-swift-frontend -enable-experimental-feature NoncopyableGenerics -emit-sil -verify %s > /dev/null
 
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 // SIL verification failed: 'MoveOnly' types can only be copied in Raw SIL?!
 // REQUIRES: rdar118135397
diff --git a/test/SILOptimizer/moveonly_generics_basic.swift b/test/SILOptimizer/moveonly_generics_basic.swift
@@ -1,6 +1,7 @@
 // RUN: %target-swift-frontend %s -sil-verify-all -verify -emit-sil -enable-experimental-feature MoveOnlyPartialConsumption -enable-experimental-feature MoveOnlyPartialReinitialization -enable-experimental-feature NoncopyableGenerics
 
 // REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 
 /// MARK: types
 
diff --git a/test/Sema/bitwise_copyable.swift b/test/Sema/bitwise_copyable.swift
@@ -6,6 +6,8 @@
 // RUN:     -enable-builtin-module                           \
 // RUN:     -debug-diagnostic-names
 
+// REQUIRES: noncopyable_generics
+
 //==============================================================================
 //===========================DEPENDENCY-FREE TESTS=(BEGIN)===================={{
 //==============================================================================
diff --git a/test/Sema/explicit_lifetime_dependence_specifiers.swift b/test/Sema/explicit_lifetime_dependence_specifiers.swift
@@ -1,5 +1,5 @@
 // RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature NonescapableTypes -disable-experimental-parser-round-trip   -enable-experimental-feature NoncopyableGenerics -enable-builtin-module
-// REQUIRES: asserts
+// REQUIRES: noncopyable_generics
 import Builtin
 
 struct BufferView : ~Escapable {
@@ -136,4 +136,3 @@ struct ArrayOfBufferView : ~Escapable {
         return arr[index]
     }
 }
-
diff --git a/test/Serialization/noncopyable_generics.swift b/test/Serialization/noncopyable_generics.swift
@@ -15,6 +15,8 @@
 // RUN:    -I %t -source-filename=%s                                           \
 // RUN:    | %FileCheck -check-prefix=CHECK-PRINT %s
 
+// REQUIRES: noncopyable_generics
+
 // CHECK-NOT: UnknownCode
 
 // CHECK-PRINT-DAG: protocol Generator<Value> {
@@ -48,5 +50,3 @@ func check() {
 
     let x: Maybe<NC> = .none // expected-error {{noncopyable type 'NC' cannot be used with generic type 'Maybe<Wrapped>' yet}}
 }
-
-
