Skip to content

Commit 7b9da75

Browse files
atrickatrick
committed
Update tests to use ~Escapable syntax.
1 parent 6b776f5 commit 7b9da75

13 files changed

+34
-36
lines changed

‎test/SILOptimizer/lifetime_dependence_borrow.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// RUN: -verify \
44
// RUN: -sil-verify-all \
55
// RUN: -module-name test \
6+
// RUN: -enable-experimental-feature NoncopyableGenerics \
67
// RUN: -enable-experimental-feature NonescapableTypes
78

89
// REQUIRES: asserts
@@ -15,8 +16,7 @@ struct CN: ~Copyable {
1516
}
1617

1718
// Some Bufferview-ish thing.
18-
@_nonescapable
19-
struct BV {
19+
struct BV : ~Escapable {
2020
let p: UnsafeRawPointer
2121
let i: Int
2222

@@ -35,8 +35,7 @@ struct BV {
3535
}
3636

3737
// Some MutableBufferview-ish thing.
38-
@_nonescapable
39-
struct MBV : ~Copyable {
38+
struct MBV : ~Escapable, ~Copyable {
4039
let p: UnsafeRawPointer
4140
let i: Int
4241

@@ -53,8 +52,7 @@ struct MBV : ~Copyable {
5352
}
5453

5554
// Nonescapable wrapper.
56-
@_nonescapable
57-
struct NEBV {
55+
struct NEBV : ~Escapable {
5856
var bv: BV
5957

6058
init(_ bv: consuming BV) {

‎test/SILOptimizer/lifetime_dependence_borrow_fail.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
// RUN: -verify \
44
// RUN: -sil-verify-all \
55
// RUN: -module-name test \
6+
// RUN: -enable-experimental-feature NoncopyableGenerics \
67
// RUN: -enable-experimental-feature NonescapableTypes
78

89
// REQUIRES: asserts
910
// REQUIRES: swift_in_compiler
1011

11-
@_nonescapable
12-
struct BV {
12+
struct BV : ~Escapable {
1313
let p: UnsafeRawPointer
1414
let i: Int
1515

@@ -34,8 +34,7 @@ struct NC : ~Copyable {
3434
}
3535
}
3636

37-
@_nonescapable
38-
struct NE {
37+
struct NE : ~Escapable {
3938
let p: UnsafeRawPointer
4039
let i: Int
4140

‎test/SILOptimizer/lifetime_dependence_closure.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// RUN: -sil-verify-all \
55
// RUN: -module-name test \
66
// RUN: -disable-experimental-parser-round-trip \
7+
// RUN: -enable-experimental-feature NoncopyableGenerics \
78
// RUN: -enable-experimental-feature NonescapableTypes
89

910
// REQUIRES: asserts
@@ -15,8 +16,7 @@ struct NCInt: ~Copyable {
1516
init(_ value: Int) { self.value = value }
1617
}
1718

18-
@_nonescapable
19-
struct NEInt /*: ~Escapable*/ {
19+
struct NEInt : ~Escapable {
2020
let value: Int
2121

2222
init(borrowed: borrowing NCInt) -> dependsOn(borrowed) Self {

‎test/SILOptimizer/lifetime_dependence_diagnostics.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// RUN: %target-swift-frontend %s -emit-sil \
22
// RUN: -sil-verify-all \
33
// RUN: -module-name test \
4+
// RUN: -enable-experimental-feature NoncopyableGenerics \
45
// RUN: -enable-experimental-feature NonescapableTypes \
56
// RUN: 2>&1 | %FileCheck %s
67

78
// REQUIRES: asserts
89
// REQUIRES: swift_in_compiler
910

10-
@_nonescapable
11-
struct BV {
11+
struct BV : ~Escapable {
1212
let p: UnsafeRawPointer
1313
let c: Int
1414
@_unsafeNonescapableResult

‎test/SILOptimizer/lifetime_dependence_inherit.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
// RUN: -verify \
44
// RUN: -sil-verify-all \
55
// RUN: -module-name test \
6+
// RUN: -enable-experimental-feature NoncopyableGenerics \
67
// RUN: -enable-experimental-feature NonescapableTypes
78

89
// REQUIRES: asserts
910
// REQUIRES: swift_in_compiler
1011

11-
@_nonescapable
12-
struct BV {
12+
struct BV : ~Escapable {
1313
let p: UnsafeRawPointer
1414
let i: Int
1515

@@ -26,8 +26,7 @@ struct BV {
2626
}
2727
}
2828

29-
@_nonescapable
30-
struct NE {
29+
struct NE : ~Escapable {
3130
var bv: BV
3231

3332
// Test lifetime inheritance through initialization.

‎test/SILOptimizer/lifetime_dependence_inherit_fail.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
// RUN: -verify \
44
// RUN: -sil-verify-all \
55
// RUN: -module-name test \
6+
// RUN: -enable-experimental-feature NoncopyableGenerics \
67
// RUN: -enable-experimental-feature NonescapableTypes
78

89
// REQUIRES: asserts
910
// REQUIRES: swift_in_compiler
1011

11-
@_nonescapable
12-
struct BV {
12+
struct BV : ~Escapable {
1313
let p: UnsafeRawPointer
1414
let i: Int
1515

@@ -26,8 +26,7 @@ struct BV {
2626
}
2727
}
2828

29-
@_nonescapable
30-
struct NE {
29+
struct NE : ~Escapable {
3130
var bv: BV
3231

3332
init(_ bv: consuming BV) -> dependsOn(bv) Self {

‎test/SILOptimizer/lifetime_dependence_insertion.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// RUN: -Xllvm -sil-print-after=lifetime-dependence-insertion \
33
// RUN: -sil-verify-all \
44
// RUN: -module-name test \
5+
// RUN: -enable-experimental-feature NoncopyableGenerics \
56
// RUN: -enable-experimental-feature NonescapableTypes \
67
// RUN: -o /dev/null 2>&1 | %FileCheck %s
78

89
// REQUIRES: asserts
910
// REQUIRES: swift_in_compiler
1011

11-
@_nonescapable
12-
struct BV {
12+
struct BV : ~Escapable {
1313
let p: UnsafeRawPointer
1414
let i: Int
1515

‎test/SILOptimizer/lifetime_dependence_mutate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
// RUN: -verify \
44
// RUN: -sil-verify-all \
55
// RUN: -module-name test \
6+
// RUN: -enable-experimental-feature NoncopyableGenerics \
67
// RUN: -enable-experimental-feature NonescapableTypes
78

89
// REQUIRES: asserts
910
// REQUIRES: swift_in_compiler
1011

11-
@_nonescapable
12-
struct MBV : ~Copyable {
12+
struct MBV : ~Escapable, ~Copyable {
1313
let p: UnsafeMutableRawPointer
1414
let c: Int
1515

‎test/SILOptimizer/lifetime_dependence_param.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
// RUN: -verify \
44
// RUN: -sil-verify-all \
55
// RUN: -module-name test \
6+
// RUN: -enable-experimental-feature NoncopyableGenerics \
67
// RUN: -enable-experimental-feature NonescapableTypes
78

89
// REQUIRES: asserts
910
// REQUIRES: swift_in_compiler
1011

11-
@_nonescapable
12-
struct BV {
12+
struct BV : ~Escapable {
1313
let p: UnsafeRawPointer
1414
let i: Int
1515

‎test/SILOptimizer/lifetime_dependence_param_fail.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
// RUN: -verify \
44
// RUN: -sil-verify-all \
55
// RUN: -module-name test \
6+
// RUN: -enable-experimental-feature NoncopyableGenerics \
67
// RUN: -enable-experimental-feature NonescapableTypes
78

89
// REQUIRES: asserts
910
// REQUIRES: swift_in_compiler
1011

11-
@_nonescapable
12-
struct BV {
12+
struct BV : ~Escapable {
1313
let p: UnsafeRawPointer
1414
let c: Int
1515

‎test/SILOptimizer/lifetime_dependence_scope.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// RUN: %target-swift-frontend %s -emit-sil \
22
// RUN: -sil-verify-all \
33
// RUN: -module-name test \
4+
// RUN: -enable-experimental-feature NoncopyableGenerics \
45
// RUN: -enable-experimental-feature NonescapableTypes \
56
// RUN: 2>&1 | %FileCheck %s
67

@@ -9,8 +10,7 @@
910

1011
// Test LifetimeDependenceScopeFixup.
1112

12-
@_nonescapable
13-
struct BV {
13+
struct BV : ~Escapable {
1414
let p: UnsafeRawPointer
1515
let c: Int
1616

‎test/SILOptimizer/lifetime_dependence_todo.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// RUN: -o /dev/null \
33
// RUN: -verify \
44
// RUN: -sil-verify-all \
5+
// RUN: -enable-experimental-feature NoncopyableGenerics \
56
// RUN: -enable-experimental-feature NonescapableTypes
67

78
// REQUIRES: asserts

‎test/SILOptimizer/lifetime_dependence_util.sil

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// RUN: %target-sil-opt -test-runner %s \
2+
// RUN: -module-name Swift \
3+
// RUN: -enable-experimental-feature NoncopyableGenerics \
24
// RUN: -enable-experimental-feature NonescapableTypes \
35
// RUN: -o /dev/null 2>&1 | %FileCheck %s
46

@@ -9,6 +11,8 @@ sil_stage canonical
911

1012
import Builtin
1113

14+
@_marker public protocol Escapable {}
15+
1216
enum FakeOptional<T> {
1317
case none
1418
case some(T)
@@ -36,15 +40,13 @@ sil_vtable D {
3640
#D.field!read: @d_field_read
3741
}
3842

39-
@_nonescapable
40-
struct NE {
43+
struct NE : ~Escapable {
4144
var d: D
4245
@_unsafeNonescapableResult
4346
init() { }
4447
}
4548

46-
@_nonescapable
47-
struct NEWrap {
49+
struct NEWrap : ~Escapable {
4850
var ne: NE
4951
@_unsafeNonescapableResult
5052
init() { }

0 commit comments

Comments
 (0)