commit 381d091541cfdc1cf587c529248e17bde7106d95
author Jake Wharton <jakew@google.com> Mon Jun 24 13:50:30 2019 -0400
committer Jake Wharton <jakew@google.com> Tue Jun 25 12:21:41 2019 +0000
tree dbbc2eeee4a1201826231396b1ac9c7530f82bdc
parent c7d53a74db80e0b05520cefaa7261a086e56de28

Use existing local for resolving const class

Change-Id: Idc7da28e57b7baf110210a104d226aa922e8d1dd

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/ServiceLoaderRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/ServiceLoaderRewriter.java
index 1544263..6a55792 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/ServiceLoaderRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/ServiceLoaderRewriter.java
@@ -94,13 +94,7 @@
         continue;
       }
 
-      ConstClass constClass =
-          serviceLoaderLoad
-              .inValues()
-              .get(0)
-              .getAliasedValue()
-              .getConstInstruction()
-              .asConstClass();
+      ConstClass constClass = argument.getConstInstruction().asConstClass();
 
       // Check that the service is not kept.
       if (appView.appInfo().isPinned(constClass.getValue())) {