Skip to content

Commit 9ce6e12

Browse files
Use explicit checks for the 'store' instruction (swiftlang#70250)
* use explicit checks for the 'store' instruction * fix small typos * update register checks to be based on regex
1 parent 944b023 commit 9ce6e12

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

test/SILOptimizer/allocbox_to_stack.sil

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ bb0(%0 : $Bool):
266266
return %6 : $Bool
267267

268268
// CHECK: alloc_stack $Bool
269-
// CHECK-NEXT: store
269+
// CHECK-NEXT: store {{%[0-9]+}}
270270
// CHECK-NEXT: tuple ()
271271
// CHECK-NEXT: load
272272
// CHECK-NEXT: dealloc_stack
@@ -803,7 +803,7 @@ bb5(%25 : $Error): // Preds: bb4 bb3
803803
// CHECK-NEXT: dealloc_stack [[BOX]]
804804
// CHECK-NEXT: dealloc_stack [[STACK1]]
805805
// CHECK: bb2:
806-
// CHECK: store
806+
// CHECK: store {{%[0-9]+}}
807807
// CHECK: [[STACK2:%[0-9]+]] = alloc_stack $Bool
808808
// CHECK-NEXT: dealloc_stack [[STACK2]] : $*Bool, loc "testloc":27:27
809809
// CHECK-NEXT: dealloc_stack [[BOX]] : $*Int, loc "testloc":27:27
@@ -841,7 +841,7 @@ bb3:
841841
// CHECK: bb0(%0 : $Int):
842842
// CHECK-NEXT: [[REF:%[0-9]+]] = alloc_ref [stack] $SomeClass
843843
// CHECK-NEXT: [[BOX:%[0-9]+]] = alloc_stack $Int
844-
// CHECK: store
844+
// CHECK: store {{%[0-9]+}}
845845
// CHECK: dealloc_stack [[BOX]]
846846
// CHECK-NEXT: dealloc_stack_ref [[REF]]
847847
// CHECK-NEXT: tuple
@@ -868,7 +868,7 @@ bb0(%0 : $Int):
868868
// CHECK-NEXT: dealloc_stack [[STACK2]]
869869
// CHECK-NEXT: unreachable
870870
// CHECK: bb2:
871-
// CHECK: store
871+
// CHECK: store {{%[0-9]+}}
872872
// CHECK: dealloc_stack [[BOX]]
873873
// CHECK-NEXT: dealloc_stack [[STACK1]]
874874
// CHECK-NEXT: tuple
@@ -904,7 +904,7 @@ bb2:
904904
// CHECK-NEXT: dealloc_stack [[BOX]]
905905
// CHECK-NEXT: unreachable
906906
// CHECK: bb2:
907-
// CHECK: store
907+
// CHECK: store {{%[0-9]+}}
908908
// CHECK: dealloc_stack [[BOX]]
909909
// CHECK-NEXT: dealloc_stack [[STACK1]]
910910
// CHECK-NEXT: tuple
@@ -938,7 +938,7 @@ bb2:
938938
// CHECK: bb1:
939939
// CHECK-NEXT: unreachable
940940
// CHECK: bb2:
941-
// CHECK: store
941+
// CHECK: store {{%[0-9]+}}
942942
// CHECK: dealloc_stack [[STACK]]
943943
// CHECK-NEXT: dealloc_stack [[BOX]]
944944
// CHECK-NEXT: tuple
@@ -969,7 +969,7 @@ bb2:
969969
// CHECK: bb1:
970970
// CHECK-NEXT: unreachable
971971
// CHECK: bb2:
972-
// CHECK: store
972+
// CHECK: store {{%[0-9]+}}
973973
// CHECK: dealloc_stack [[BOX]]
974974
// CHECK-NEXT: tuple
975975
// CHECK-NEXT: return
@@ -998,7 +998,7 @@ bb2:
998998
// CHECK-NEXT: {{.*}} = alloc_stack $Bool
999999
// CHECK-NEXT: unreachable
10001000
// CHECK: bb2:
1001-
// CHECK: store
1001+
// CHECK: store {{%[0-9]+}}
10021002
// CHECK: dealloc_stack [[BOX]]
10031003
// CHECK-NEXT: tuple
10041004
// CHECK-NEXT: return
@@ -1065,7 +1065,7 @@ bb3:
10651065
// CHECK-NEXT: dealloc_stack [[AI]]
10661066
// CHECK-NEXT: br bb3
10671067
// CHECK: bb3:
1068-
// CHECK-NEXT: store
1068+
// CHECK-NEXT: store {{%[0-9]+}}
10691069
// CHECK-NEXT: load
10701070
// CHECK-NEXT: unreachable
10711071
sil @nesting_and_unreachable7 : $@convention(thin) (Bool) -> Bool {
@@ -1100,7 +1100,7 @@ bb3:
11001100
// CHECK-NEXT: dealloc_stack [[STACK2]]
11011101
// CHECK-NEXT: br bb4
11021102
// CHECK: bb3:
1103-
// CHECK: store
1103+
// CHECK: store {{%[0-9]+}}
11041104
// CHECK: dealloc_stack [[STACK2]]
11051105
// CHECK-NEXT: dealloc_stack [[STACK1]]
11061106
// CHECK-NEXT: dealloc_stack [[BOX]]

test/SILOptimizer/diagnose_unreachable.sil

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ sil @removeTriviallyDeadInstructions : $@convention(thin) (@owned B) -> () {
148148
bb0(%0 : $B):
149149
%1 = alloc_box $<τ_0_0> { var τ_0_0 } <B>
150150
%1a = project_box %1 : $<τ_0_0> { var τ_0_0 } <B>, 0
151-
store %0 to %1a : $*B // CHECK: store
151+
store %0 to %1a : $*B // CHECK: store {{%[0-9]+}}
152152
%3 = load %1a : $*B
153153
strong_retain %3 : $B // CHECK: strong_retain
154154
%5 = unchecked_ref_cast %3 : $B to $Builtin.NativeObject // CHECK-NOT: unchecked_ref_cast
@@ -568,7 +568,7 @@ bb3:
568568
// CHECK-NEXT: alloc_stack
569569
// CHECK-NEXT: tuple
570570
// CHECK-NEXT: init_enum_data_addr
571-
// CHECK-NEXT: store
571+
// CHECK-NEXT: store {{%[0-9]+}}
572572
// CHECK-NEXT: inject_enum_addr
573573
// CHECK-NEXT: br bb1
574574
// CHECK: } // end sil function 'constant_fold_switch_enum_addr_with_payload'
@@ -596,7 +596,7 @@ bb2:
596596
// CHECK: bb0(
597597
// CHECK-NEXT: alloc_stack
598598
// CHECK-NEXT: init_enum_data_addr
599-
// CHECK-NEXT: store
599+
// CHECK-NEXT: store {{%[0-9]+}}
600600
// CHECK-NEXT: inject_enum_addr
601601
// CHECK-NEXT: br bb1
602602
// CHECK: } // end sil function 'constant_fold_switch_enum_addr_with_nontrivial_payload'
@@ -627,7 +627,7 @@ bb3:
627627
// CHECK: bb0(
628628
// CHECK-NEXT: alloc_stack
629629
// CHECK-NEXT: init_enum_data_addr
630-
// CHECK-NEXT: store
630+
// CHECK-NEXT: store {{%[0-9]+}}
631631
// CHECK-NEXT: inject_enum_addr
632632
// CHECK-NEXT: br bb1
633633
// CHECK: } // end sil function 'constant_fold_switch_enum_addr_with_nontrivial_payload_2'

0 commit comments

Comments
 (0)