commit c4e8288c062b018c8204293c141a8344323f51f6
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Oct 24 04:58:14 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Oct 24 04:58:14 2019 +0200
tree 2d34d2fbae6d2703e896ae53dae31000afd7744d
parent 00866e51f117246511b67f422a5c1e6f7210f304

Fix array-put traversal in the switch map collector follow up

Bug: 143230247
Change-Id: I9e2e7a339f5e357f4f2841723fbc780ce66edbe6

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/SwitchMapCollector.java b/src/main/java/com/android/tools/r8/ir/optimize/SwitchMapCollector.java
index 3d99cfb..cf4f72b 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/SwitchMapCollector.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/SwitchMapCollector.java
@@ -152,7 +152,7 @@
           if (switchMap.put(integerIndex, enumField) != null) {
             return;
           }
-        } else {
+        } else if (use != instruction) {
           return;
         }
       }