Merge pull request swiftlang#69281 from jckarter/enable-move-only-resilient-types

jckarter · web-flow · commit 1560e08d04ad · 2023-10-19T16:47:42.000-07:00
Enable MoveOnlyResilientTypes feature.
diff --git a/include/swift/Basic/Features.def b/include/swift/Basic/Features.def
@@ -107,6 +107,7 @@ LANGUAGE_FEATURE(
 LANGUAGE_FEATURE(AttachedMacros, 389, "Attached macros", hasSwiftSwiftParser)
 LANGUAGE_FEATURE(ExtensionMacros, 402, "Extension macros", hasSwiftSwiftParser)
 LANGUAGE_FEATURE(MoveOnly, 390, "noncopyable types", true)
+LANGUAGE_FEATURE(MoveOnlyResilientTypes, 390, "non-@frozen noncopyable types with library evolution", true)
 LANGUAGE_FEATURE(ParameterPacks, 393, "Value and type parameter packs", true)
 SUPPRESSIBLE_LANGUAGE_FEATURE(LexicalLifetimes, 0, "@_eagerMove/@_noEagerMove/@_lexicalLifetimes annotations", true)
 LANGUAGE_FEATURE(FreestandingMacros, 397, "freestanding declaration macros", true)
@@ -142,7 +143,6 @@ EXPERIMENTAL_FEATURE(NoImplicitCopy, true)
 EXPERIMENTAL_FEATURE(OldOwnershipOperatorSpellings, true)
 EXPERIMENTAL_FEATURE(MoveOnlyEnumDeinits, true)
 EXPERIMENTAL_FEATURE(MoveOnlyTuples, true)
-EXPERIMENTAL_FEATURE(MoveOnlyResilientTypes, true)
 EXPERIMENTAL_FEATURE(MoveOnlyPartialConsumption, true)
 
 EXPERIMENTAL_FEATURE(OneWayClosureParameters, false)
diff --git a/lib/Sema/TypeCheckDeclPrimary.cpp b/lib/Sema/TypeCheckDeclPrimary.cpp
@@ -2758,12 +2758,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
                         ED->getBaseIdentifier());
         }
       }
-
-      if (!ED->getASTContext().LangOpts.hasFeature(
-              Feature::MoveOnlyResilientTypes) &&
-          ED->isResilient()) {
-        ED->diagnose(diag::noncopyable_types_cannot_be_resilient, ED);
-      }
     }
   }
 
@@ -2804,12 +2798,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     diagnoseCopyableTypeContainingMoveOnlyType(SD);
 
     diagnoseIncompatibleProtocolsForMoveOnlyType(SD);
-
-    if (!SD->getASTContext().LangOpts.hasFeature(
-            Feature::MoveOnlyResilientTypes) &&
-        SD->isResilient() && SD->isNoncopyable()) {
-      SD->diagnose(diag::noncopyable_types_cannot_be_resilient, SD);
-    }
   }
 
   /// Check whether the given properties can be @NSManaged in this class.
diff --git a/test/IRGen/moveonly_split_module_source_deinit_library_evolution.swift b/test/IRGen/moveonly_split_module_source_deinit_library_evolution.swift
@@ -1,8 +1,8 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift-dylib(%t/%target-library-name(MoveOnlySplit)) -enable-library-evolution %S/Inputs/moveonly_split_module_source_input.swift -emit-module -emit-module-path %t/MoveOnlySplit.swiftmodule -module-name MoveOnlySplit -DTEST_LIBRARY_EVOLUTION -enable-experimental-feature MoveOnlyResilientTypes
+// RUN: %target-build-swift-dylib(%t/%target-library-name(MoveOnlySplit)) -enable-library-evolution %S/Inputs/moveonly_split_module_source_input.swift -emit-module -emit-module-path %t/MoveOnlySplit.swiftmodule -module-name MoveOnlySplit -DTEST_LIBRARY_EVOLUTION
 // RUN: %target-codesign %t/%target-library-name(MoveOnlySplit)
 
-// RUN: %target-build-swift %s -lMoveOnlySplit -I %t -L %t -o %t/main %target-rpath(%t) -enable-experimental-feature MoveOnlyResilientTypes
+// RUN: %target-build-swift %s -lMoveOnlySplit -I %t -L %t -o %t/main %target-rpath(%t)
 // RUN: %target-codesign %t/main
 // RUN: %target-run %t/main %t/%target-library-name(MoveOnlySplit) | %FileCheck -check-prefix=CHECK-LIBRARY-EVOLUTION %s
 
