Account for redundant moves in move sorter
Fixes: b/379347946
Change-Id: I408310b25ff3e308c3eab68734c3df01b2bae2c8
diff --git a/src/main/java/com/android/tools/r8/ir/regalloc/MoveSorter.java b/src/main/java/com/android/tools/r8/ir/regalloc/MoveSorter.java
index 05737e4..251b16f 100644
--- a/src/main/java/com/android/tools/r8/ir/regalloc/MoveSorter.java
+++ b/src/main/java/com/android/tools/r8/ir/regalloc/MoveSorter.java
@@ -190,15 +190,17 @@
// Check if either of the two instructions write the operand of the other instruction.
if (instruction.isMove()) {
FixedRegisterValue inValue = instruction.getFirstOperand().asFixedRegisterValue();
+ FixedRegisterValue outValue = instruction.outValue().asFixedRegisterValue();
FixedRegisterValue laterOutValue = laterInstruction.outValue().asFixedRegisterValue();
- if (laterOutValue.usesRegister(inValue)) {
+ if (laterOutValue.usesRegister(inValue) || laterOutValue.usesRegister(outValue)) {
return true;
}
}
if (laterInstruction.isMove()) {
FixedRegisterValue outValue = instruction.outValue().asFixedRegisterValue();
FixedRegisterValue laterInValue = laterInstruction.getFirstOperand().asFixedRegisterValue();
- if (outValue.usesRegister(laterInValue)) {
+ FixedRegisterValue laterOutValue = laterInstruction.outValue().asFixedRegisterValue();
+ if (outValue.usesRegister(laterInValue) || outValue.usesRegister(laterOutValue)) {
return true;
}
}
diff --git a/src/test/java/com/android/tools/r8/regress/Regress379347946.java b/src/test/java/com/android/tools/r8/regress/Regress379347946.java
index 99f5827..09ce508 100644
--- a/src/test/java/com/android/tools/r8/regress/Regress379347946.java
+++ b/src/test/java/com/android/tools/r8/regress/Regress379347946.java
@@ -40,8 +40,7 @@
.setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
- // TODO(b/379347946): Should produce same result as D8 below
- .assertSuccessWithOutputLines("12771252");
+ .assertSuccessWithOutputLines(EXPECTED);
}
@Test
