Skip to content

Commit 3dae89e

Browse files
authored
Merge pull request #63932 from eeckstein/fix-test
tests: fix two tests for 32-bit architectures
2 parents 4e3d608 + 814cd34 commit 3dae89e

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

test/SILOptimizer/addr_escape_info.sil

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -608,28 +608,28 @@ bb0:
608608
}
609609

610610
sil @call_closure : $@convention(method) (@noescape @callee_guaranteed () -> ()) -> ()
611-
sil @closure : $@convention(thin) (@inout_aliasable Int) -> ()
611+
sil @closure : $@convention(thin) (@inout_aliasable Int64) -> ()
612612

613613
// CHECK-LABEL: Address escape information for test_closure_capturing_address:
614-
// CHECK: value: %0 = alloc_stack $Int
614+
// CHECK: value: %0 = alloc_stack $Int64
615615
// CHECK-NEXT: ==> %7 = apply %6(%4) : $@convention(method) (@noescape @callee_guaranteed () -> ()) -> ()
616616
// CHECK: End function test_closure_capturing_address
617-
sil @test_closure_capturing_address : $@convention(thin) () -> Int {
617+
sil @test_closure_capturing_address : $@convention(thin) () -> Int64 {
618618
bb0:
619-
%0 = alloc_stack $Int
619+
%0 = alloc_stack $Int64
620620
%1 = integer_literal $Builtin.Int64, 0
621-
%2 = struct $Int (%1 : $Builtin.Int64)
621+
%2 = struct $Int64 (%1 : $Builtin.Int64)
622622

623-
%3 = function_ref @closure : $@convention(thin) (@inout_aliasable Int) -> ()
624-
%4 = partial_apply [callee_guaranteed] [on_stack] %3(%0) : $@convention(thin) (@inout_aliasable Int) -> ()
625-
store %2 to %0 : $*Int
623+
%3 = function_ref @closure : $@convention(thin) (@inout_aliasable Int64) -> ()
624+
%4 = partial_apply [callee_guaranteed] [on_stack] %3(%0) : $@convention(thin) (@inout_aliasable Int64) -> ()
625+
store %2 to %0 : $*Int64
626626

627627
%6 = function_ref @call_closure : $@convention(method) (@noescape @callee_guaranteed () -> ()) -> ()
628628
%7 = apply %6(%4) : $@convention(method) (@noescape @callee_guaranteed () -> ()) -> ()
629629
dealloc_stack %4 : $@noescape @callee_guaranteed () -> ()
630-
fix_lifetime %0 : $*Int
631-
%9 = load %0 : $*Int
632-
dealloc_stack %0 : $*Int
633-
return %9 : $Int
630+
fix_lifetime %0 : $*Int64
631+
%9 = load %0 : $*Int64
632+
dealloc_stack %0 : $*Int64
633+
return %9 : $Int64
634634
}
635635

test/SILOptimizer/redundant_load_elim.sil

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,27 +1269,27 @@ bb1:
12691269
}
12701270

12711271
sil @call_closure : $@convention(method) (@noescape @callee_guaranteed () -> ()) -> ()
1272-
sil @closure : $@convention(thin) (@inout_aliasable Int) -> ()
1272+
sil @closure : $@convention(thin) (@inout_aliasable Int64) -> ()
12731273

12741274
// CHECK-LABEL: sil @test_closure_capturing_address :
12751275
// CHECK: [[L:%[0-9]+]] = load
12761276
// CHECK: return [[L]]
12771277
// CHECK-LABEL: } // end sil function 'test_closure_capturing_address'
1278-
sil @test_closure_capturing_address : $@convention(thin) () -> Int {
1278+
sil @test_closure_capturing_address : $@convention(thin) () -> Int64 {
12791279
bb0:
1280-
%0 = alloc_stack $Int
1280+
%0 = alloc_stack $Int64
12811281
%1 = integer_literal $Builtin.Int64, 0
1282-
%2 = struct $Int (%1 : $Builtin.Int64)
1282+
%2 = struct $Int64 (%1 : $Builtin.Int64)
12831283

1284-
%3 = function_ref @closure : $@convention(thin) (@inout_aliasable Int) -> ()
1285-
%4 = partial_apply [callee_guaranteed] [on_stack] %3(%0) : $@convention(thin) (@inout_aliasable Int) -> ()
1286-
store %2 to %0 : $*Int
1284+
%3 = function_ref @closure : $@convention(thin) (@inout_aliasable Int64) -> ()
1285+
%4 = partial_apply [callee_guaranteed] [on_stack] %3(%0) : $@convention(thin) (@inout_aliasable Int64) -> ()
1286+
store %2 to %0 : $*Int64
12871287

12881288
%6 = function_ref @call_closure : $@convention(method) (@noescape @callee_guaranteed () -> ()) -> ()
12891289
%7 = apply %6(%4) : $@convention(method) (@noescape @callee_guaranteed () -> ()) -> ()
12901290
dealloc_stack %4 : $@noescape @callee_guaranteed () -> ()
1291-
%9 = load %0 : $*Int
1292-
dealloc_stack %0 : $*Int
1293-
return %9 : $Int
1291+
%9 = load %0 : $*Int64
1292+
dealloc_stack %0 : $*Int64
1293+
return %9 : $Int64
12941294
}
12951295

0 commit comments

Comments
 (0)