Skip to content

Commit 9c8d224

Browse files
gottesmmgottesmm
committed
Update test for changes in #65377
That PR was for rdar://108385761
1 parent 739417f commit 9c8d224

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 }
@@ -584,8 +582,7 @@ func testInOutVarClosureCaptureLet(_ f: inout () -> ()) {
584582
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure38testConsumingNoEscapeClosureCaptureLetyyyyXEnF : $@convention(thin) (@owned @noescape @callee_guaranteed () -> ()) -> () {
585583
// CHECK: bb0([[ARG:%.*]] :
586584
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @noescape @callee_guaranteed () -> () }
587-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
588-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
585+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
589586
// CHECK: store [[ARG]] to [init] [[FUNC_PROJECT]]
590587
//
591588
// CHECK: [[BOX:%.*]] = alloc_box ${ let SingleElt }
@@ -617,10 +614,9 @@ func testConsumingNoEscapeClosureCaptureLet(_ f: consuming () -> ()) {
617614
}
618615

619616
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure36testConsumingEscapeClosureCaptureLetyyyycnF : $@convention(thin) (@owned @callee_guaranteed () -> ()) -> () {
620-
// CHECK: bb0([[ARG:%.*]] : @owned
617+
// CHECK: bb0([[ARG:%.*]] : @_eagerMove @owned
621618
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @callee_guaranteed () -> () }
622-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
623-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
619+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
624620
// CHECK: store [[ARG]] to [init] [[FUNC_PROJECT]]
625621
//
626622
// CHECK: [[BOX:%.*]] = alloc_box ${ let SingleElt }
@@ -874,10 +870,9 @@ func testInOutVarClosureCaptureInOut(_ f: inout () -> (), _ x: inout SingleElt)
874870
}
875871

876872
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure40testConsumingNoEscapeClosureCaptureInOutyyyyXEn_AA9SingleEltVztF : $@convention(thin) (@owned @noescape @callee_guaranteed () -> (), @inout SingleElt) -> () {
877-
// CHECK: bb0([[OWNED_F:%.*]] : @owned $@noescape @callee_guaranteed () -> (), [[PROJECT:%.*]] : $*SingleElt):
873+
// CHECK: bb0([[OWNED_F:%.*]] : @_eagerMove @owned $@noescape @callee_guaranteed () -> (), [[PROJECT:%.*]] : $*SingleElt):
878874
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @noescape @callee_guaranteed () -> () }
879-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
880-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
875+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
881876
// CHECK: store [[OWNED_F]] to [init] [[FUNC_PROJECT]]
882877
//
883878
// CHECK: [[MARKED_PROJECT:%.*]] = mark_must_check [consumable_and_assignable] [[PROJECT]]
@@ -933,10 +928,9 @@ func testConsumingNoEscapeClosureCaptureInOut(_ f: consuming () -> (), _ x: inou
933928
}
934929

935930
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure38testConsumingEscapeClosureCaptureInOutyyyycn_AA9SingleEltVztF : $@convention(thin) (@owned @callee_guaranteed () -> (), @inout SingleElt) -> () {
936-
// CHECK: bb0([[FUNC_ARG:%.*]] : @owned $@callee_guaranteed () -> (), [[PROJECT:%.*]] : $*SingleElt):
931+
// CHECK: bb0([[FUNC_ARG:%.*]] : @_eagerMove @owned $@callee_guaranteed () -> (), [[PROJECT:%.*]] : $*SingleElt):
937932
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @callee_guaranteed () -> () }
938-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
939-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
933+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
940934
// CHECK: store [[FUNC_ARG]] to [init] [[FUNC_PROJECT]]
941935
//
942936
// CHECK: [[CHECK:%.*]] = mark_must_check [consumable_and_assignable] [[PROJECT]]
@@ -1166,10 +1160,9 @@ func testLocalVarClosureCaptureConsuming(_ x: consuming SingleElt) {
11661160
}
11671161

