commit 2c5ce1faed0dc0ddfffc9035f75a3354ce59c50f
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Feb 11 08:39:03 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Feb 11 08:39:03 2021 +0100
tree 791de996e2a51046dcab623f4a69520e5677e2da
parent 6c7abc6f18c78582247b9a030bbbca88b986a264

Account for phis in setLocalsAtEntry()

Bug: 164162567
Change-Id: I71f1ce70c80dc1d43fb24486b53328bc01613d93

src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java

diff --git a/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java b/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java
index 480b00c..dde5906 100644
--- a/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java
+++ b/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java
@@ -472,8 +472,12 @@
             ? block.getPredecessors().get(0).exceptionalExit().getNumber()
             : block.getPredecessors().get(0).exit().getNumber();
     for (LocalRange open : openRanges) {
+      Value predecessorValue =
+          open.value.isPhi() && open.value.getBlock() == block
+              ? open.value.asPhi().getOperand(0)
+              : open.value;
       int predecessorRegister =
-          allocator.getArgumentOrAllocateRegisterForValue(open.value, predecessorExitIndex);
+          allocator.getArgumentOrAllocateRegisterForValue(predecessorValue, predecessorExitIndex);
       initialLocals.put(predecessorRegister, open.local);
     }
     block.setLocalsAtEntry(initialLocals);