diff --git a/test/ModuleInterface/discard_interface.swift b/test/ModuleInterface/discard_interface.swift
@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library -verify -enable-experimental-feature MoveOnlyResilientTypes
-// RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -I %t -enable-experimental-feature MoveOnlyResilientTypes
+// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library -verify
+// RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -I %t
 // RUN: %FileCheck %s < %t/Library.swiftinterface
 
 // This test makes sure that discard is emitted correctly in the interfaces.
diff --git a/test/ModuleInterface/moveonly_interface_flag.swift b/test/ModuleInterface/moveonly_interface_flag.swift
@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library -enable-experimental-feature MoveOnlyResilientTypes
-// RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -I %t -enable-experimental-feature MoveOnlyResilientTypes
+// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library
+// RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -I %t
 // RUN: %FileCheck %s < %t/Library.swiftinterface
 
 // this test makes sure that decls containing a move-only type are guarded by the $MoveOnly feature flag
diff --git a/test/ModuleInterface/moveonly_user.swift b/test/ModuleInterface/moveonly_user.swift
@@ -5,8 +5,8 @@
 // RUN: %target-swift-frontend -emit-sil -sil-verify-all -I %t %s > /dev/null
 
 // >> now again with library evolution; we expect the same result.
-// RUN: %target-swift-frontend -DSYNTHESIZE_ACCESSORS -enable-library-evolution -enable-experimental-feature MoveOnlyResilientTypes -emit-module -o %t/Hello.swiftmodule %S/Inputs/moveonly_api.swift
-// RUN: %target-swift-frontend -enable-experimental-feature MoveOnlyResilientTypes -emit-sil -sil-verify-all -I %t %s > /dev/null
+// RUN: %target-swift-frontend -DSYNTHESIZE_ACCESSORS -enable-library-evolution -emit-module -o %t/Hello.swiftmodule %S/Inputs/moveonly_api.swift
+// RUN: %target-swift-frontend -emit-sil -sil-verify-all -I %t %s > /dev/null
 
 // FIXME: ideally this would also try executing the program rather than just generating SIL
 
diff --git a/test/SILGen/moveonly_library_evolution.swift b/test/SILGen/moveonly_library_evolution.swift
@@ -1,5 +1,5 @@
-// RUN: %target-swift-emit-silgen -enable-experimental-feature MoveOnlyPartialConsumption -enable-experimental-feature NoImplicitCopy -enable-experimental-feature MoveOnlyResilientTypes -enable-library-evolution %s | %FileCheck %s
-// RUN: %target-swift-emit-sil -O -sil-verify-all -enable-experimental-feature MoveOnlyPartialConsumption -enable-experimental-feature NoImplicitCopy -enable-experimental-feature MoveOnlyResilientTypes -enable-library-evolution %s
+// RUN: %target-swift-emit-silgen -enable-experimental-feature MoveOnlyPartialConsumption -enable-experimental-feature NoImplicitCopy -enable-library-evolution %s | %FileCheck %s
+// RUN: %target-swift-emit-sil -O -sil-verify-all -enable-experimental-feature MoveOnlyPartialConsumption -enable-experimental-feature NoImplicitCopy -enable-library-evolution %s
 
 ////////////////////////
 // MARK: Declarations //
diff --git a/test/SILOptimizer/moveonly_addresschecker_diagnostics_library_evolution.swift b/test/SILOptimizer/moveonly_addresschecker_diagnostics_library_evolution.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-sil -enable-experimental-feature NoImplicitCopy -sil-verify-all -verify -enable-library-evolution -enable-experimental-feature MoveOnlyResilientTypes %s
+// RUN: %target-swift-emit-sil -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_deinit_devirtualization_library_evolution.sil b/test/SILOptimizer/moveonly_deinit_devirtualization_library_evolution.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -enable-library-evolution -module-name main -enable-sil-verify-all -sil-move-only-deinit-devirtualization -enable-experimental-feature MoveOnlyClasses -enable-experimental-feature MoveOnlyEnumDeinits -enable-experimental-feature MoveOnlyResilientTypes %s | %FileCheck %s
+// RUN: %target-sil-opt -enable-library-evolution -module-name main -enable-sil-verify-all -sil-move-only-deinit-devirtualization -enable-experimental-feature MoveOnlyClasses -enable-experimental-feature MoveOnlyEnumDeinits %s | %FileCheck %s
 
 sil_stage raw
 
diff --git a/test/SILOptimizer/moveonly_loadable_to_address_reabstraction.swift b/test/SILOptimizer/moveonly_loadable_to_address_reabstraction.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-sil -verify -enable-library-evolution -enable-experimental-feature MoveOnlyResilientTypes %s
+// RUN: %target-swift-frontend -emit-sil -verify -enable-library-evolution %s
 
 // Verify that call sequences that require reabstracting a noncopyable value
 // from a loadable representation to an in-memory one are properly allowed by
