commit cfdf851c2ab7930f5ecdb5606944d679ba4a82b1
author Christoffer Quist Adamsen <christofferqa@google.com> Tue May 21 16:50:04 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed May 22 12:16:32 2019 +0000
tree 4feeff628f963b6897bbac6f0add4a41c70e5294
parent df2e3481dc1b6e9f05ec86836cdacdb0753b0cdc

Avoid access to static member ServiceLoaderRewriter.rewrite() via instance reference

Change-Id: I7b5187767ee80f867c7679ddd0416c2bc65c8491

src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
index bbea0ac..4328b31 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
@@ -143,7 +143,6 @@
   private final UninstantiatedTypeOptimization uninstantiatedTypeOptimization;
   private final TypeChecker typeChecker;
   private final IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer;
-  private final ServiceLoaderRewriter serviceLoaderRewriter;
 
   final DeadCodeRemover deadCodeRemover;
 
@@ -229,8 +228,6 @@
               ? new UninstantiatedTypeOptimization(appViewWithLiveness)
               : null;
       this.typeChecker = new TypeChecker(appView.withLiveness());
-      this.serviceLoaderRewriter =
-          options.enableServiceLoaderRewriting ? new ServiceLoaderRewriter() : null;
       this.d8NestBasedAccessDesugaring = null;
     } else {
       this.classInliner = null;
@@ -245,7 +242,6 @@
       this.devirtualizer = null;
       this.uninstantiatedTypeOptimization = null;
       this.typeChecker = null;
-      this.serviceLoaderRewriter = null;
       this.d8NestBasedAccessDesugaring =
           options.enableNestBasedAccessDesugaring ? new D8NestBasedAccessDesugaring(appView) : null;
     }
@@ -922,9 +918,9 @@
     // we will return with finalizeEmptyThrowingCode() above.
     assert code.verifyTypes(appView);
 
-    if (serviceLoaderRewriter != null) {
+    if (options.enableServiceLoaderRewriting) {
       assert appView.appInfo().hasLiveness();
-      serviceLoaderRewriter.rewrite(code, appView.withLiveness());
+      ServiceLoaderRewriter.rewrite(code, appView.withLiveness());
     }
 
     if (classStaticizer != null) {