Skip to content

Commit fc3194e

Browse files
committed
update tests to use ~Copyable
1 parent 4b2f492 commit fc3194e

File tree

2 files changed

+14
-24
lines changed

2 files changed

+14
-24
lines changed

test/SILOptimizer/moveonly_addresschecker_diagnostics.sil

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,35 @@ import Builtin
1818

1919
public class CopyableKlass {}
2020

21-
@_moveOnly
22-
public final class Klass {
21+
public final class Klass: ~Copyable {
2322
var intField: Int
2423
var k: Klass
2524
init()
2625
}
2726

2827
sil @get_klass : $@convention(thin) () -> @owned Klass
2928

30-
@_moveOnly
31-
public struct NonTrivialStruct {
29+
public struct NonTrivialStruct: ~Copyable {
3230
var k = Klass()
3331
var copyableK = CopyableKlass()
3432
var nonTrivialStruct2 = NonTrivialStruct2()
3533
}
3634

37-
@_moveOnly
38-
public struct NonTrivialStructPair {
35+
public struct NonTrivialStructPair: ~Copyable {
3936
var lhs: NonTrivialStruct
4037
var rhs: NonTrivialStruct
4138
}
4239

43-
@_moveOnly
44-
public struct NonTrivialStruct2 {
40+
public struct NonTrivialStruct2: ~Copyable {
4541
var copyableKlass = CopyableKlass()
4642
}
4743

48-
@_moveOnly
49-
public struct KlassPair {
44+
public struct KlassPair: ~Copyable {
5045
var lhs: Klass = Klass()
5146
var rhs: Klass = Klass()
5247
}
5348

54-
@_moveOnly
55-
public struct AggStruct {
49+
public struct AggStruct: ~Copyable {
5650
var lhs: Klass
5751
var center: Int
5852
var rhs: Klass

test/SILOptimizer/moveonly_borrow_to_destructure_transform_diagnostics.sil

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,39 @@
44
sil_stage raw
55

66
import Builtin
7+
import Swift
78

89
//////////////////
910
// Declarations //
1011
//////////////////
1112

1213
class Klass {}
13-
@_moveOnly
14-
class MoveOnlyKlass {
14+
15+
class MoveOnlyKlass: ~Copyable {
1516
var value: Builtin.Int32
1617
}
1718

18-
@_moveOnly
19-
struct KlassPair {
19+
struct KlassPair: ~Copyable {
2020
var lhs: Klass
2121
var rhs: MoveOnlyKlass
2222
}
2323

24-
@_moveOnly
25-
struct AggStruct {
24+
struct AggStruct: ~Copyable {
2625
var pair: KlassPair
2726
}
2827

29-
@_moveOnly
30-
struct KlassPair2 {
28+
struct KlassPair2: ~Copyable {
3129
var lhs: MoveOnlyKlass
3230
var rhs: MoveOnlyKlass
3331
}
3432

35-
@_moveOnly
36-
struct AggStruct2 {
33+
struct AggStruct2: ~Copyable {
3734
var lhs: MoveOnlyKlass
3835
var pair: KlassPair2
3936
var rhs: MoveOnlyKlass
4037
}
4138

42-
@_moveOnly
43-
struct SingleIntContainingStruct {
39+
struct SingleIntContainingStruct: ~Copyable {
4440
var value: Builtin.Int32
4541
}
4642

0 commit comments

Comments
 (0)