diff --git a/test/SILOptimizer/moveonly_resilient_property_reader.swift b/test/SILOptimizer/moveonly_resilient_property_reader.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-experimental-feature MoveOnlyResilientTypes -enable-library-evolution -emit-sil %s | %FileCheck %s
+// RUN: %target-swift-frontend -enable-library-evolution -emit-sil %s | %FileCheck %s
 
 public struct ResilientMemberC {}
 public struct ResilientMemberNC: ~Copyable {}
diff --git a/test/Sema/discard_module.swift b/test/Sema/discard_module.swift
@@ -5,7 +5,7 @@
 // RUN: %target-typecheck-verify-swift -I %t
 
 // >> now again with library evolution; we expect the same result.
-// RUN: %target-swift-frontend -enable-library-evolution -emit-module -o %t/SorryModule.swiftmodule %S/Inputs/discard_module_defining.swift %S/Inputs/discard_module_adjacent.swift -enable-experimental-feature MoveOnlyResilientTypes
+// RUN: %target-swift-frontend -enable-library-evolution -emit-module -o %t/SorryModule.swiftmodule %S/Inputs/discard_module_defining.swift %S/Inputs/discard_module_adjacent.swift
 // RUN: %target-typecheck-verify-swift -I %t
 
 // "Sorry" is meaningless
diff --git a/test/Sema/moveonly_resilient_type.swift b/test/Sema/moveonly_resilient_type.swift

Original file line number	Diff line number	Diff line change
`@@ -2758,12 +2758,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {`
`2758`	`2758`	`ED->getBaseIdentifier());`
`2759`	`2759`	`}`
`2760`	`2760`	`}`
`2761`		`-`
`2762`		`- if (!ED->getASTContext().LangOpts.hasFeature(`
`2763`		`- Feature::MoveOnlyResilientTypes) &&`
`2764`		`- ED->isResilient()) {`
`2765`		`- ED->diagnose(diag::noncopyable_types_cannot_be_resilient, ED);`
`2766`		`- }`
`2767`	`2761`	`}`
`2768`	`2762`	`}`
`2769`	`2763`
`@@ -2804,12 +2798,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {`
`2804`	`2798`	`diagnoseCopyableTypeContainingMoveOnlyType(SD);`
`2805`	`2799`
`2806`	`2800`	`diagnoseIncompatibleProtocolsForMoveOnlyType(SD);`
`2807`		`-`
`2808`		`- if (!SD->getASTContext().LangOpts.hasFeature(`
`2809`		`- Feature::MoveOnlyResilientTypes) &&`
`2810`		`- SD->isResilient() && SD->isNoncopyable()) {`
`2811`		`- SD->diagnose(diag::noncopyable_types_cannot_be_resilient, SD);`
`2812`		`- }`
`2813`	`2801`	`}`
`2814`	`2802`
`2815`	`2803`	`/// Check whether the given properties can be @NSManaged in this class.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-emit-sil -enable-experimental-feature NoImplicitCopy -sil-verify-all -verify -enable-library-evolution -enable-experimental-feature MoveOnlyResilientTypes %s`
	`1`	`+// RUN: %target-swift-emit-sil -enable-experimental-feature NoImplicitCopy -sil-verify-all -verify -enable-library-evolution %s`
`2`	`2`
`3`	`3`	`// This test is used to validate that we properly handle library evolution code`
`4`	`4`	`// until we can get all of the normal moveonly_addresschecker_diagnostics test`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-sil-opt -enable-library-evolution -module-name main -enable-sil-verify-all -sil-move-only-deinit-devirtualization -enable-experimental-feature MoveOnlyClasses -enable-experimental-feature MoveOnlyEnumDeinits -enable-experimental-feature MoveOnlyResilientTypes %s \| %FileCheck %s`
	`1`	`+// RUN: %target-sil-opt -enable-library-evolution -module-name main -enable-sil-verify-all -sil-move-only-deinit-devirtualization -enable-experimental-feature MoveOnlyClasses -enable-experimental-feature MoveOnlyEnumDeinits %s \| %FileCheck %s`
`2`	`2`
`3`	`3`	`sil_stage raw`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -emit-sil -verify -enable-library-evolution -enable-experimental-feature MoveOnlyResilientTypes %s`
	`1`	`+// RUN: %target-swift-frontend -emit-sil -verify -enable-library-evolution %s`
`2`	`2`
`3`	`3`	`// Verify that call sequences that require reabstracting a noncopyable value`
`4`	`4`	`// from a loadable representation to an in-memory one are properly allowed by`