Merge pull request swiftlang#63179 from kavon/moveonly-structs-or-enums

swift-ci · web-flow · commit ca1f3f7a5478 · 2023-01-24T07:05:24.000-08:00
Limit `@_moveOnly` to structs and enums
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -6704,7 +6704,7 @@ ERROR(concurrency_task_to_thread_model_global_actor_annotation,none,
       (TypeRepr*, StringRef))
 
 ERROR(moveOnly_not_allowed_here,none,
-      "'moveOnly' may only be applied to classes, structs, and enums", ())
+      "'moveOnly' only applies to structs or enums", ())
 ERROR(move_expression_not_passed_lvalue,none,
       "'move' can only be applied to lvalues", ())
 ERROR(borrow_expression_not_passed_lvalue,none,
diff --git a/include/swift/Basic/Features.def b/include/swift/Basic/Features.def
@@ -103,6 +103,7 @@ EXPERIMENTAL_FEATURE(VariadicGenerics, false)
 EXPERIMENTAL_FEATURE(NamedOpaqueTypes, false)
 EXPERIMENTAL_FEATURE(FlowSensitiveConcurrencyCaptures, false)
 EXPERIMENTAL_FEATURE(MoveOnly, false)
+EXPERIMENTAL_FEATURE(MoveOnlyClasses, false)
 EXPERIMENTAL_FEATURE(OneWayClosureParameters, false)
 EXPERIMENTAL_FEATURE(TypeWitnessSystemInference, false)
 EXPERIMENTAL_FEATURE(LayoutPrespecialization, false)
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
@@ -3114,9 +3114,15 @@ static bool usesFeatureFlowSensitiveConcurrencyCaptures(Decl *decl) {
 }
 
 static bool usesFeatureMoveOnly(Decl *decl) {
+  if (auto nominal = dyn_cast<NominalTypeDecl>(decl))
+    return nominal->isMoveOnly();
   return false;
 }
 
+static bool usesFeatureMoveOnlyClasses(Decl *decl) {
+  return isa<ClassDecl>(decl) && usesFeatureMoveOnly(decl);
+}
+
 static bool usesFeatureOneWayClosureParameters(Decl *decl) {
   return false;
 }
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -2096,9 +2096,15 @@ void AttributeChecker::visitMoveOnlyAttr(MoveOnlyAttr *attr) {
     return;
   }
 
-  if (isa<NominalTypeDecl>(D))
+  if (isa<StructDecl>(D) || isa<EnumDecl>(D))
     return;
 
+  // for development purposes, allow it if specifically requested for classes.
+  if (D->getASTContext().LangOpts.hasFeature(Feature::MoveOnlyClasses)) {
+    if (isa<ClassDecl>(D))
+      return;
+  }
+
   diagnose(attr->getLocation(), diag::moveOnly_not_allowed_here)
     .fixItRemove(attr->getRange());
 }
diff --git a/test/SILGen/moveonly.swift b/test/SILGen/moveonly.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-silgen -enable-experimental-move-only %s | %FileCheck %s
+// RUN: %target-swift-emit-silgen -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s | %FileCheck %s
 
 //////////////////
 // Declarations //
diff --git a/test/SILGen/moveonly_var.swift b/test/SILGen/moveonly_var.swift
@@ -1,5 +1,5 @@
-// RUN: %target-swift-emit-silgen -enable-experimental-move-only %s | %FileCheck %s
-// RUN: %target-swift-emit-sil -enable-experimental-move-only %s | %FileCheck %s
+// RUN: %target-swift-emit-silgen -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s | %FileCheck %s
+// RUN: %target-swift-emit-sil -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s | %FileCheck %s
 
 //////////////////
 // Declarations //
diff --git a/test/SILOptimizer/moveonly_addresschecker.sil b/test/SILOptimizer/moveonly_addresschecker.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -sil-move-only-address-checker -enable-experimental-move-only -enable-sil-verify-all %s | %FileCheck %s
+// RUN: %target-sil-opt -sil-move-only-address-checker -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses -enable-sil-verify-all %s | %FileCheck %s
 
 sil_stage raw
 
diff --git a/test/SILOptimizer/moveonly_addresschecker_diagnostics.sil b/test/SILOptimizer/moveonly_addresschecker_diagnostics.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -sil-move-only-address-checker -enable-experimental-move-only -enable-sil-verify-all %s -verify
+// RUN: %target-sil-opt -sil-move-only-address-checker -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses -enable-sil-verify-all %s -verify
 
 // TODO: Add FileCheck
 
diff --git a/test/SILOptimizer/moveonly_addresschecker_diagnostics.swift b/test/SILOptimizer/moveonly_addresschecker_diagnostics.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-sil -verify -enable-experimental-move-only %s
+// RUN: %target-swift-emit-sil -verify -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s
 
 //////////////////
 // Declarations //
diff --git a/test/SILOptimizer/moveonly_deinit_insertion.sil b/test/SILOptimizer/moveonly_deinit_insertion.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -module-name main -enable-sil-verify-all -sil-move-only-deinit-insertion -enable-experimental-move-only %s | %FileCheck %s
+// RUN: %target-sil-opt -module-name main -enable-sil-verify-all -sil-move-only-deinit-insertion -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s | %FileCheck %s
 
 sil_stage raw
 
diff --git a/test/SILOptimizer/moveonly_lifetime.swift b/test/SILOptimizer/moveonly_lifetime.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-sil -Onone -verify -enable-experimental-move-only %s | %FileCheck %s
+// RUN: %target-swift-emit-sil -Onone -verify -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s | %FileCheck %s
 
 @_moveOnly
 class C {}
