Skip to content

Commit 561fb6b

Browse files
author
Davide Italiano
committed
[CapturePromotion] Catch up with mangler changes.
Also simplify check lines and rename the test to be more descriptive. Thanks to Adrian and Michael for pointing out.
1 parent 14d3779 commit 561fb6b

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

test/SILOptimizer/sr6709.swift renamed to test/SILOptimizer/capturepromotion-wrong-lexicalscope.swift

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22
// RUN: %target-swift-frontend -primary-file %s -Onone -emit-sil -Xllvm -sil-print-after=capture-promotion -Xllvm \
33
// RUN: -sil-print-debuginfo -o /dev/null 2>&1 | %FileCheck %s
44

5-
// CHECK: sil hidden @_T04null19captureStackPromoteSiycyF : $@convention(thin) () -> @owned @callee_guaranteed () -> Int {
5+
// CHECK: sil hidden @$S4null19captureStackPromoteSiycyF : $@convention(thin) () -> @owned @callee_guaranteed () -> Int {
66
// CHECK: bb0:
7-
// CHECK: %0 = alloc_box ${ var Int }, var, name "x", loc {{.*}}:32:7, scope 3 // users: %19, %7, %1
8-
// CHECK: %1 = project_box %0 : ${ var Int }, 0, loc {{.*}}:32:7, scope 3 // users: %9, %6
9-
// CHECK: %2 = metatype $@thin Int.Type, loc {{.*}}:32:11, scope 3 // user: %5
10-
// CHECK: %3 = integer_literal $Builtin.Int2048, 1, loc {{.*}}:32:11, scope 3 // user: %5
11-
// CHECK: // function_ref Int.init(_builtinIntegerLiteral:)
12-
// CHECK: %4 = function_ref @_T0Si22_builtinIntegerLiteralSiBi2048__tcfC : $@convention(method) (Builtin.Int2048, @thin Int.Type) -> Int, loc {{.*}}:32:11, scope 3 // user: %5
13-
// CHECK: %5 = apply %4(%3, %2) : $@convention(method) (Builtin.Int2048, @thin Int.Type) -> Int, loc {{.*}}:32:11, scope 3 // user: %6
14-
// CHECK: store %5 to [trivial] %1 : $*Int, loc {{.*}}:32:11, scope 3 // id: %6
15-
// CHECK: %7 = copy_value %0 : ${ var Int }, loc {{.*}}:33:11, scope 3 // users: %12, %8
16-
// CHECK: %8 = project_box %7 : ${ var Int }, 0, loc {{.*}}:33:11, scope 3 // user: %11
17-
// CHECK: mark_function_escape %1 : $*Int, loc {{.*}}:33:11, scope 3 // id: %9
18-
// CHECK: %10 = function_ref @_T04null19captureStackPromoteSiycyFSiycfU_Tf2i_n : $@convention(thin) (Int) -> Int, loc {{.*}}:33:11, scope 3 // user: %13
19-
// CHECK: %11 = load [trivial] %8 : $*Int, loc {{.*}}:33:11, scope 3 // user: %13
20-
// CHECK: destroy_value %7 : ${ var Int }, loc {{.*}}:33:11, scope 3 // id: %12
21-
// CHECK: %13 = partial_apply [callee_guaranteed] %10(%11) : $@convention(thin) (Int) -> Int, loc {{.*}}:33:11, scope 3 // users: %14, %15, %17, %18
22-
// CHECK: debug_value %13 : $@callee_guaranteed () -> Int, let, name "f", loc {{.*}}:33:7, scope 3 // id: %14
23-
// CHECK: %15 = begin_borrow %13 : $@callee_guaranteed () -> Int, loc {{.*}}:34:10, scope 3 // users: %17, %16
24-
// CHECK: %16 = copy_value %15 : $@callee_guaranteed () -> Int, loc {{.*}}:34:10, scope 3 // user: %20
25-
// CHECK: end_borrow %15 from %13 : $@callee_guaranteed () -> Int, $@callee_guaranteed () -> Int, loc {{.*}}:34:10, scope 3 // id: %17
26-
// CHECK: destroy_value %13 : $@callee_guaranteed () -> Int, loc {{.*}}:35:1, scope 3 // id: %18
27-
// CHECK: destroy_value %0 : ${ var Int }, loc {{.*}}:35:1, scope 3 // id: %19
28-
// CHECK: return %16 : $@callee_guaranteed () -> Int, loc {{.*}}:34:3, scope 3 // id: %20
7+
// CHECK: %0 = alloc_box ${ var Int }, var, name "x", loc {{.*}}:32:7, scope 3
8+
// CHECK: %1 = project_box %0 : ${ var Int }, 0, loc {{.*}}:32:7, scope 3
9+
// CHECK: %2 = metatype $@thin Int.Type, loc {{.*}}:32:11, scope 3
10+
// CHECK: %3 = integer_literal $Builtin.Int2048, 1, loc {{.*}}:32:11, scope 3
11+
// CHECK: %4 = function_ref @$SSi22_builtinIntegerLiteralSiBi2048__tcfC : $@convention(method) (Builtin.Int2048, @thin Int.Type) -> Int, loc {{.*}}:32:11, scope 3
12+
// CHECK: %5 = apply %4(%3, %2) : $@convention(method) (Builtin.Int2048, @thin Int.Type) -> Int, loc {{.*}}:32:11, scope 3
13+
// CHECK: store %5 to [trivial] %1 : $*Int, loc {{.*}}:32:11, scope 3
14+
// CHECK: %7 = copy_value %0 : ${ var Int }, loc {{.*}}:33:11, scope 3
15+
// CHECK: %8 = project_box %7 : ${ var Int }, 0, loc {{.*}}:33:11, scope 3
16+
// CHECK: mark_function_escape %1 : $*Int, loc {{.*}}:33:11, scope 3
17+
// CHECK: %10 = function_ref @$S4null19captureStackPromoteSiycyFSiycfU_Tf2i_n : $@convention(thin) (Int) -> Int, loc {{.*}}:33:11, scope 3
18+
// CHECK: %11 = load [trivial] %8 : $*Int, loc {{.*}}:33:11, scope 3
19+
// CHECK: destroy_value %7 : ${ var Int }, loc {{.*}}:33:11, scope 3
20+
// CHECK: %13 = partial_apply [callee_guaranteed] %10(%11) : $@convention(thin) (Int) -> Int, loc {{.*}}:33:11, scope 3
21+
// CHECK: debug_value %13 : $@callee_guaranteed () -> Int, let, name "f", loc {{.*}}:33:7, scope 3
22+
// CHECK: %15 = begin_borrow %13 : $@callee_guaranteed () -> Int, loc {{.*}}:34:10, scope 3
23+
// CHECK: %16 = copy_value %15 : $@callee_guaranteed () -> Int, loc {{.*}}:34:10, scope 3
24+
// CHECK: end_borrow %15 from %13 : $@callee_guaranteed () -> Int, $@callee_guaranteed () -> Int, loc {{.*}}:34:10, scope 3
25+
// CHECK: destroy_value %13 : $@callee_guaranteed () -> Int, loc {{.*}}:35:1, scope 3
26+
// CHECK: destroy_value %0 : ${ var Int }, loc {{.*}}:35:1, scope 3
27+
// CHECK: return %16 : $@callee_guaranteed () -> Int, loc {{.*}}:34:3, scope 3
2928
// CHECK: }
3029

30+
3131
func captureStackPromote() -> () -> Int {
3232
var x = 1
3333
let f = { x }

0 commit comments

Comments
 (0)