Rename L8ClassSynthesizerDesugaring
- Record will reuse the infrastructure outside of L8
Bug: 197081367
Change-Id: Ib79ce6dd9bd6b78cae24d60da6aeaa0e97c22012
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/ClassConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/ClassConverter.java
index 2a30a23..38d9d56 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/ClassConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/ClassConverter.java
@@ -11,9 +11,9 @@
import com.android.tools.r8.graph.ProgramMethod;
import com.android.tools.r8.ir.desugar.CfClassDesugaringEventConsumer;
import com.android.tools.r8.ir.desugar.CfClassDesugaringEventConsumer.D8CfClassDesugaringEventConsumer;
+import com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer;
import com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer;
import com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.D8CfInstructionDesugaringEventConsumer;
-import com.android.tools.r8.ir.desugar.CfL8ClassSynthesizerEventConsumer;
import com.android.tools.r8.utils.ThreadUtils;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
@@ -56,13 +56,13 @@
List<DexProgramClass> classes = appView.appInfo().classes();
if (appView.options().isDesugaredLibraryCompilation()) {
- CfL8ClassSynthesizerEventConsumer l8ClassSynthesizerEventConsumer =
- new CfL8ClassSynthesizerEventConsumer();
- converter.l8ClassSynthesis(executorService, l8ClassSynthesizerEventConsumer);
+ CfClassSynthesizerDesugaringEventConsumer classSynthesizerEventConsumer =
+ new CfClassSynthesizerDesugaringEventConsumer();
+ converter.classSynthesisDesugaring(executorService, classSynthesizerEventConsumer);
classes =
ImmutableList.<DexProgramClass>builder()
.addAll(classes)
- .addAll(l8ClassSynthesizerEventConsumer.getSynthesizedClasses())
+ .addAll(classSynthesizerEventConsumer.getSynthesizedClasses())
.build();
}
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 d8f6532..c6f7d4a 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
@@ -46,11 +46,11 @@
import com.android.tools.r8.ir.conversion.MethodConversionOptions.MutableMethodConversionOptions;
import com.android.tools.r8.ir.desugar.CfClassDesugaringCollection;
import com.android.tools.r8.ir.desugar.CfClassDesugaringEventConsumer.D8CfClassDesugaringEventConsumer;
+import com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection;
+import com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer;
import com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection;
import com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer;
import com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.D8CfInstructionDesugaringEventConsumer;
-import com.android.tools.r8.ir.desugar.CfL8ClassSynthesizerCollection;
-import com.android.tools.r8.ir.desugar.CfL8ClassSynthesizerEventConsumer;
import com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection;
import com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer;
import com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer.D8CfPostProcessingDesugaringEventConsumer;
@@ -452,12 +452,12 @@
}
}
- public void l8ClassSynthesis(
+ public void classSynthesisDesugaring(
ExecutorService executorService,
- CfL8ClassSynthesizerEventConsumer l8ClassSynthesizerEventConsumer)
+ CfClassSynthesizerDesugaringEventConsumer classSynthesizerEventConsumer)
throws ExecutionException {
- new CfL8ClassSynthesizerCollection(appView, instructionDesugaring.getRetargetingInfo())
- .synthesizeClasses(executorService, l8ClassSynthesizerEventConsumer);
+ new CfClassSynthesizerDesugaringCollection(appView, instructionDesugaring.getRetargetingInfo())
+ .synthesizeClasses(executorService, classSynthesizerEventConsumer);
}
private void postProcessingDesugaringForD8(
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/CfL8ClassSynthesizer.java b/src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaring.java
similarity index 66%
rename from src/main/java/com/android/tools/r8/ir/desugar/CfL8ClassSynthesizer.java
rename to src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaring.java
index 2eefa63..38fa09a 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/CfL8ClassSynthesizer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaring.java
@@ -4,7 +4,7 @@
package com.android.tools.r8.ir.desugar;
-public interface CfL8ClassSynthesizer {
+public interface CfClassSynthesizerDesugaring {
- void synthesizeClasses(CfL8ClassSynthesizerEventConsumer eventConsumer);
+ void synthesizeClasses(CfClassSynthesizerDesugaringEventConsumer eventConsumer);
}
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/CfL8ClassSynthesizerCollection.java b/src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaringCollection.java
similarity index 82%
rename from src/main/java/com/android/tools/r8/ir/desugar/CfL8ClassSynthesizerCollection.java
rename to src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaringCollection.java
index bba5617..4bca24a 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/CfL8ClassSynthesizerCollection.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaringCollection.java
@@ -15,11 +15,12 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
-public class CfL8ClassSynthesizerCollection {
+public class CfClassSynthesizerDesugaringCollection {
- private Collection<CfL8ClassSynthesizer> synthesizers = new ArrayList<>();
+ private Collection<CfClassSynthesizerDesugaring> synthesizers = new ArrayList<>();
- public CfL8ClassSynthesizerCollection(AppView<?> appView, RetargetingInfo retargetingInfo) {
+ public CfClassSynthesizerDesugaringCollection(
+ AppView<?> appView, RetargetingInfo retargetingInfo) {
assert appView.options().isDesugaredLibraryCompilation();
ProgramEmulatedInterfaceSynthesizer emulatedInterfaceSynthesizer =
ProgramEmulatedInterfaceSynthesizer.create(appView);
@@ -35,7 +36,7 @@
}
public void synthesizeClasses(
- ExecutorService executorService, CfL8ClassSynthesizerEventConsumer eventConsumer)
+ ExecutorService executorService, CfClassSynthesizerDesugaringEventConsumer eventConsumer)
throws ExecutionException {
ThreadUtils.processItems(
synthesizers, synthesizer -> synthesizer.synthesizeClasses(eventConsumer), executorService);
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/CfL8ClassSynthesizerEventConsumer.java b/src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaringEventConsumer.java
similarity index 96%
rename from src/main/java/com/android/tools/r8/ir/desugar/CfL8ClassSynthesizerEventConsumer.java
rename to src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaringEventConsumer.java
index c4d750d..6ff6ec9 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/CfL8ClassSynthesizerEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaringEventConsumer.java
@@ -11,7 +11,7 @@
import com.google.common.collect.Sets;
import java.util.Set;
-public class CfL8ClassSynthesizerEventConsumer
+public class CfClassSynthesizerDesugaringEventConsumer
implements L8ProgramEmulatedInterfaceSynthesizerEventConsumer,
DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,
DesugaredLibraryRetargeterL8SynthesizerEventConsumer {
@@ -36,5 +36,4 @@
public Set<DexProgramClass> getSynthesizedClasses() {
return synthesizedClasses;
}
-
}
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibraryRetargeterL8Synthesizer.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibraryRetargeterL8Synthesizer.java
index dad4cd6..73cbd3d 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibraryRetargeterL8Synthesizer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibraryRetargeterL8Synthesizer.java
@@ -5,11 +5,11 @@
import com.android.tools.r8.graph.AppView;
import com.android.tools.r8.graph.DexClassAndMethod;
-import com.android.tools.r8.ir.desugar.CfL8ClassSynthesizer;
-import com.android.tools.r8.ir.desugar.CfL8ClassSynthesizerEventConsumer;
+import com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring;
+import com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer;
import com.android.tools.r8.utils.collections.DexClassAndMethodSet;
-public class DesugaredLibraryRetargeterL8Synthesizer implements CfL8ClassSynthesizer {
+public class DesugaredLibraryRetargeterL8Synthesizer implements CfClassSynthesizerDesugaring {
private final AppView<?> appView;
private final DesugaredLibraryRetargeterSyntheticHelper syntheticHelper;
@@ -33,7 +33,7 @@
}
@Override
- public void synthesizeClasses(CfL8ClassSynthesizerEventConsumer eventConsumer) {
+ public void synthesizeClasses(CfClassSynthesizerDesugaringEventConsumer eventConsumer) {
assert !emulatedDispatchMethods.isEmpty();
for (DexClassAndMethod emulatedDispatchMethod : emulatedDispatchMethods) {
syntheticHelper.ensureProgramEmulatedHolderDispatchMethod(
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibraryWrapperSynthesizer.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibraryWrapperSynthesizer.java
index 3e21feb..aa69845 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibraryWrapperSynthesizer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibraryWrapperSynthesizer.java
@@ -25,8 +25,8 @@
import com.android.tools.r8.graph.GenericSignature.MethodTypeSignature;
import com.android.tools.r8.graph.MethodAccessFlags;
import com.android.tools.r8.graph.ParameterAnnotationsList;
-import com.android.tools.r8.ir.desugar.CfL8ClassSynthesizer;
-import com.android.tools.r8.ir.desugar.CfL8ClassSynthesizerEventConsumer;
+import com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring;
+import com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer;
import com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer.DesugaredLibraryClasspathWrapperSynthesizeEventConsumer;
import com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer.DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer;
import com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.APIConverterConstructorCfCodeProvider;
@@ -93,7 +93,7 @@
// return new j$....BiFunction$-WRP(wrappedValue);
// }
// }
-public class DesugaredLibraryWrapperSynthesizer implements CfL8ClassSynthesizer {
+public class DesugaredLibraryWrapperSynthesizer implements CfClassSynthesizerDesugaring {
private final AppView<?> appView;
private final DexItemFactory factory;
@@ -633,7 +633,7 @@
// the wrappers with the conversion methods only, then the virtual methods assuming the
// conversion methods are present.
@Override
- public void synthesizeClasses(CfL8ClassSynthesizerEventConsumer eventConsumer) {
+ public void synthesizeClasses(CfClassSynthesizerDesugaringEventConsumer eventConsumer) {
DesugaredLibraryConfiguration conf = appView.options().desugaredLibraryConfiguration;
List<DexProgramClass> validClassesToWrap = new ArrayList<>();
for (DexType type : conf.getWrapperConversions()) {
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/itf/ProgramEmulatedInterfaceSynthesizer.java b/src/main/java/com/android/tools/r8/ir/desugar/itf/ProgramEmulatedInterfaceSynthesizer.java
index b31a38a..d68dec8 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/itf/ProgramEmulatedInterfaceSynthesizer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/itf/ProgramEmulatedInterfaceSynthesizer.java
@@ -13,8 +13,8 @@
import com.android.tools.r8.graph.DexType;
import com.android.tools.r8.graph.MethodAccessFlags;
import com.android.tools.r8.graph.ProgramMethod;
-import com.android.tools.r8.ir.desugar.CfL8ClassSynthesizer;
-import com.android.tools.r8.ir.desugar.CfL8ClassSynthesizerEventConsumer;
+import com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring;
+import com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer;
import com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer.L8ProgramEmulatedInterfaceSynthesizerEventConsumer;
import com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider;
import com.android.tools.r8.synthesis.SyntheticMethodBuilder;
@@ -33,7 +33,7 @@
import java.util.Map;
import java.util.Set;
-public final class ProgramEmulatedInterfaceSynthesizer implements CfL8ClassSynthesizer {
+public final class ProgramEmulatedInterfaceSynthesizer implements CfClassSynthesizerDesugaring {
private final AppView<?> appView;
private final InterfaceDesugaringSyntheticHelper helper;
@@ -226,7 +226,7 @@
}
@Override
- public void synthesizeClasses(CfL8ClassSynthesizerEventConsumer eventConsumer) {
+ public void synthesizeClasses(CfClassSynthesizerDesugaringEventConsumer eventConsumer) {
assert appView.options().isDesugaredLibraryCompilation();
for (DexType emulatedInterfaceType : helper.getEmulatedInterfaces()) {
DexClass emulatedInterfaceClazz = appView.definitionFor(emulatedInterfaceType);
