Skip to content

Commit 02c0ebd

Browse files
gottesmmgottesmm
committed
Update test for changes in #65377
That PR was for rdar://108385761
1 parent 5eaf2c5 commit 02c0ebd

File tree

1 file changed

+19
-29
lines changed

1 file changed

+19
-29
lines changed

‎test/SILGen/moveonly_escaping_closure.swift

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,9 @@ func testInOutVarClosureCaptureVar(_ f: inout () -> ()) {
258258
}
259259

260260
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure38testConsumingNoEscapeClosureCaptureVaryyyyXEnF : $@convention(thin) (@owned @noescape @callee_guaranteed () -> ()) -> () {
261-
// CHECK: bb0([[ARG:%.*]] :
261+
// CHECK: bb0([[ARG:%.*]] : @_eagerMove @owned
262262
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @noescape @callee_guaranteed () -> () }
263-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
264-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
263+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
265264
// CHECK: store [[ARG]] to [init] [[FUNC_PROJECT]]
266265
//
267266
// CHECK: [[BOX:%.*]] = alloc_box ${ var SingleElt }
@@ -325,10 +324,9 @@ func testConsumingNoEscapeClosureCaptureVar(_ f: consuming () -> ()) {
325324
}
326325

327326
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure36testConsumingEscapeClosureCaptureVaryyyycnF : $@convention(thin) (@owned @callee_guaranteed () -> ()) -> () {
328-
// CHECK: bb0([[ARG:%.*]] : @owned
327+
// CHECK: bb0([[ARG:%.*]] : @_eagerMove @owned
329328
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @callee_guaranteed () -> () }
330-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
331-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
329+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
332330
// CHECK: store [[ARG]] to [init] [[FUNC_PROJECT]]
333331
//
334332
// CHECK: [[BOX:%.*]] = alloc_box ${ var SingleElt }
@@ -595,8 +593,7 @@ func testInOutVarClosureCaptureLet(_ f: inout () -> ()) {
595593
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure38testConsumingNoEscapeClosureCaptureLetyyyyXEnF : $@convention(thin) (@owned @noescape @callee_guaranteed () -> ()) -> () {
596594
// CHECK: bb0([[ARG:%.*]] :
597595
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @noescape @callee_guaranteed () -> () }
598-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
599-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
596+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
600597
// CHECK: store [[ARG]] to [init] [[FUNC_PROJECT]]
601598
//
602599
// CHECK: [[BOX:%.*]] = alloc_box ${ let SingleElt }
@@ -628,10 +625,9 @@ func testConsumingNoEscapeClosureCaptureLet(_ f: consuming () -> ()) {
628625
}
629626

630627
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure36testConsumingEscapeClosureCaptureLetyyyycnF : $@convention(thin) (@owned @callee_guaranteed () -> ()) -> () {
631-
// CHECK: bb0([[ARG:%.*]] : @owned
628+
// CHECK: bb0([[ARG:%.*]] : @_eagerMove @owned
632629
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @callee_guaranteed () -> () }
633-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
634-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
630+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
635631
// CHECK: store [[ARG]] to [init] [[FUNC_PROJECT]]
636632
//
637633
// CHECK: [[BOX:%.*]] = alloc_box ${ let SingleElt }
@@ -885,10 +881,9 @@ func testInOutVarClosureCaptureInOut(_ f: inout () -> (), _ x: inout SingleElt)
885881
}
886882

887883
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure40testConsumingNoEscapeClosureCaptureInOutyyyyXEn_AA9SingleEltVztF : $@convention(thin) (@owned @noescape @callee_guaranteed () -> (), @inout SingleElt) -> () {
888-
// CHECK: bb0([[OWNED_F:%.*]] : @owned $@noescape @callee_guaranteed () -> (), [[PROJECT:%.*]] : $*SingleElt):
884+
// CHECK: bb0([[OWNED_F:%.*]] : @_eagerMove @owned $@noescape @callee_guaranteed () -> (), [[PROJECT:%.*]] : $*SingleElt):
889885
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @noescape @callee_guaranteed () -> () }
890-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
891-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
886+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
892887
// CHECK: store [[OWNED_F]] to [init] [[FUNC_PROJECT]]
893888
//
894889
// CHECK: [[MARKED_PROJECT:%.*]] = mark_must_check [consumable_and_assignable] [[PROJECT]]
@@ -944,10 +939,9 @@ func testConsumingNoEscapeClosureCaptureInOut(_ f: consuming () -> (), _ x: inou
944939
}
945940

