LICM: make sure that getMemoryBehavior is only called for address values

eeckstein · eeckstein · commit 8f2531348dff · 2024-07-29T17:33:44.000+02:00
It was called for non-address operands of fix_lifetime.
Just exclude such fix_lifetime instructions from moving. It's not important anyway.
diff --git a/lib/SILOptimizer/LoopTransforms/LICM.cpp b/lib/SILOptimizer/LoopTransforms/LICM.cpp
@@ -1021,6 +1021,8 @@ void LoopTreeOptimization::analyzeCurrentLoop(
         std::any_of(sideEffects.begin(), sideEffects.end(),
                     [&](SILInstruction *W) { return W->mayRelease(); });
     for (auto *FL : FixLifetimes) {
+      if (!FL->getOperand()->getType().isAddress())
+        continue;
       if (!sideEffectsMayRelease || !mayWriteTo(AA, sideEffects, FL)) {
         SinkDown.push_back(FL);
       }
diff --git a/test/SILOptimizer/licm.sil b/test/SILOptimizer/licm.sil
@@ -25,7 +25,6 @@ sil_global @globalArray : $Storage
 
 // CHECK: bb2({{.*}}):
 // CHECK-NOT: load
-// CHECK-NOT: fix_lifetime
 // CHECK: cond_br
 
 sil @memset : $@convention(thin) (@inout Builtin.NativeObject, Int) -> () {

Original file line number	Diff line number	Diff line change
`@@ -1021,6 +1021,8 @@ void LoopTreeOptimization::analyzeCurrentLoop(`
`1021`	`1021`	`std::any_of(sideEffects.begin(), sideEffects.end(),`
`1022`	`1022`	`[&](SILInstruction *W) { return W->mayRelease(); });`
`1023`	`1023`	`for (auto *FL : FixLifetimes) {`
	`1024`	`+ if (!FL->getOperand()->getType().isAddress())`
	`1025`	`+ continue;`
`1024`	`1026`	`if (!sideEffectsMayRelease \|\| !mayWriteTo(AA, sideEffects, FL)) {`
`1025`	`1027`	`SinkDown.push_back(FL);`
`1026`	`1028`	`}`