Merge pull request #73501 from kavon/ncgeneric-not-experimental

NCGenerics: it's not experimental

Author: kavon

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)
 

lib/ClangImporter/ClangImporter.cpp

@@ -5795,20 +5795,6 @@ cloneBaseMemberDecl(ValueDecl *decl, DeclContext *newContext) {
   }
 
   if (auto var = dyn_cast<VarDecl>(decl)) {
-    auto oldContext = var->getDeclContext();
-    auto oldTypeDecl = oldContext->getSelfNominalTypeDecl();
-    // If the base type is non-copyable, and non-copyable generics are disabled,
-    // we cannot synthesize the accessor, because its implementation would use
-    // `UnsafePointer<BaseTy>`.
-    // We cannot use `ty->isNoncopyable()` here because that would create a
-    // cyclic dependency between ModuleQualifiedLookupRequest and
-    // LookupConformanceInModuleRequest, so we check for the presence of
-    // move-only attribute that is implicitly added to non-copyable C++ types by
-    // ClangImporter.
-    if (oldTypeDecl->getAttrs().hasAttribute<MoveOnlyAttr>() &&
-        !context.LangOpts.hasFeature(Feature::NoncopyableGenerics))
-      return nullptr;
-
     auto rawMemory = allocateMemoryForDecl<VarDecl>(var->getASTContext(),
                                                     sizeof(VarDecl), false);
     auto out =

lib/ClangImporter/ImportType.cpp

@@ -509,26 +509,6 @@ namespace {
         return importFunctionPointerLikeType(*type, pointeeType);
       }
 
-      // If non-copyable generics are disabled, we cannot specify
-      // UnsafePointer<T> with a non-copyable type T.
-      // We cannot use `ty->isNoncopyable()` here because that would create a
-      // cyclic dependency between ModuleQualifiedLookupRequest and
-      // LookupConformanceInModuleRequest, so we check for the presence of
-      // move-only attribute that is implicitly added to non-copyable C++ types
-      // by ClangImporter.
-      if (pointeeType && pointeeType->getAnyNominal() &&
-          pointeeType->getAnyNominal()
-              ->getAttrs()
-              .hasAttribute<MoveOnlyAttr>() &&
-          !Impl.SwiftContext.LangOpts.hasFeature(
-              Feature::NoncopyableGenerics)) {
-        auto opaquePointerDecl = Impl.SwiftContext.getOpaquePointerDecl();
-        if (!opaquePointerDecl)
-          return Type();
-        return {opaquePointerDecl->getDeclaredInterfaceType(),
-                ImportHint::OtherPointer};
-      }
-
       PointerTypeKind pointerKind;
       if (quals.hasConst()) {
         pointerKind = PTK_UnsafePointer;

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 : $()
-}
+}

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

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

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.
 

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.
 

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
 

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 {