commit 8a4fd901bdc7ac35b88a7cc756274f86ff220b67
author Christoffer Quist Adamsen <christofferqa@google.com> Tue May 26 14:46:24 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue May 26 17:46:47 2020 +0000
tree ac550062336272bf5a1377401ba5d729b204692e
parent 9be8e284edc16f6fd859c13a1c0c3e0079de70ca

Fix missing alias handling in EnumValueOptimizer

Change-Id: I059fe688ad72601a9dd95b114babd583ae013f2a

src/main/java/com/android/tools/r8/ir/optimize/enums/EnumValueOptimizer.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumValueOptimizer.java b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumValueOptimizer.java
index 1d6668c..8f83953 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumValueOptimizer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumValueOptimizer.java
@@ -124,7 +124,7 @@
         }
       } else if (current.isArrayLength()) {
         // Rewrites MyEnum.values().length to a constant int.
-        Instruction arrayDefinition = current.asArrayLength().array().definition;
+        Instruction arrayDefinition = current.asArrayLength().array().getAliasedValue().definition;
         if (arrayDefinition != null && arrayDefinition.isInvokeStatic()) {
           DexMethod invokedMethod = arrayDefinition.asInvokeStatic().getInvokedMethod();
           DexProgramClass enumClass = appView.definitionForProgramType(invokedMethod.holder);