commit 05adde04a365d01636c6c6766eaf4775df5844f9
author Clément Béra <clementbera@google.com> Thu Jun 03 17:16:23 2021 +0000
committer Clément Béra <clementbera@google.com> Fri Jun 04 05:27:11 2021 +0000
tree ba2d7cc6f0743a1e5d4892ad39c60636f87af1ed
parent 33395fa1d66e8d9c063e2ce4f5c16deaed791b1b

Remove migration methods

Change-Id: I872524059d15dd7be7ee214fc86759a718575536

src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java
index 182dc39..99654bc 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java
@@ -1244,9 +1244,8 @@
     }
     appView
         .getSyntheticItems()
-        .ensureDirectMethodOnSyntheticClasspathClassWhileMigrating(
+        .ensureDirectMethodOnSyntheticClasspathClass(
             SyntheticKind.COMPANION_CLASS,
-            rewritten.getHolderType(),
             context,
             appView,
             rewritten,

src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java

diff --git a/src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java b/src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java
index b0d07d4..44bb7e7 100644
--- a/src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java
+++ b/src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java
@@ -617,41 +617,14 @@
     }
   }
 
-  // This is a temporary API for migration to the hygienic synthetic, the classes created behave
-  // like a hygienic synthetic, but use the legacyType passed as parameter instead of the
-  // hygienic type.
-  private DexClasspathClass ensureFixedClasspathClassWhileMigrating(
-      SyntheticKind kind, DexType legacyType, ClasspathOrLibraryClass context, AppView<?> appView) {
-    synchronized (context) {
-      DexClass dexClass = appView.definitionFor(legacyType);
-      if (dexClass != null) {
-        assert dexClass.isClasspathClass();
-        return dexClass.asClasspathClass();
-      }
-      // Obtain the outer synthesizing context in the case the context itself is synthetic.
-      // This is to ensure a flat input-type -> synthetic-item mapping.
-      SynthesizingContext outerContext = SynthesizingContext.fromNonSyntheticInputContext(context);
-      SyntheticClasspathClassBuilder classBuilder =
-          new SyntheticClasspathClassBuilder(
-              legacyType, kind, outerContext, appView.dexItemFactory());
-      DexClasspathClass clazz = classBuilder.build();
-      addPendingDefinition(new SyntheticClasspathClassDefinition(kind, outerContext, clazz));
-      return clazz;
-    }
-  }
-
-  // This is a temporary API for migration to the hygienic synthetic, the classes created behave
-  // like a hygienic synthetic, but use the legacyType passed as parameter instead of the
-  // hygienic type.
-  public void ensureDirectMethodOnSyntheticClasspathClassWhileMigrating(
+  public void ensureDirectMethodOnSyntheticClasspathClass(
       SyntheticKind kind,
-      DexType legacyType,
       ClasspathOrLibraryClass context,
       AppView<?> appView,
       DexMethod method,
       Consumer<SyntheticMethodBuilder> builderConsumer) {
     DexClasspathClass syntheticClass =
-        ensureFixedClasspathClassWhileMigrating(kind, legacyType, context, appView);
+        ensureFixedClasspathClass(kind, context, appView, ignored -> {}, ignored -> {});
     synchronized (syntheticClass) {
       if (syntheticClass.lookupMethod(method) != null) {
         return;