Rename NestBasedDesugaring classes

- Rewriter -> d8
- Analysis -> r8
Just to be more explicit

Change-Id: Ie8b8e55d472d900e72e2e6604e9667af706f36d7

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 f48d075..dd85bf1 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -26,7 +26,7 @@
 import com.android.tools.r8.graph.DexType;
 import com.android.tools.r8.graph.GraphLense;
 import com.android.tools.r8.ir.conversion.IRConverter;
-import com.android.tools.r8.ir.desugar.NestBasedAccessDesugaringAnalysis;
+import com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring;
 import com.android.tools.r8.ir.optimize.EnumOrdinalMapCollector;
 import com.android.tools.r8.ir.optimize.MethodPoolCollection;
 import com.android.tools.r8.ir.optimize.SwitchMapCollector;
@@ -425,8 +425,8 @@
       appView.setGraphLense(new MemberRebindingAnalysis(appViewWithLiveness).run());
       if (options.enableNestBasedAccessDesugaring) {
         timing.begin("NestBasedAccessDesugaring");
-        NestBasedAccessDesugaringAnalysis analyzer =
-            new NestBasedAccessDesugaringAnalysis(appViewWithLiveness, executorService);
+        R8NestBasedAccessDesugaring analyzer =
+            new R8NestBasedAccessDesugaring(appViewWithLiveness, executorService);
         boolean changed = appView.setGraphLense(analyzer.run(executorService));
         if (changed) {
           appViewWithLiveness.setAppInfo(

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 2d8a5de..2f24d3f 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
@@ -41,10 +41,10 @@
 import com.android.tools.r8.ir.code.NumericType;
 import com.android.tools.r8.ir.code.Value;
 import com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer;
+import com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring;
 import com.android.tools.r8.ir.desugar.InterfaceMethodRewriter;
 import com.android.tools.r8.ir.desugar.Java8MethodRewriter;
 import com.android.tools.r8.ir.desugar.LambdaRewriter;
-import com.android.tools.r8.ir.desugar.NestBasedAccessDesugaringRewriter;
 import com.android.tools.r8.ir.desugar.StringConcatRewriter;
 import com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter;
 import com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization;
@@ -122,7 +122,7 @@
   private final LibraryMethodOverrideAnalysis libraryMethodOverrideAnalysis;
   private final StringConcatRewriter stringConcatRewriter;
   private final LambdaRewriter lambdaRewriter;
-  private final NestBasedAccessDesugaringRewriter nestBasedAccessDesugaringRewriter;
+  private final D8NestBasedAccessDesugaring d8NestBasedAccessDesugaring;
   private final InterfaceMethodRewriter interfaceMethodRewriter;
   private final TwrCloseResourceRewriter twrCloseResourceRewriter;
   private final Java8MethodRewriter java8MethodRewriter;
@@ -231,7 +231,7 @@
       this.typeChecker = new TypeChecker(appView.withLiveness());
       this.serviceLoaderRewriter =
           options.enableServiceLoaderRewriting ? new ServiceLoaderRewriter() : null;
-      this.nestBasedAccessDesugaringRewriter = null;
+      this.d8NestBasedAccessDesugaring = null;
     } else {
       this.classInliner = null;
       this.classStaticizer = null;
@@ -246,10 +246,8 @@
       this.uninstantiatedTypeOptimization = null;
       this.typeChecker = null;
       this.serviceLoaderRewriter = null;
-      this.nestBasedAccessDesugaringRewriter =
-          options.enableNestBasedAccessDesugaring
-              ? new NestBasedAccessDesugaringRewriter(appView)
-              : null;
+      this.d8NestBasedAccessDesugaring =
+          options.enableNestBasedAccessDesugaring ? new D8NestBasedAccessDesugaring(appView) : null;
     }
     this.deadCodeRemover = new DeadCodeRemover(appView, codeRewriter);
     this.idempotentFunctionCallCanonicalizer =
@@ -299,8 +297,8 @@
 
   private void desugarNestBasedAccess(Builder<?> builder, ExecutorService executorService)
       throws ExecutionException {
-    if (nestBasedAccessDesugaringRewriter != null) {
-      nestBasedAccessDesugaringRewriter.desugarNestBasedAccess(builder, executorService, this);
+    if (d8NestBasedAccessDesugaring != null) {
+      d8NestBasedAccessDesugaring.desugarNestBasedAccess(builder, executorService, this);
     }
   }
 
@@ -1070,8 +1068,8 @@
 
     previous = printMethod(code, "IR after class inlining (SSA)", previous);
 
-    if (nestBasedAccessDesugaringRewriter != null) {
-      nestBasedAccessDesugaringRewriter.rewriteNestBasedAccesses(method, code, appView);
+    if (d8NestBasedAccessDesugaring != null) {
+      d8NestBasedAccessDesugaring.rewriteNestBasedAccesses(method, code, appView);
       assert code.isConsistentSSA();
     }
 

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

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/NestBasedAccessDesugaringRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/D8NestBasedAccessDesugaring.java
similarity index 97%
rename from src/main/java/com/android/tools/r8/ir/desugar/NestBasedAccessDesugaringRewriter.java
rename to src/main/java/com/android/tools/r8/ir/desugar/D8NestBasedAccessDesugaring.java
index 288b6a0..0cd1250 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/NestBasedAccessDesugaringRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/D8NestBasedAccessDesugaring.java
@@ -28,14 +28,13 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
-// D8 specific nest based access desugaring.
 // Summary:
 // - Process all methods compiled rewriting nest based access (Methods processed concurrently).
 // - Process classes on class path in reachable nests to find bridges to add
 //    in Program classes (Nests processed concurrently).
 // - Add bridges and nest constructor class (Sequential).
 // - Optimize bridges (Bridges processed concurrently).
-public class NestBasedAccessDesugaringRewriter extends NestBasedAccessDesugaring {
+public class D8NestBasedAccessDesugaring extends NestBasedAccessDesugaring {
 
   private final Map<DexMethod, DexMethod> methodMap = new ConcurrentHashMap<>();
   private final Map<DexMethod, DexMethod> initializerMap = new ConcurrentHashMap<>();
@@ -47,7 +46,7 @@
   // Map the nest host to its nest members, including the nest host itself.
   private final Map<DexType, List<DexType>> metNests = new ConcurrentHashMap<>();
 
-  public NestBasedAccessDesugaringRewriter(AppView<?> appView) {
+  public D8NestBasedAccessDesugaring(AppView<?> appView) {
     super(appView);
   }
 

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

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/NestBasedAccessDesugaringAnalysis.java b/src/main/java/com/android/tools/r8/ir/desugar/R8NestBasedAccessDesugaring.java
similarity index 93%
rename from src/main/java/com/android/tools/r8/ir/desugar/NestBasedAccessDesugaringAnalysis.java
rename to src/main/java/com/android/tools/r8/ir/desugar/R8NestBasedAccessDesugaring.java
index 4491929..7298335 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/NestBasedAccessDesugaringAnalysis.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/R8NestBasedAccessDesugaring.java
@@ -16,16 +16,15 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
-// R8 specific desugaring of nest based access.
 // Summary:
 // - Computes all the live nests reachable from Program Classes (Sequential).
 // - Process all live nests finding nest based access (Nests processes concurrently).
 // - Add bridges to be processed by further passes (Sequential).
-public class NestBasedAccessDesugaringAnalysis extends NestBasedAccessDesugaring {
+public class R8NestBasedAccessDesugaring extends NestBasedAccessDesugaring {
 
   private final NestedPrivateMethodLense.Builder builder;
 
-  public NestBasedAccessDesugaringAnalysis(AppView<?> appView, ExecutorService executorService) {
+  public R8NestBasedAccessDesugaring(AppView<?> appView, ExecutorService executorService) {
     super(appView);
     this.builder = NestedPrivateMethodLense.builder(appView);
   }