diff --git a/test/SILOptimizer/moveonly_objectchecker.sil b/test/SILOptimizer/moveonly_objectchecker.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -sil-move-only-object-checker -enable-experimental-move-only -enable-sil-verify-all -move-only-diagnostics-silently-emit-diagnostics %s | %FileCheck %s
+// RUN: %target-sil-opt -sil-move-only-object-checker -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses -enable-sil-verify-all -move-only-diagnostics-silently-emit-diagnostics %s | %FileCheck %s
 
 sil_stage raw
 
diff --git a/test/SILOptimizer/moveonly_objectchecker_diagnostics.swift b/test/SILOptimizer/moveonly_objectchecker_diagnostics.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-sil -verify -enable-experimental-move-only %s
+// RUN: %target-swift-emit-sil -verify -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s
 
 //////////////////
 // Declarations //
diff --git a/test/SILOptimizer/moveonly_trivial_addresschecker_diagnostics.swift b/test/SILOptimizer/moveonly_trivial_addresschecker_diagnostics.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-sil -verify -enable-experimental-move-only %s
+// RUN: %target-swift-emit-sil -verify -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s
 
 //////////////////
 // Declarations //
diff --git a/test/Sema/moveonly_decl_attr.swift b/test/Sema/moveonly_decl_attr.swift
@@ -2,8 +2,7 @@
 
 import Swift
 
-@_moveOnly
-class C {
+@_moveOnly class C { // expected-error {{'moveOnly' only applies to structs or enums}}{{1-12=}}
     @_moveOnly // expected-error {{'@_moveOnly' attribute cannot be applied to this declaration}}
     func foo() {}
 }
@@ -21,3 +20,7 @@ enum E {
 }
 
 @_moveOnly let l = C()  // expected-error {{'@_moveOnly' attribute cannot be applied to this declaration}}
+
+@_moveOnly protocol P {} // expected-error {{'moveOnly' only applies to structs or enums}}{{1-12=}}
+@_moveOnly actor A {} // expected-error {{'moveOnly' only applies to structs or enums}}{{1-12=}}
+@_moveOnly extension C {} // expected-error {{'@_moveOnly' attribute cannot be applied to this declaration}}{{1-12=}}
diff --git a/test/Sema/moveonly_restrictions.swift b/test/Sema/moveonly_restrictions.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-move-only
+// RUN: %target-typecheck-verify-swift -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses
 
 class CopyableKlass {}
 @_moveOnly
diff --git a/test/Serialization/Inputs/moveonly_klass.swift b/test/Serialization/Inputs/moveonly_klass.swift
diff --git a/test/Serialization/moveonly_error_on_import_into_module_without_flag.swift b/test/Serialization/moveonly_error_on_import_into_module_without_flag.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -emit-module -o %t/Library.swiftmodule -module-name Library %S/Inputs/moveonly_klass.swift -enable-experimental-move-only
+// RUN: %target-swift-frontend -emit-module -o %t/Library.swiftmodule -module-name Library %S/Inputs/moveonly_deinit.swift -enable-experimental-move-only
 // RUN: not %target-swift-frontend -I %t %s -emit-sil -o /dev/null 2>&1 | %FileCheck %s
 
 // This test makes sure that if we import a move only type and do not set the
@@ -9,5 +9,5 @@ import Library
 
 // CHECK: error: Can not import module 'Library' that uses move only features when experimental move only is disabled! Pass the frontend flag -enable-experimental-move-only to swift to enable the usage of this language feature
 
-func f(_ k: Klass) {
+func f(_ k: MoveOnlyStruct) {
 }

Original file line number	Diff line number	Diff line change
`@@ -3114,9 +3114,15 @@ static bool usesFeatureFlowSensitiveConcurrencyCaptures(Decl *decl) {`
`3114`	`3114`	`}`
`3115`	`3115`
`3116`	`3116`	`static bool usesFeatureMoveOnly(Decl *decl) {`
	`3117`	`+ if (auto nominal = dyn_cast<NominalTypeDecl>(decl))`
	`3118`	`+ return nominal->isMoveOnly();`
`3117`	`3119`	`return false;`
`3118`	`3120`	`}`
`3119`	`3121`
	`3122`	`+static bool usesFeatureMoveOnlyClasses(Decl *decl) {`
	`3123`	`+ return isa<ClassDecl>(decl) && usesFeatureMoveOnly(decl);`
	`3124`	`+}`
	`3125`	`+`
`3120`	`3126`	`static bool usesFeatureOneWayClosureParameters(Decl *decl) {`
`3121`	`3127`	`return false;`
`3122`	`3128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-emit-silgen -enable-experimental-move-only %s \| %FileCheck %s`
	`1`	`+// RUN: %target-swift-emit-silgen -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s \| %FileCheck %s`
`2`	`2`
`3`	`3`	`//////////////////`
`4`	`4`	`// Declarations //`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-sil-opt -sil-move-only-address-checker -enable-experimental-move-only -enable-sil-verify-all %s \| %FileCheck %s`
	`1`	`+// RUN: %target-sil-opt -sil-move-only-address-checker -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses -enable-sil-verify-all %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-emit-sil -verify -enable-experimental-move-only %s`
	`1`	`+// RUN: %target-swift-emit-sil -verify -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s`
`2`	`2`
`3`	`3`	`//////////////////`
`4`	`4`	`// Declarations //`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-sil-opt -module-name main -enable-sil-verify-all -sil-move-only-deinit-insertion -enable-experimental-move-only %s \| %FileCheck %s`
	`1`	`+// RUN: %target-sil-opt -module-name main -enable-sil-verify-all -sil-move-only-deinit-insertion -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s \| %FileCheck %s`
`2`	`2`
`3`	`3`	`sil_stage raw`
`4`	`4`