[Reland] Fix close range of debug variable at block entry
Bug: 69093793
Change-Id: I63c1e83270425f1ef9467d5e497bf619c0ba754c
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 3c3030b..92e7e05 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
@@ -291,7 +291,7 @@
for (BasicBlock block : blocks) {
ListIterator<Instruction> instructionIterator = block.listIterator();
// Close ranges up-to but excluding the first instruction. Ends are exclusive but the values
- // are live upon entering the first instruction.
+ // might be live upon entering the first instruction (if they are used by it).
int entryIndex = block.entry().getNumber();
if (block.entry().isMoveException()) {
// Close locals at a move exception since they close as part of the exceptional transfer.
@@ -301,7 +301,12 @@
ListIterator<LocalRange> it = openRanges.listIterator(0);
while (it.hasNext()) {
LocalRange openRange = it.next();
- if (openRange.end < entryIndex) {
+ if (openRange.end < entryIndex ||
+ // Don't close the local if it is used by the entry instruction. Exclude move
+ // exception instruction that are managed in other way that should be clean.
+ (openRange.end == entryIndex
+ && !block.entry().isMoveException()
+ && !usesValues(openRange.value, block.entry()))) {
it.remove();
assert currentLocals.get(openRange.register) == openRange.local;
currentLocals.remove(openRange.register);
@@ -373,6 +378,11 @@
}
}
+ private static boolean usesValues(Value usedValue, Instruction instruction) {
+ return instruction.inValues().contains(usedValue)
+ || instruction.getDebugValues().contains(usedValue);
+ }
+
private void fixupLocalsLiveAtMoveException(
BasicBlock block,
ListIterator<Instruction> instructionIterator,
diff --git a/src/test/java/com/android/tools/r8/debug/LocalsTest.java b/src/test/java/com/android/tools/r8/debug/LocalsTest.java
index b2c551b..76f8870 100644
--- a/src/test/java/com/android/tools/r8/debug/LocalsTest.java
+++ b/src/test/java/com/android/tools/r8/debug/LocalsTest.java
@@ -688,7 +688,6 @@
}
@Test
- @Ignore("b/69093793")
public void testLocalVisibilityIntoLoop() throws Throwable {
final String className = "Locals";
final String methodName = "localVisibilityIntoLoop";
