commit 91fb5f2a582f336140a9c883a4dc4e310466f6b2
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Jan 07 14:59:42 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Jan 07 14:59:42 2021 +0100
tree 751d6e2efe08308a315a8aa6f3227e7925617c34
parent a29d163d47246bd3d0d3d32aa7c8908f7140e8e0

Use aliased value in CodeRewriter

Change-Id: I8895039ca51af8498f50ce475c3ffbc51d608fea

src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
index 6aa39c0..520a408 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
@@ -2501,10 +2501,10 @@
           // Comparing two newly created objects.
           assert theIf.getType() == Type.EQ || theIf.getType() == Type.NE;
           simplifyIfWithKnownCondition(code, block, theIf, theIf.targetFromCondition(1));
-        } else if (lhs.isConstNumber() && rhs.isConstNumber()) {
+        } else if (lhsRoot.isConstNumber() && rhsRoot.isConstNumber()) {
           // Zero test with a constant of comparison between between two constants.
-          ConstNumber left = lhs.getConstInstruction().asConstNumber();
-          ConstNumber right = rhs.getConstInstruction().asConstNumber();
+          ConstNumber left = lhsRoot.getConstInstruction().asConstNumber();
+          ConstNumber right = rhsRoot.getConstInstruction().asConstNumber();
           BasicBlock target = theIf.targetFromCondition(left, right);
           simplifyIfWithKnownCondition(code, block, theIf, target);
         } else if (lhs.hasValueRange() && rhs.hasValueRange()) {
@@ -2597,7 +2597,7 @@
     Value lhs = theIf.lhs();
     Value lhsRoot = lhs.getAliasedValue();
     if (lhsRoot.isConstNumber()) {
-      ConstNumber cond = lhs.getConstInstruction().asConstNumber();
+      ConstNumber cond = lhsRoot.getConstInstruction().asConstNumber();
       BasicBlock target = theIf.targetFromCondition(cond);
       simplifyIfWithKnownCondition(code, block, theIf, target);
       return;