946941
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure38testConsumingEscapeClosureCaptureInOutyyyycn_AA9SingleEltVztF : $@convention(thin) (@owned @callee_guaranteed () -> (), @inout SingleElt) -> () {
947-
// CHECK: bb0([[FUNC_ARG:%.*]] : @owned $@callee_guaranteed () -> (), [[PROJECT:%.*]] : $*SingleElt):
942+
// CHECK: bb0([[FUNC_ARG:%.*]] : @_eagerMove @owned $@callee_guaranteed () -> (), [[PROJECT:%.*]] : $*SingleElt):
948943
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @callee_guaranteed () -> () }
949-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
950-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
944+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
951945
// CHECK: store [[FUNC_ARG]] to [init] [[FUNC_PROJECT]]
952946
//
953947
// CHECK: [[CHECK:%.*]] = mark_must_check [consumable_and_assignable] [[PROJECT]]
@@ -1177,10 +1171,9 @@ func testLocalVarClosureCaptureConsuming(_ x: consuming SingleElt) {
11771171
}
11781172

11791173
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure035testConsumingNoEscapeClosureCaptureD0yyyyXEn_AA9SingleEltVntF : $@convention(thin) (@owned @noescape @callee_guaranteed () -> (), @owned SingleElt) -> () {
1180-
// CHECK: bb0([[F:%.*]] : @owned $@noescape @callee_guaranteed () -> (),
1174+
// CHECK: bb0([[F:%.*]] : @_eagerMove @owned $@noescape @callee_guaranteed () -> (),
11811175
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @noescape @callee_guaranteed () -> () }
1182-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
1183-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
1176+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
11841177
// CHECK: store [[F]] to [init] [[FUNC_PROJECT]]
11851178
//
11861179
// CHECK: [[BOX:%.*]] = alloc_box ${ var SingleElt }
@@ -1243,10 +1236,9 @@ func testConsumingNoEscapeClosureCaptureConsuming(_ f: consuming () -> (),
12431236
}
12441237

12451238
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure033testConsumingEscapeClosureCaptureD0yyyycn_AA9SingleEltVntF : $@convention(thin) (@owned @callee_guaranteed () -> (), @owned SingleElt) -> () {
1246-
// CHECK: bb0([[ARG:%.*]] : @owned $@callee_guaranteed () -> (),
1239+
// CHECK: bb0([[ARG:%.*]] : @_eagerMove @owned $@callee_guaranteed () -> (),
12471240
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @callee_guaranteed () -> () }
1248-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
1249-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
1241+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
12501242
// CHECK: store [[ARG]] to [init] [[FUNC_PROJECT]]
12511243
//
12521244
// CHECK: [[BOX:%.*]] = alloc_box ${ var SingleElt }
@@ -1494,10 +1486,9 @@ func testInOutVarClosureCaptureOwned(_ f: inout () -> (), _ x: __owned SingleElt
14941486
}
14951487

14961488
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure40testConsumingNoEscapeClosureCaptureOwnedyyyyXEn_AA9SingleEltVntF : $@convention(thin) (@owned @noescape @callee_guaranteed () -> (), @owned SingleElt) -> () {
1497-
// CHECK: bb0([[ARG:%.*]] : @owned $@noescape @callee_guaranteed () -> (),
1489+
// CHECK: bb0([[ARG:%.*]] : @_eagerMove @owned $@noescape @callee_guaranteed () -> (),
14981490
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @noescape @callee_guaranteed () -> () }
1499-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
1500-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
1491+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
15011492
// CHECK: store [[ARG]] to [init] [[FUNC_PROJECT]]
15021493
//
15031494
// CHECK: [[BOX:%.*]] = alloc_box ${ let SingleElt }
@@ -1530,10 +1521,9 @@ func testConsumingNoEscapeClosureCaptureOwned(_ f: consuming () -> (),
15301521
}
15311522

15321523
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure38testConsumingEscapeClosureCaptureOwnedyyyycn_AA9SingleEltVntF : $@convention(thin) (@owned @callee_guaranteed () -> (), @owned SingleElt) -> () {
1533-
// CHECK: bb0([[ARG:%.*]] : @owned $@callee_guaranteed () -> (),
1524+
// CHECK: bb0([[ARG:%.*]] : @_eagerMove @owned $@callee_guaranteed () -> (),
15341525
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @callee_guaranteed () -> () }
1535-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
1536-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
1526+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
15371527
// CHECK: store [[ARG]] to [init] [[FUNC_PROJECT]]
15381528
//
15391529
// CHECK: [[BOX:%.*]] = alloc_box ${ let SingleElt }

0 commit comments

Comments
 (0)