11681162
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure035testConsumingNoEscapeClosureCaptureD0yyyyXEn_AA9SingleEltVntF : $@convention(thin) (@owned @noescape @callee_guaranteed () -> (), @owned SingleElt) -> () {
1169-
// CHECK: bb0([[F:%.*]] : @owned $@noescape @callee_guaranteed () -> (),
1163+
// CHECK: bb0([[F:%.*]] : @_eagerMove @owned $@noescape @callee_guaranteed () -> (),
11701164
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @noescape @callee_guaranteed () -> () }
1171-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
1172-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
1165+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
11731166
// CHECK: store [[F]] to [init] [[FUNC_PROJECT]]
11741167
//
11751168
// CHECK: [[BOX:%.*]] = alloc_box ${ var SingleElt }
@@ -1232,10 +1225,9 @@ func testConsumingNoEscapeClosureCaptureConsuming(_ f: consuming () -> (),
12321225
}
12331226

12341227
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure033testConsumingEscapeClosureCaptureD0yyyycn_AA9SingleEltVntF : $@convention(thin) (@owned @callee_guaranteed () -> (), @owned SingleElt) -> () {
1235-
// CHECK: bb0([[ARG:%.*]] : @owned $@callee_guaranteed () -> (),
1228+
// CHECK: bb0([[ARG:%.*]] : @_eagerMove @owned $@callee_guaranteed () -> (),
12361229
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @callee_guaranteed () -> () }
1237-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
1238-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
1230+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
12391231
// CHECK: store [[ARG]] to [init] [[FUNC_PROJECT]]
12401232
//
12411233
// CHECK: [[BOX:%.*]] = alloc_box ${ var SingleElt }
@@ -1483,10 +1475,9 @@ func testInOutVarClosureCaptureOwned(_ f: inout () -> (), _ x: __owned SingleElt
14831475
}
14841476

14851477
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure40testConsumingNoEscapeClosureCaptureOwnedyyyyXEn_AA9SingleEltVntF : $@convention(thin) (@owned @noescape @callee_guaranteed () -> (), @owned SingleElt) -> () {
1486-
// CHECK: bb0([[ARG:%.*]] : @owned $@noescape @callee_guaranteed () -> (),
1478+
// CHECK: bb0([[ARG:%.*]] : @_eagerMove @owned $@noescape @callee_guaranteed () -> (),
14871479
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @noescape @callee_guaranteed () -> () }
1488-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
1489-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
1480+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
14901481
// CHECK: store [[ARG]] to [init] [[FUNC_PROJECT]]
14911482
//
14921483
// CHECK: [[BOX:%.*]] = alloc_box ${ let SingleElt }
@@ -1519,10 +1510,9 @@ func testConsumingNoEscapeClosureCaptureOwned(_ f: consuming () -> (),
15191510
}
15201511

15211512
// CHECK-LABEL: sil hidden [ossa] @$s16moveonly_closure38testConsumingEscapeClosureCaptureOwnedyyyycn_AA9SingleEltVntF : $@convention(thin) (@owned @callee_guaranteed () -> (), @owned SingleElt) -> () {
1522-
// CHECK: bb0([[ARG:%.*]] : @owned $@callee_guaranteed () -> (),
1513+
// CHECK: bb0([[ARG:%.*]] : @_eagerMove @owned $@callee_guaranteed () -> (),
15231514
// CHECK: [[FUNC_BOX:%.*]] = alloc_box ${ var @callee_guaranteed () -> () }
1524-
// CHECK: [[BORROW_FUNC_BOX:%.*]] = begin_borrow [lexical] [[FUNC_BOX]]
1525-
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[BORROW_FUNC_BOX]]
1515+
// CHECK: [[FUNC_PROJECT:%.*]] = project_box [[FUNC_BOX]]
15261516
// CHECK: store [[ARG]] to [init] [[FUNC_PROJECT]]
15271517
//
15281518
// CHECK: [[BOX:%.*]] = alloc_box ${ let SingleElt }

0 commit comments

Comments
 (0)