commit bf04e3271e21463c4f8fad0555eb6da761c4f41f
author Ian Zerny <zerny@google.com> Fri Aug 14 09:04:24 2020 +0200
committer Ian Zerny <zerny@google.com> Fri Aug 14 09:15:38 2020 +0000
tree 53f7dda9188329ff422a1793d33b815c9460b210
parent ae8db5a05e797fc1d8aa0cdc10418d0033f4910d

Remove unneeded application builder argument.

Bug: 149167169
Change-Id: Iaddab35a16d709f699926ce2d329d610b2c21997

src/main/java/com/android/tools/r8/R8.java

diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java
index 6275d39..4c8919f 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -487,8 +487,7 @@
       if (options.shouldDesugarNests()) {
         timing.begin("NestBasedAccessDesugaring");
         R8NestBasedAccessDesugaring analyzer = new R8NestBasedAccessDesugaring(appViewWithLiveness);
-        NestedPrivateMethodLens lens =
-            analyzer.run(executorService, getDirectApp(appView).builder());
+        NestedPrivateMethodLens lens = analyzer.run(executorService);
         if (lens != null) {
           boolean changed = appView.setGraphLens(lens);
           assert changed;

src/main/java/com/android/tools/r8/ir/desugar/NestBasedAccessDesugaring.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/NestBasedAccessDesugaring.java b/src/main/java/com/android/tools/r8/ir/desugar/NestBasedAccessDesugaring.java
index 42e3ec7..c7f6f2c 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/NestBasedAccessDesugaring.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/NestBasedAccessDesugaring.java
@@ -194,10 +194,16 @@
         DexProgramClass::checksumFromType);
   }
 
+  void synthesizeNestConstructor() {
+    synthesizeNestConstructor(null);
+  }
+
   void synthesizeNestConstructor(DexApplication.Builder<?> builder) {
     if (nestConstructorUsed) {
       appView.appInfo().addSynthesizedClass(nestConstructor);
-      builder.addSynthesizedClass(nestConstructor, true);
+      if (builder != null) {
+        builder.addSynthesizedClass(nestConstructor, true);
+      }
     }
   }
 

src/main/java/com/android/tools/r8/ir/desugar/R8NestBasedAccessDesugaring.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/R8NestBasedAccessDesugaring.java b/src/main/java/com/android/tools/r8/ir/desugar/R8NestBasedAccessDesugaring.java
index e9ac116..d275f4a 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/R8NestBasedAccessDesugaring.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/R8NestBasedAccessDesugaring.java
@@ -5,7 +5,6 @@
 package com.android.tools.r8.ir.desugar;
 
 import com.android.tools.r8.graph.AppView;
-import com.android.tools.r8.graph.DexApplication;
 import com.android.tools.r8.graph.DexClass;
 import com.android.tools.r8.graph.DexMethod;
 import com.android.tools.r8.graph.DexProgramClass;
@@ -33,16 +32,14 @@
     super(appView);
   }
 
-  public NestedPrivateMethodLens run(
-      ExecutorService executorService, DexApplication.Builder<?> appBuilder)
-      throws ExecutionException {
+  public NestedPrivateMethodLens run(ExecutorService executorService) throws ExecutionException {
     assert !appView.options().canUseNestBasedAccess()
         || appView.options().testing.enableForceNestBasedAccessDesugaringForTest;
     computeAndProcessNestsConcurrently(executorService);
     NestedPrivateMethodLens.Builder lensBuilder = NestedPrivateMethodLens.builder();
     addDeferredBridgesAndMapMethods(lensBuilder);
     clearNestAttributes();
-    synthesizeNestConstructor(appBuilder);
+    synthesizeNestConstructor();
     return lensBuilder.build(appView, getNestConstructorType());
   }