[wip] pile of test updates

most of these are mechanical changes to
remove @_moveOnly but there's also some
manual updates in here. too tired to
separate.

Author: kavon

test/Constraints/moveonly_constraints.swift

@@ -1,11 +1,11 @@
 // RUN: %target-typecheck-verify-swift
 
 // a concrete move-only type
-@_moveOnly struct MO {
+ struct MO : ~Copyable {
   var x: Int?
 }
 
-@_moveOnly struct Container {
+ struct Container : ~Copyable {
   var mo: MO = MO()
 }
 
@@ -255,7 +255,7 @@ class SomeGuy: HasType { // expected-error {{type 'SomeGuy' does not conform to
 }
 
 struct AnotherGuy: HasType { // expected-error {{type 'AnotherGuy' does not conform to protocol 'HasType'}}
-  @_moveOnly struct Ty {} // expected-note {{possibly intended match 'AnotherGuy.Ty' does not conform to 'Copyable'}}
+  struct Ty : ~Copyable {} // expected-note {{possibly intended match 'AnotherGuy.Ty' does not conform to 'Copyable'}}
 }
 
 protocol Gives: HasType {

test/IRGen/moveonly_deinits.swift

@@ -22,14 +22,12 @@ class Klass {}
 // Struct Declarations //
 /////////////////////////
 
-@_moveOnly
-struct KlassPairWithoutDeinit {
+ struct KlassPairWithoutDeinit : ~Copyable {
     var lhs = Klass()
     var rhs = Klass()
 }
 
-@_moveOnly
-struct KlassPairWithDeinit {
+ struct KlassPairWithDeinit : ~Copyable {
     var lhs = Klass()
     var rhs = Klass()
 
@@ -38,14 +36,12 @@ struct KlassPairWithDeinit {
     }
 }
 
-@_moveOnly
-struct IntPairWithoutDeinit {
+ struct IntPairWithoutDeinit : ~Copyable {
     var k: Int = 5
     var k2: Int = 6
 }
 
-@_moveOnly
-struct IntPairWithDeinit {
+ struct IntPairWithDeinit : ~Copyable {
     var k: Int = 5
     var k2: Int = 6
 
@@ -195,14 +191,12 @@ public func testKlassPairWithDeinit() {
 // Enum Declarations //
 ///////////////////////
 
-@_moveOnly
-enum KlassEnumPairWithoutDeinit {
+ enum KlassEnumPairWithoutDeinit : ~Copyable {
     case lhs(Klass)
     case rhs(Klass)
 }
 
-@_moveOnly
-enum KlassEnumPairWithDeinit {
+ enum KlassEnumPairWithDeinit : ~Copyable {
     case lhs(Klass)
     case rhs(Klass)
 
@@ -211,14 +205,12 @@ enum KlassEnumPairWithDeinit {
     }
 }
 
-@_moveOnly
-enum IntEnumPairWithoutDeinit {
+ enum IntEnumPairWithoutDeinit : ~Copyable {
 case lhs(Int)
 case rhs(Int)
 }
 
-@_moveOnly
-enum IntEnumPairWithDeinit {
+ enum IntEnumPairWithDeinit : ~Copyable {
     case lhs(Int)
     case rhs(Int)
 

test/Interpreter/moveonly.swift

@@ -8,8 +8,7 @@ defer { runAllTests() }
 
 var Tests = TestSuite("MoveOnlyTests")
 
-@_moveOnly
-struct FD {
+struct FD : ~Copyable {
   var a = LifetimeTracked(0)
 
   deinit {
@@ -51,8 +50,7 @@ Tests.test("global destroyed once") {
 // TODO (rdar://107494072): Move-only types with deinits declared inside
 // functions sometimes lose their deinit function.
 // When that's fixed, FD2 can be moved back inside the test closure below.
-@_moveOnly
-struct FD2 {
+struct FD2 : ~Copyable {
   var field = 5
   static var count = 0
   init() { FD2.count += 1 }

test/Interpreter/moveonly_bufferview.swift

@@ -7,8 +7,7 @@
 // Until we get support for emitting value witnesses for deinits, do not run
 // this with optimizations.
 
-@_moveOnly
-public struct BufferView<T> {
+public  struct BufferView<T> : ~Copyable {
     var ptr: UnsafeBufferPointer<T>
 
     var count: Int {

test/Interpreter/moveonly_consuming_param.swift

@@ -2,8 +2,7 @@
 
 // REQUIRES: executable_test
 
-@_moveOnly
-struct Butt {
+struct Butt : ~Copyable {
     var value: Int
     deinit { print("disposing \(value)") }
 

test/Interpreter/moveonly_escaping_capture.swift

@@ -10,8 +10,7 @@ class C {
     deinit { print("C died \(value)") }
 }
 
-@_moveOnly
-struct Butt {
+struct Butt : ~Copyable {
     static var myButt: () -> () = {}
 
     init(value: Int) { self._value = C(value: value) }

test/Interpreter/moveonly_escaping_capture_lifetimes.swift

@@ -2,8 +2,7 @@
 
 // REQUIRES: executable_test
 
-@_moveOnly
-struct MO {
+struct MO : ~Copyable {
     var x: Int
     deinit { print("dying \(x)") }
 }

test/Interpreter/moveonly_escaping_definite_initialization.swift

@@ -1,8 +1,7 @@
 // RUN: %target-run-simple-swift | %FileCheck %s
 // REQUIRES: executable_test
 
-@_moveOnly
-struct MO {
+struct MO : ~Copyable {
     var value: Int
 
     func use() {}

test/Interpreter/moveonly_field_in_class_reflection.swift

@@ -5,8 +5,7 @@
 // a move-only field does not trap from trying to reflect and copy those
 // move-only fields.
 
-@_moveOnly
-public struct MO {
+public struct MO : ~Copyable {
     var x: Int8 = 0
     var y: Int8 = 0
     var z: Int8 = 0

test/Interpreter/moveonly_forget.swift

@@ -9,8 +9,7 @@ func print_closing_MFD() { print("closing MaybeFileDescriptor") }
 
 enum E: Error { case err }
 
-@_moveOnly
-struct FileDescriptor {
+ struct FileDescriptor : ~Copyable {
   var fd: Int
   static var nextFD: Int = 0
 
@@ -57,7 +56,7 @@ struct FileDescriptor {
   }
 }
 
-@_moveOnly enum MaybeFileDescriptor {
+ enum MaybeFileDescriptor : ~Copyable {
   case some(FileDescriptor)
   case nothing
 

test/ModuleInterface/Inputs/moveonly_api.swift

@@ -8,8 +8,7 @@ public enum Descriptor {
   public func message() -> String { return "hello world" }
 }
 
-@_moveOnly
-public struct File {
+public  struct File : ~Copyable {
 
 #if SYNTHESIZE_ACCESSORS
   public var fd: Descriptor = .other(1337)

test/ModuleInterface/Inputs/moveonly_simple.swift

@@ -1,8 +1,7 @@
 
 public class Message { var s: String = "hello" }
 
-@_moveOnly
-public struct FileDescriptor {
+public struct FileDescriptor : ~Copyable {
   public var x: Int = 0
   public var msg: Message = Message()
 }

test/ModuleInterface/moveonly_interface_flag.swift

@@ -21,11 +21,11 @@
 // CHECK: #if compiler(>=5.3) && $MoveOnly
 // CHECK-NEXT:  extension Library.MoveOnlyStruct {
 
-@_moveOnly public struct MoveOnlyStruct {
+public struct MoveOnlyStruct : ~Copyable {
   let x = 0
 }
 
-@_moveOnly public enum MoveOnlyEnum {
+public enum MoveOnlyEnum : ~Copyable {
   case depth
 }
 

test/SILGen/forget.swift

@@ -3,7 +3,7 @@
 
 func invokedDeinit() {}
 
-@_moveOnly enum MaybeFile {
+ enum MaybeFile : ~Copyable {
   case some(File)
   case none
 
@@ -28,7 +28,7 @@ func invokedDeinit() {}
   // CHECK:    destroy_value [[FILE]] : $File
 }
 
-@_moveOnly struct File {
+ struct File : ~Copyable {
   let fd: Int
   static var nextFD: Int = 0
 
@@ -57,7 +57,7 @@ func invokedDeinit() {}
   }
 }
 
-@_moveOnly struct PointerTree {
+ struct PointerTree : ~Copyable {
   let left: Ptr
   let file: File
   let popularity: Int
@@ -144,7 +144,7 @@ final class Wallet {
   var numCards = 0
 }
 
-@_moveOnly enum Ticket {
+ enum Ticket : ~Copyable {
   case empty
   case within(Wallet)
 

test/SILGen/moveonly.swift

@@ -8,19 +8,16 @@ public final class CopyableKlass {
     var fd = FD()
 }
 
-@_moveOnly
-public struct FD {
+public  struct FD : ~Copyable {
     var copyableKlass = CopyableKlass()
 }
 
-@_moveOnly
-public struct NonTrivialStruct2 {
+public  struct NonTrivialStruct2 : ~Copyable {
     var fd = FD()
     var copyableKlass = CopyableKlass()
 }
 
-@_moveOnly
-public struct NonTrivialStruct {
+public  struct NonTrivialStruct : ~Copyable {
     var fd = FD()
     var nonTrivialStruct2 = NonTrivialStruct2()
     var copyableKlass = CopyableKlass()
@@ -37,8 +34,7 @@ public struct NonTrivialCopyableStruct {
     var nonTrivialCopyableStruct2 = NonTrivialCopyableStruct2()
 }
 
-@_moveOnly
-public enum NonTrivialEnum {
+public enum NonTrivialEnum : ~Copyable {
     case first
     case second(CopyableKlass)
     case third(NonTrivialStruct)
@@ -541,14 +537,12 @@ func assignCopyableKlass(_ x: CopyableKlass) {
 ///////////////////////
 
 enum EnumSwitchTests {
-    @_moveOnly
-    enum E2 {
+     enum E2 : ~Copyable {
         case lhs(CopyableKlass)
         case rhs(FD)
     }
 
-    @_moveOnly
-    enum E {
+     enum E : ~Copyable {
         case first(NonTrivialStruct2)
         case second(NonTrivialStruct)
         case third(CopyableKlass)

test/SILGen/moveonly_deinit_access.swift

@@ -4,8 +4,7 @@
 // This test makes sure that in various situations (ignoring errors), we
 // properly handle deinits with move only types.
 
-@_moveOnly
-public struct FD {
+public struct FD : ~Copyable {
     var i = 5
 }
 

test/SILGen/moveonly_deinit_module_no_body.swift

@@ -2,8 +2,7 @@
 
 // Just make sure we don't crash.
 
-@_moveOnly
-public struct S {
+public struct S : ~Copyable {
   private let desc: Int
 
   internal init(desc: Int) {

test/SILGen/moveonly_deinits.swift

@@ -20,14 +20,12 @@ func doSomething() {
     print("123")
 }
 
-@_moveOnly
-struct KlassPairWithoutDeinit {
+struct KlassPairWithoutDeinit : ~Copyable {
     var lhs = Klass()
     var rhs = Klass()
 }
 
-@_moveOnly
-struct KlassPairWithDeinit {
+struct KlassPairWithDeinit : ~Copyable {
     var lhs = Klass()
     var rhs = Klass()
 
@@ -36,14 +34,12 @@ struct KlassPairWithDeinit {
     }
 }
 
-@_moveOnly
-struct IntPairWithoutDeinit {
+struct IntPairWithoutDeinit : ~Copyable {
     var k: Int = 5
     var k2: Int = 6
 }
 
-@_moveOnly
-struct IntPairWithDeinit {
+struct IntPairWithDeinit : ~Copyable {
     var k: Int = 5
     var k2: Int = 6
 
@@ -286,14 +282,12 @@ public func testKlassPairWithDeinit() {
 // MARK: Enum Declarations //
 /////////////////////////////
 
-@_moveOnly
-enum KlassEnumPairWithoutDeinit {
+enum KlassEnumPairWithoutDeinit : ~Copyable {
     case lhs(Klass)
     case rhs(Klass)
 }
 
-@_moveOnly
-enum KlassEnumPairWithDeinit {
+enum KlassEnumPairWithDeinit : ~Copyable {
     case lhs(Klass)
     case rhs(Klass)
 
@@ -302,14 +296,12 @@ enum KlassEnumPairWithDeinit {
     }
 }
 
-@_moveOnly
-enum IntEnumPairWithoutDeinit {
+enum IntEnumPairWithoutDeinit : ~Copyable {
 case lhs(Int)
 case rhs(Int)
 }
 
-@_moveOnly
-enum IntEnumPairWithDeinit {
+enum IntEnumPairWithDeinit : ~Copyable {
     case lhs(Int)
     case rhs(Int)