Merge pull request swiftlang#63205 from kavon/moveonlyclasses-even-in-prod

gottesmm · web-flow · commit ae0f156f09f0 · 2023-01-25T01:11:27.000-08:00
Allow `MoveOnlyClasses` in non-assert builds
diff --git a/include/swift/Basic/Features.def b/include/swift/Basic/Features.def
@@ -102,8 +102,13 @@ EXPERIMENTAL_FEATURE(StaticAssert, false)
 EXPERIMENTAL_FEATURE(VariadicGenerics, false)
 EXPERIMENTAL_FEATURE(NamedOpaqueTypes, false)
 EXPERIMENTAL_FEATURE(FlowSensitiveConcurrencyCaptures, false)
-EXPERIMENTAL_FEATURE(MoveOnly, false)
-EXPERIMENTAL_FEATURE(MoveOnlyClasses, false)
+EXPERIMENTAL_FEATURE(MoveOnly, true)
+
+// FIXME: MoveOnlyClasses is not intended to be in production,
+// but our tests currently rely on it, and we want to run those
+// tests in non-asserts builds too.
+EXPERIMENTAL_FEATURE(MoveOnlyClasses, true)
+
 EXPERIMENTAL_FEATURE(OneWayClosureParameters, false)
 EXPERIMENTAL_FEATURE(TypeWitnessSystemInference, false)
 EXPERIMENTAL_FEATURE(LayoutPrespecialization, false)
diff --git a/test/SILGen/moveonly.swift b/test/SILGen/moveonly.swift
@@ -1,5 +1,4 @@
 // RUN: %target-swift-emit-silgen -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s | %FileCheck %s
-// REQUIRES: asserts
 
 //////////////////
 // Declarations //
diff --git a/test/SILGen/moveonly_var.swift b/test/SILGen/moveonly_var.swift
@@ -1,6 +1,5 @@
 // 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
-// REQUIRES: asserts
 
 //////////////////
 // Declarations //
diff --git a/test/SILOptimizer/moveonly_addresschecker_diagnostics.swift b/test/SILOptimizer/moveonly_addresschecker_diagnostics.swift
@@ -1,5 +1,4 @@
 // RUN: %target-swift-emit-sil -verify -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s
-// REQUIRES: asserts
 
 //////////////////
 // Declarations //
diff --git a/test/SILOptimizer/moveonly_lifetime.swift b/test/SILOptimizer/moveonly_lifetime.swift
@@ -1,5 +1,4 @@
 // RUN: %target-swift-emit-sil -Onone -verify -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s | %FileCheck %s
-// REQUIRES: asserts
 
 @_moveOnly
 class C {}
diff --git a/test/SILOptimizer/moveonly_objectchecker_diagnostics.swift b/test/SILOptimizer/moveonly_objectchecker_diagnostics.swift
@@ -1,5 +1,4 @@
 // RUN: %target-swift-emit-sil -verify -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s
-// REQUIRES: asserts
 
 //////////////////
 // Declarations //
diff --git 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 -verify -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s
-// REQUIRES: asserts
 
 //////////////////
 // Declarations //

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// RUN: %target-swift-emit-silgen -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s \| %FileCheck %s`
`2`		`-// REQUIRES: asserts`
`3`	`2`
`4`	`3`	`//////////////////`
`5`	`4`	`// Declarations //`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// RUN: %target-swift-emit-sil -verify -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s`
`2`		`-// REQUIRES: asserts`
`3`	`2`
`4`	`3`	`//////////////////`
`5`	`4`	`// Declarations //`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// RUN: %target-swift-emit-sil -Onone -verify -enable-experimental-move-only -enable-experimental-feature MoveOnlyClasses %s \| %FileCheck %s`
`2`		`-// REQUIRES: asserts`
`3`	`2`
`4`	`3`	`@_moveOnly`
`5`	`4`	`class C {}`