Skip to content

Commit e33efdc

Browse files
committed
Update non-ossa CopyForwarding test
- Remove invalid debug_value_addr - Update address phi arg test to use the phi arg - Add rdar links for cleanup of debug_value_addr after forwardPropagate/backwardPropagate
1 parent 115244f commit e33efdc

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

test/SILOptimizer/copyforward.sil

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ protocol P {
2525
sil hidden @nrvo : $@convention(thin) <T where T : P> (Bool) -> @out T {
2626
bb0(%0 : $*T, %1 : $Bool):
2727
%2 = alloc_stack $T, var, name "ro" // users: %9, %15, %17, %19
28-
debug_value_addr %0 : $*T
29-
debug_value_addr %2 : $*T
3028
%3 = struct_extract %1 : $Bool, #Bool._value // user: %4
3129
cond_br %3, bb1, bb2 // id: %4
3230

@@ -50,7 +48,6 @@ bb3: // Preds: bb1 bb2
5048
copy_addr [take] %2 to [initialization] %0 : $*T // id: %17
5149
%18 = tuple () // user: %20
5250
debug_value_addr %0 : $*T
53-
debug_value_addr %2 : $*T
5451
dealloc_stack %2 : $*T // id: %19
5552
return %18 : $() // id: %20
5653
}
@@ -94,6 +91,7 @@ bb0(%0 : $*T):
9491
%c1 = apply %f1<T>(%l1) : $@convention(thin) <τ_0_0> (@in τ_0_0) -> ()
9592
debug_value_addr %l1 : $*T
9693
dealloc_stack %l1 : $*T
94+
// forwardPropagateCopy should cleanup debug_value_addr. See rdar
9795
debug_value_addr %0 : $*T
9896
destroy_addr %0 : $*T
9997
%r1 = tuple ()
@@ -152,8 +150,6 @@ bb0(%0 : $*T):
152150
copy_addr [take] %0 to [initialization] %l1 : $*T
153151
%f1 = function_ref @f_in : $@convention(thin) <τ_0_0> (@in τ_0_0) -> ()
154152
%c1 = apply %f1<T>(%l1) : $@convention(thin) <τ_0_0> (@in τ_0_0) -> ()
155-
debug_value_addr %0 : $*T
156-
debug_value_addr %l1 : $*T
157153
dealloc_stack %l1 : $*T
158154
%r1 = tuple ()
159155
return %r1 : $()
@@ -172,8 +168,6 @@ bb0(%0 : $*T):
172168
copy_addr [take] %0 to %l1 : $*T
173169
%f2 = function_ref @f_in : $@convention(thin) <τ_0_0> (@in τ_0_0) -> ()
174170
%c2 = apply %f2<T>(%l1) : $@convention(thin) <τ_0_0> (@in τ_0_0) -> ()
175-
debug_value_addr %0 : $*T
176-
debug_value_addr %l1 : $*T
177171
dealloc_stack %l1 : $*T
178172
%r1 = tuple ()
179173
return %r1 : $()
@@ -192,6 +186,7 @@ bb0(%0 : $*T):
192186
debug_value_addr %l1 : $*T
193187
copy_addr %l1 to [initialization] %0 : $*T
194188
debug_value_addr %0 : $*T
189+
// backwardPropagateCopy should cleanup debug_value_addr. See rdar
195190
debug_value_addr %l1 : $*T
196191
destroy_addr %l1 : $*T
197192
dealloc_stack %l1 : $*T
@@ -209,10 +204,10 @@ br bb1(%0: $*T)
209204
bb1(%1 : $*T):
210205
%f1 = function_ref @f_out : $@convention(thin) <τ_0_0> () -> @out τ_0_0
211206
%c1 = apply %f1<T>(%l1) : $@convention(thin) <τ_0_0> () -> @out τ_0_0
212-
debug_value_addr %0 : $*T
207+
debug_value_addr %1 : $*T
213208
debug_value_addr %l1 : $*T
214-
copy_addr %l1 to [initialization] %0 : $*T
215-
debug_value_addr %0 : $*T
209+
copy_addr %l1 to [initialization] %1 : $*T
210+
debug_value_addr %1 : $*T
216211
debug_value_addr %l1 : $*T
217212
destroy_addr %l1 : $*T
218213
dealloc_stack %l1 : $*T

0 commit comments

Comments
 (0)