Rename profile rewriting event consumers
Change-Id: I00f0caad43b6703b0b5f17a493c8799fac3ba745
diff --git a/src/main/java/com/android/tools/r8/androidapi/ApiReferenceStubberEventConsumer.java b/src/main/java/com/android/tools/r8/androidapi/ApiReferenceStubberEventConsumer.java
index 7c42536..47b5efb 100644
--- a/src/main/java/com/android/tools/r8/androidapi/ApiReferenceStubberEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/androidapi/ApiReferenceStubberEventConsumer.java
@@ -7,7 +7,7 @@
import com.android.tools.r8.graph.AppView;
import com.android.tools.r8.graph.DexLibraryClass;
import com.android.tools.r8.graph.DexProgramClass;
-import com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingApiReferenceStubberEventConsumer;
+import com.android.tools.r8.profile.art.rewriting.ProfileRewritingApiReferenceStubberEventConsumer;
public interface ApiReferenceStubberEventConsumer {
@@ -21,7 +21,7 @@
boolean isEmpty();
static ApiReferenceStubberEventConsumer create(AppView<?> appView) {
- return ArtProfileRewritingApiReferenceStubberEventConsumer.attach(appView, empty());
+ return ProfileRewritingApiReferenceStubberEventConsumer.attach(appView, empty());
}
static EmptyApiReferenceStubberEventConsumer empty() {
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/MethodProcessorEventConsumer.java b/src/main/java/com/android/tools/r8/ir/conversion/MethodProcessorEventConsumer.java
index adb8af6..a14171a 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/MethodProcessorEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/MethodProcessorEventConsumer.java
@@ -12,8 +12,8 @@
import com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer;
import com.android.tools.r8.ir.optimize.api.InstanceInitializerOutlinerEventConsumer;
import com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer;
-import com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingMethodProcessorEventConsumer;
import com.android.tools.r8.profile.art.rewriting.ProfileCollectionAdditions;
+import com.android.tools.r8.profile.art.rewriting.ProfileRewritingMethodProcessorEventConsumer;
import com.android.tools.r8.shaking.AppInfoWithLiveness;
public abstract class MethodProcessorEventConsumer
@@ -27,13 +27,12 @@
public static MethodProcessorEventConsumer createForD8(
ProfileCollectionAdditions profileCollectionAdditions) {
- return ArtProfileRewritingMethodProcessorEventConsumer.attach(
- profileCollectionAdditions, empty());
+ return ProfileRewritingMethodProcessorEventConsumer.attach(profileCollectionAdditions, empty());
}
public static MethodProcessorEventConsumer createForR8(
AppView<? extends AppInfoWithClassHierarchy> appView) {
- return ArtProfileRewritingMethodProcessorEventConsumer.attach(appView, empty());
+ return ProfileRewritingMethodProcessorEventConsumer.attach(appView, empty());
}
public static MethodProcessorEventConsumer empty() {
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaringEventConsumer.java b/src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaringEventConsumer.java
index c9f85bd..0db5e13 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaringEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/CfClassSynthesizerDesugaringEventConsumer.java
@@ -14,8 +14,8 @@
import com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer.L8ProgramEmulatedInterfaceSynthesizerEventConsumer;
import com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer.RecordClassSynthesizerDesugaringEventConsumer;
import com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer;
-import com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingCfClassSynthesizerDesugaringEventConsumer;
import com.android.tools.r8.profile.art.rewriting.ProfileCollectionAdditions;
+import com.android.tools.r8.profile.art.rewriting.ProfileRewritingCfClassSynthesizerDesugaringEventConsumer;
import com.google.common.collect.Sets;
import java.util.Set;
@@ -32,7 +32,7 @@
AppView<?> appView, ProfileCollectionAdditions profileCollectionAdditions) {
CfClassSynthesizerDesugaringEventConsumer eventConsumer =
new D8R8CfClassSynthesizerDesugaringEventConsumer();
- return ArtProfileRewritingCfClassSynthesizerDesugaringEventConsumer.attach(
+ return ProfileRewritingCfClassSynthesizerDesugaringEventConsumer.attach(
appView, eventConsumer, profileCollectionAdditions);
}
@@ -40,8 +40,7 @@
AppView<? extends AppInfoWithClassHierarchy> appView) {
CfClassSynthesizerDesugaringEventConsumer eventConsumer =
new D8R8CfClassSynthesizerDesugaringEventConsumer();
- return ArtProfileRewritingCfClassSynthesizerDesugaringEventConsumer.attach(
- appView, eventConsumer);
+ return ProfileRewritingCfClassSynthesizerDesugaringEventConsumer.attach(appView, eventConsumer);
}
public void finished(AppView<? extends AppInfoWithClassHierarchy> appView) {}
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/CfInstructionDesugaringEventConsumer.java b/src/main/java/com/android/tools/r8/ir/desugar/CfInstructionDesugaringEventConsumer.java
index dc0a243..509a1ff 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/CfInstructionDesugaringEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/CfInstructionDesugaringEventConsumer.java
@@ -32,8 +32,8 @@
import com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer.RecordInstructionDesugaringEventConsumer;
import com.android.tools.r8.ir.desugar.twr.TwrCloseResourceDesugaringEventConsumer;
import com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer;
-import com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingCfInstructionDesugaringEventConsumer;
import com.android.tools.r8.profile.art.rewriting.ProfileCollectionAdditions;
+import com.android.tools.r8.profile.art.rewriting.ProfileRewritingCfInstructionDesugaringEventConsumer;
import com.android.tools.r8.shaking.Enqueuer.SyntheticAdditions;
import com.android.tools.r8.shaking.KeepMethodInfo.Joiner;
import com.google.common.collect.Sets;
@@ -77,7 +77,7 @@
new D8CfInstructionDesugaringEventConsumer(
appView, classConverterResultBuilder, methodProcessor);
CfInstructionDesugaringEventConsumer outermostEventConsumer =
- ArtProfileRewritingCfInstructionDesugaringEventConsumer.attach(
+ ProfileRewritingCfInstructionDesugaringEventConsumer.attach(
appView, profileCollectionAdditions, eventConsumer);
eventConsumer.setOutermostEventConsumer(outermostEventConsumer);
return outermostEventConsumer;
@@ -99,7 +99,7 @@
twrCloseResourceMethodConsumer,
additions,
companionMethodConsumer);
- return ArtProfileRewritingCfInstructionDesugaringEventConsumer.attach(
+ return ProfileRewritingCfInstructionDesugaringEventConsumer.attach(
appView, profileCollectionAdditions, eventConsumer);
}
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/CfPostProcessingDesugaringEventConsumer.java b/src/main/java/com/android/tools/r8/ir/desugar/CfPostProcessingDesugaringEventConsumer.java
index 25d13ca..adeecfe 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/CfPostProcessingDesugaringEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/CfPostProcessingDesugaringEventConsumer.java
@@ -18,8 +18,8 @@
import com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer.DesugaredLibraryRetargeterPostProcessingEventConsumer;
import com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper;
import com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer;
-import com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingCfPostProcessingDesugaringEventConsumer;
import com.android.tools.r8.profile.art.rewriting.ProfileCollectionAdditions;
+import com.android.tools.r8.profile.art.rewriting.ProfileRewritingCfPostProcessingDesugaringEventConsumer;
import com.android.tools.r8.shaking.Enqueuer.SyntheticAdditions;
import com.android.tools.r8.utils.collections.ProgramMethodSet;
import java.util.Collections;
@@ -44,7 +44,7 @@
CfInstructionDesugaringCollection instructionDesugaring) {
CfPostProcessingDesugaringEventConsumer eventConsumer =
new D8CfPostProcessingDesugaringEventConsumer(methodProcessor, instructionDesugaring);
- return ArtProfileRewritingCfPostProcessingDesugaringEventConsumer.attach(
+ return ProfileRewritingCfPostProcessingDesugaringEventConsumer.attach(
appView, profileCollectionAdditions, eventConsumer);
}
@@ -56,7 +56,7 @@
BiConsumer<DexProgramClass, DexType> missingClassConsumer) {
CfPostProcessingDesugaringEventConsumer eventConsumer =
new R8PostProcessingDesugaringEventConsumer(additions, desugaring, missingClassConsumer);
- return ArtProfileRewritingCfPostProcessingDesugaringEventConsumer.attach(
+ return ProfileRewritingCfPostProcessingDesugaringEventConsumer.attach(
appView, profileCollectionAdditions, eventConsumer);
}
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformerEventConsumer.java b/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformerEventConsumer.java
index d57d175..86c74d8 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformerEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformerEventConsumer.java
@@ -5,8 +5,8 @@
package com.android.tools.r8.ir.desugar;
import com.android.tools.r8.graph.ProgramMethod;
-import com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer;
import com.android.tools.r8.profile.art.rewriting.ProfileCollectionAdditions;
+import com.android.tools.r8.profile.art.rewriting.ProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer;
public interface CovariantReturnTypeAnnotationTransformerEventConsumer {
@@ -17,7 +17,7 @@
if (profileCollectionAdditions.isNop()) {
return empty();
}
- return ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.attach(
+ return ProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.attach(
profileCollectionAdditions, empty());
}
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/nest/D8NestBasedAccessDesugaring.java b/src/main/java/com/android/tools/r8/ir/desugar/nest/D8NestBasedAccessDesugaring.java
index 8f3bbcc..4e037ad 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/nest/D8NestBasedAccessDesugaring.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/nest/D8NestBasedAccessDesugaring.java
@@ -18,7 +18,7 @@
import com.android.tools.r8.graph.ProgramMethod;
import com.android.tools.r8.graph.UseRegistry;
import com.android.tools.r8.ir.conversion.D8MethodProcessor;
-import com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingNestBasedAccessDesugaringEventConsumer;
+import com.android.tools.r8.profile.art.rewriting.ProfileRewritingNestBasedAccessDesugaringEventConsumer;
import com.android.tools.r8.utils.ThreadUtils;
import com.google.common.collect.Iterables;
import java.util.ArrayList;
@@ -92,7 +92,7 @@
});
NestBasedAccessDesugaringEventConsumer eventConsumer =
- ArtProfileRewritingNestBasedAccessDesugaringEventConsumer.attach(
+ ProfileRewritingNestBasedAccessDesugaringEventConsumer.attach(
methodProcessor.getProfileCollectionAdditions(),
new NestBasedAccessDesugaringEventConsumer() {
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/outliner/OutlineOptimizationEventConsumer.java b/src/main/java/com/android/tools/r8/ir/optimize/outliner/OutlineOptimizationEventConsumer.java
index 86ac8ab..d9e8a39 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/outliner/OutlineOptimizationEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/outliner/OutlineOptimizationEventConsumer.java
@@ -6,7 +6,7 @@
import com.android.tools.r8.graph.AppView;
import com.android.tools.r8.graph.ProgramMethod;
-import com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingOutlineOptimizationEventConsumer;
+import com.android.tools.r8.profile.art.rewriting.ProfileRewritingOutlineOptimizationEventConsumer;
import com.android.tools.r8.shaking.AppInfoWithLiveness;
import java.util.Collection;
@@ -17,7 +17,7 @@
void finished(AppView<AppInfoWithLiveness> appView);
static OutlineOptimizationEventConsumer create(AppView<AppInfoWithLiveness> appView) {
- return ArtProfileRewritingOutlineOptimizationEventConsumer.attach(appView, empty());
+ return ProfileRewritingOutlineOptimizationEventConsumer.attach(appView, empty());
}
static EmptyOutlineOptimizationEventConsumer empty() {
diff --git a/src/main/java/com/android/tools/r8/optimize/MemberRebindingEventConsumer.java b/src/main/java/com/android/tools/r8/optimize/MemberRebindingEventConsumer.java
index dff6597..c6d1656 100644
--- a/src/main/java/com/android/tools/r8/optimize/MemberRebindingEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/optimize/MemberRebindingEventConsumer.java
@@ -7,7 +7,7 @@
import com.android.tools.r8.graph.AppView;
import com.android.tools.r8.graph.DexClassAndMethod;
import com.android.tools.r8.graph.ProgramMethod;
-import com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingMemberRebindingEventConsumer;
+import com.android.tools.r8.profile.art.rewriting.ProfileRewritingMemberRebindingEventConsumer;
import com.android.tools.r8.shaking.AppInfoWithLiveness;
public interface MemberRebindingEventConsumer {
@@ -19,7 +19,7 @@
AppView<AppInfoWithLiveness> appView, MemberRebindingLens memberRebindingLens) {}
static MemberRebindingEventConsumer create(AppView<AppInfoWithLiveness> appView) {
- return ArtProfileRewritingMemberRebindingEventConsumer.attach(appView, empty());
+ return ProfileRewritingMemberRebindingEventConsumer.attach(appView, empty());
}
static EmptyMemberRebindingEventConsumer empty() {
diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagatorSyntheticEventConsumer.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagatorSyntheticEventConsumer.java
index 799cd92..397a23f 100644
--- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagatorSyntheticEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagatorSyntheticEventConsumer.java
@@ -7,7 +7,7 @@
import com.android.tools.r8.graph.AppView;
import com.android.tools.r8.graph.DexProgramClass;
import com.android.tools.r8.graph.ProgramMethod;
-import com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingArgumentPropagatorSyntheticEventConsumer;
+import com.android.tools.r8.profile.art.rewriting.ProfileRewritingArgumentPropagatorSyntheticEventConsumer;
import com.android.tools.r8.shaking.AppInfoWithLiveness;
public interface ArgumentPropagatorSyntheticEventConsumer {
@@ -17,7 +17,7 @@
void finished(AppView<AppInfoWithLiveness> appView);
static ArgumentPropagatorSyntheticEventConsumer create(AppView<AppInfoWithLiveness> appView) {
- return ArtProfileRewritingArgumentPropagatorSyntheticEventConsumer.attach(appView, empty());
+ return ProfileRewritingArgumentPropagatorSyntheticEventConsumer.attach(appView, empty());
}
static ArgumentPropagatorSyntheticEventConsumer empty() {
diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingApiReferenceStubberEventConsumer.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingApiReferenceStubberEventConsumer.java
similarity index 91%
rename from src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingApiReferenceStubberEventConsumer.java
rename to src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingApiReferenceStubberEventConsumer.java
index e38d7db..4f7f76c 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingApiReferenceStubberEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingApiReferenceStubberEventConsumer.java
@@ -11,13 +11,13 @@
import com.android.tools.r8.graph.DexLibraryClass;
import com.android.tools.r8.graph.DexProgramClass;
-public class ArtProfileRewritingApiReferenceStubberEventConsumer
+public class ProfileRewritingApiReferenceStubberEventConsumer
implements ApiReferenceStubberEventConsumer {
private final ConcreteProfileCollectionAdditions collectionAdditions;
private final ApiReferenceStubberEventConsumer parent;
- private ArtProfileRewritingApiReferenceStubberEventConsumer(
+ private ProfileRewritingApiReferenceStubberEventConsumer(
ConcreteProfileCollectionAdditions collectionAdditions,
ApiReferenceStubberEventConsumer parent) {
this.collectionAdditions = collectionAdditions;
@@ -30,7 +30,7 @@
ProfileCollectionAdditions profileCollectionAdditions =
ProfileCollectionAdditions.create(appView);
if (!profileCollectionAdditions.isNop()) {
- return new ArtProfileRewritingApiReferenceStubberEventConsumer(
+ return new ProfileRewritingApiReferenceStubberEventConsumer(
profileCollectionAdditions.asConcrete(), eventConsumer);
}
}
diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingArgumentPropagatorSyntheticEventConsumer.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingArgumentPropagatorSyntheticEventConsumer.java
similarity index 89%
rename from src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingArgumentPropagatorSyntheticEventConsumer.java
rename to src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingArgumentPropagatorSyntheticEventConsumer.java
index 85d10f6..dece00f 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingArgumentPropagatorSyntheticEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingArgumentPropagatorSyntheticEventConsumer.java
@@ -10,13 +10,13 @@
import com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer;
import com.android.tools.r8.shaking.AppInfoWithLiveness;
-public class ArtProfileRewritingArgumentPropagatorSyntheticEventConsumer
+public class ProfileRewritingArgumentPropagatorSyntheticEventConsumer
implements ArgumentPropagatorSyntheticEventConsumer {
private final ConcreteProfileCollectionAdditions additionsCollection;
private final ArgumentPropagatorSyntheticEventConsumer parent;
- private ArtProfileRewritingArgumentPropagatorSyntheticEventConsumer(
+ private ProfileRewritingArgumentPropagatorSyntheticEventConsumer(
ConcreteProfileCollectionAdditions additionsCollection,
ArgumentPropagatorSyntheticEventConsumer parent) {
this.additionsCollection = additionsCollection;
@@ -30,7 +30,7 @@
if (additionsCollection.isNop()) {
return eventConsumer;
}
- return new ArtProfileRewritingArgumentPropagatorSyntheticEventConsumer(
+ return new ProfileRewritingArgumentPropagatorSyntheticEventConsumer(
additionsCollection.asConcrete(), eventConsumer);
}
diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCfClassSynthesizerDesugaringEventConsumer.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingCfClassSynthesizerDesugaringEventConsumer.java
similarity index 92%
rename from src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCfClassSynthesizerDesugaringEventConsumer.java
rename to src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingCfClassSynthesizerDesugaringEventConsumer.java
index f4d7bf2..2d0f51c 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCfClassSynthesizerDesugaringEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingCfClassSynthesizerDesugaringEventConsumer.java
@@ -4,7 +4,7 @@
package com.android.tools.r8.profile.art.rewriting;
-import static com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingVarHandleDesugaringEventConsumerUtils.handleVarHandleDesugaringClassContext;
+import static com.android.tools.r8.profile.art.rewriting.ProfileRewritingVarHandleDesugaringEventConsumerUtils.handleVarHandleDesugaringClassContext;
import com.android.tools.r8.graph.AppInfoWithClassHierarchy;
import com.android.tools.r8.graph.AppView;
@@ -15,14 +15,14 @@
import com.android.tools.r8.profile.art.ArtProfileOptions;
import java.util.Set;
-public class ArtProfileRewritingCfClassSynthesizerDesugaringEventConsumer
+public class ProfileRewritingCfClassSynthesizerDesugaringEventConsumer
extends CfClassSynthesizerDesugaringEventConsumer {
private final ConcreteProfileCollectionAdditions additionsCollection;
private final ArtProfileOptions options;
private final CfClassSynthesizerDesugaringEventConsumer parent;
- private ArtProfileRewritingCfClassSynthesizerDesugaringEventConsumer(
+ private ProfileRewritingCfClassSynthesizerDesugaringEventConsumer(
ConcreteProfileCollectionAdditions additionsCollection,
ArtProfileOptions options,
CfClassSynthesizerDesugaringEventConsumer parent) {
@@ -43,7 +43,7 @@
if (profileCollectionAdditions.isNop()) {
return eventConsumer;
}
- return new ArtProfileRewritingCfClassSynthesizerDesugaringEventConsumer(
+ return new ProfileRewritingCfClassSynthesizerDesugaringEventConsumer(
profileCollectionAdditions.asConcrete(),
appView.options().getArtProfileOptions(),
eventConsumer);
diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCfInstructionDesugaringEventConsumer.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingCfInstructionDesugaringEventConsumer.java
similarity index 97%
rename from src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCfInstructionDesugaringEventConsumer.java
rename to src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingCfInstructionDesugaringEventConsumer.java
index b4ee507..60a9e96 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCfInstructionDesugaringEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingCfInstructionDesugaringEventConsumer.java
@@ -4,7 +4,7 @@
package com.android.tools.r8.profile.art.rewriting;
-import static com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingVarHandleDesugaringEventConsumerUtils.handleVarHandleDesugaringClassContext;
+import static com.android.tools.r8.profile.art.rewriting.ProfileRewritingVarHandleDesugaringEventConsumerUtils.handleVarHandleDesugaringClassContext;
import com.android.tools.r8.graph.AppView;
import com.android.tools.r8.graph.DexClassAndMethod;
@@ -22,7 +22,7 @@
import com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer;
import java.util.List;
-public class ArtProfileRewritingCfInstructionDesugaringEventConsumer
+public class ProfileRewritingCfInstructionDesugaringEventConsumer
extends CfInstructionDesugaringEventConsumer {
private final AppView<?> appView;
@@ -31,7 +31,7 @@
private final NestBasedAccessDesugaringEventConsumer nestBasedAccessDesugaringEventConsumer;
- private ArtProfileRewritingCfInstructionDesugaringEventConsumer(
+ private ProfileRewritingCfInstructionDesugaringEventConsumer(
AppView<?> appView,
ConcreteProfileCollectionAdditions additionsCollection,
CfInstructionDesugaringEventConsumer parent) {
@@ -39,7 +39,7 @@
this.additionsCollection = additionsCollection;
this.parent = parent;
this.nestBasedAccessDesugaringEventConsumer =
- ArtProfileRewritingNestBasedAccessDesugaringEventConsumer.attach(
+ ProfileRewritingNestBasedAccessDesugaringEventConsumer.attach(
additionsCollection, NestBasedAccessDesugaringEventConsumer.empty());
}
@@ -50,7 +50,7 @@
if (profileCollectionAdditions.isNop()) {
return eventConsumer;
}
- return new ArtProfileRewritingCfInstructionDesugaringEventConsumer(
+ return new ProfileRewritingCfInstructionDesugaringEventConsumer(
appView, profileCollectionAdditions.asConcrete(), eventConsumer);
}
diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCfPostProcessingDesugaringEventConsumer.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingCfPostProcessingDesugaringEventConsumer.java
similarity index 96%
rename from src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCfPostProcessingDesugaringEventConsumer.java
rename to src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingCfPostProcessingDesugaringEventConsumer.java
index 3012624..5402a78 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCfPostProcessingDesugaringEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingCfPostProcessingDesugaringEventConsumer.java
@@ -23,14 +23,14 @@
import java.util.Set;
import java.util.concurrent.ExecutionException;
-public class ArtProfileRewritingCfPostProcessingDesugaringEventConsumer
+public class ProfileRewritingCfPostProcessingDesugaringEventConsumer
extends CfPostProcessingDesugaringEventConsumer {
private final ConcreteProfileCollectionAdditions additionsCollection;
private final ArtProfileOptions options;
private final CfPostProcessingDesugaringEventConsumer parent;
- private ArtProfileRewritingCfPostProcessingDesugaringEventConsumer(
+ private ProfileRewritingCfPostProcessingDesugaringEventConsumer(
ConcreteProfileCollectionAdditions additionsCollection,
ArtProfileOptions options,
CfPostProcessingDesugaringEventConsumer parent) {
@@ -46,7 +46,7 @@
if (profileCollectionAdditions.isNop()) {
return eventConsumer;
}
- return new ArtProfileRewritingCfPostProcessingDesugaringEventConsumer(
+ return new ProfileRewritingCfPostProcessingDesugaringEventConsumer(
profileCollectionAdditions.asConcrete(),
appView.options().getArtProfileOptions(),
eventConsumer);
diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.java
similarity index 84%
rename from src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.java
rename to src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.java
index 6b5b24d..32c6d73 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.java
@@ -7,13 +7,13 @@
import com.android.tools.r8.graph.ProgramMethod;
import com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer;
-public class ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer
+public class ProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer
implements CovariantReturnTypeAnnotationTransformerEventConsumer {
private final ConcreteProfileCollectionAdditions additionsCollection;
private final CovariantReturnTypeAnnotationTransformerEventConsumer parent;
- private ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer(
+ private ProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer(
ConcreteProfileCollectionAdditions additionsCollection,
CovariantReturnTypeAnnotationTransformerEventConsumer parent) {
this.additionsCollection = additionsCollection;
@@ -26,7 +26,7 @@
if (additionsCollection.isNop()) {
return eventConsumer;
}
- return new ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer(
+ return new ProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer(
additionsCollection.asConcrete(), eventConsumer);
}
diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingMemberRebindingEventConsumer.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingMemberRebindingEventConsumer.java
similarity index 89%
rename from src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingMemberRebindingEventConsumer.java
rename to src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingMemberRebindingEventConsumer.java
index 68ca803..1c9b0a5 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingMemberRebindingEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingMemberRebindingEventConsumer.java
@@ -13,13 +13,12 @@
import com.android.tools.r8.optimize.MemberRebindingLens;
import com.android.tools.r8.shaking.AppInfoWithLiveness;
-public class ArtProfileRewritingMemberRebindingEventConsumer
- implements MemberRebindingEventConsumer {
+public class ProfileRewritingMemberRebindingEventConsumer implements MemberRebindingEventConsumer {
private final ConcreteProfileCollectionAdditions additionsCollection;
private final MemberRebindingEventConsumer parent;
- private ArtProfileRewritingMemberRebindingEventConsumer(
+ private ProfileRewritingMemberRebindingEventConsumer(
ConcreteProfileCollectionAdditions additionsCollection, MemberRebindingEventConsumer parent) {
this.additionsCollection = additionsCollection;
this.parent = parent;
@@ -31,7 +30,7 @@
if (additionsCollection.isNop()) {
return eventConsumer;
}
- return new ArtProfileRewritingMemberRebindingEventConsumer(
+ return new ProfileRewritingMemberRebindingEventConsumer(
additionsCollection.asConcrete(), eventConsumer);
}
diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingMethodProcessorEventConsumer.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingMethodProcessorEventConsumer.java
similarity index 95%
rename from src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingMethodProcessorEventConsumer.java
rename to src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingMethodProcessorEventConsumer.java
index 9b881a9..c5193da 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingMethodProcessorEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingMethodProcessorEventConsumer.java
@@ -9,12 +9,12 @@
import com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer;
import com.android.tools.r8.shaking.AppInfoWithLiveness;
-public class ArtProfileRewritingMethodProcessorEventConsumer extends MethodProcessorEventConsumer {
+public class ProfileRewritingMethodProcessorEventConsumer extends MethodProcessorEventConsumer {
private final ConcreteProfileCollectionAdditions additionsCollection;
private final MethodProcessorEventConsumer parent;
- private ArtProfileRewritingMethodProcessorEventConsumer(
+ private ProfileRewritingMethodProcessorEventConsumer(
ConcreteProfileCollectionAdditions additionsCollection, MethodProcessorEventConsumer parent) {
this.additionsCollection = additionsCollection;
this.parent = parent;
@@ -26,7 +26,7 @@
if (additionsCollection.isNop()) {
return eventConsumer;
}
- return new ArtProfileRewritingMethodProcessorEventConsumer(
+ return new ProfileRewritingMethodProcessorEventConsumer(
additionsCollection.asConcrete(), eventConsumer);
}
@@ -36,7 +36,7 @@
if (profileCollectionAdditions.isNop()) {
return eventConsumer;
}
- return new ArtProfileRewritingMethodProcessorEventConsumer(
+ return new ProfileRewritingMethodProcessorEventConsumer(
profileCollectionAdditions.asConcrete(), eventConsumer);
}
diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingNestBasedAccessDesugaringEventConsumer.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingNestBasedAccessDesugaringEventConsumer.java
similarity index 93%
rename from src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingNestBasedAccessDesugaringEventConsumer.java
rename to src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingNestBasedAccessDesugaringEventConsumer.java
index 0978cec..28552b5 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingNestBasedAccessDesugaringEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingNestBasedAccessDesugaringEventConsumer.java
@@ -12,13 +12,13 @@
import com.android.tools.r8.graph.ProgramMethod;
import com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer;
-public class ArtProfileRewritingNestBasedAccessDesugaringEventConsumer
+public class ProfileRewritingNestBasedAccessDesugaringEventConsumer
implements NestBasedAccessDesugaringEventConsumer {
private final ConcreteProfileCollectionAdditions additionsCollection;
private final NestBasedAccessDesugaringEventConsumer parent;
- private ArtProfileRewritingNestBasedAccessDesugaringEventConsumer(
+ private ProfileRewritingNestBasedAccessDesugaringEventConsumer(
ConcreteProfileCollectionAdditions additionsCollection,
NestBasedAccessDesugaringEventConsumer parent) {
this.additionsCollection = additionsCollection;
@@ -31,7 +31,7 @@
if (additionsCollection.isNop()) {
return eventConsumer;
}
- return new ArtProfileRewritingNestBasedAccessDesugaringEventConsumer(
+ return new ProfileRewritingNestBasedAccessDesugaringEventConsumer(
additionsCollection.asConcrete(), eventConsumer);
}
diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingOutlineOptimizationEventConsumer.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingOutlineOptimizationEventConsumer.java
similarity index 90%
rename from src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingOutlineOptimizationEventConsumer.java
rename to src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingOutlineOptimizationEventConsumer.java
index e129422..4343c25 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingOutlineOptimizationEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingOutlineOptimizationEventConsumer.java
@@ -10,13 +10,13 @@
import com.android.tools.r8.shaking.AppInfoWithLiveness;
import java.util.Collection;
-public class ArtProfileRewritingOutlineOptimizationEventConsumer
+public class ProfileRewritingOutlineOptimizationEventConsumer
implements OutlineOptimizationEventConsumer {
private final ConcreteProfileCollectionAdditions additionsCollection;
private final OutlineOptimizationEventConsumer parent;
- private ArtProfileRewritingOutlineOptimizationEventConsumer(
+ private ProfileRewritingOutlineOptimizationEventConsumer(
ConcreteProfileCollectionAdditions additionsCollection,
OutlineOptimizationEventConsumer parent) {
this.additionsCollection = additionsCollection;
@@ -29,7 +29,7 @@
if (additionsCollection.isNop()) {
return eventConsumer;
}
- return new ArtProfileRewritingOutlineOptimizationEventConsumer(
+ return new ProfileRewritingOutlineOptimizationEventConsumer(
additionsCollection.asConcrete(), eventConsumer);
}
diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingRootSetBuilderEventConsumer.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingRootSetBuilderEventConsumer.java
similarity index 91%
rename from src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingRootSetBuilderEventConsumer.java
rename to src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingRootSetBuilderEventConsumer.java
index 9ccd78b..9b9d6a5 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingRootSetBuilderEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingRootSetBuilderEventConsumer.java
@@ -7,12 +7,12 @@
import com.android.tools.r8.graph.ProgramMethod;
import com.android.tools.r8.shaking.RootSetBuilderEventConsumer;
-public class ArtProfileRewritingRootSetBuilderEventConsumer implements RootSetBuilderEventConsumer {
+public class ProfileRewritingRootSetBuilderEventConsumer implements RootSetBuilderEventConsumer {
private final ConcreteProfileCollectionAdditions additionsCollection;
private final RootSetBuilderEventConsumer parent;
- private ArtProfileRewritingRootSetBuilderEventConsumer(
+ private ProfileRewritingRootSetBuilderEventConsumer(
ConcreteProfileCollectionAdditions additionsCollection, RootSetBuilderEventConsumer parent) {
this.additionsCollection = additionsCollection;
this.parent = parent;
@@ -23,7 +23,7 @@
if (additionsCollection.isNop()) {
return eventConsumer;
}
- return new ArtProfileRewritingRootSetBuilderEventConsumer(
+ return new ProfileRewritingRootSetBuilderEventConsumer(
additionsCollection.asConcrete(), eventConsumer);
}
diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingVarHandleDesugaringEventConsumerUtils.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingVarHandleDesugaringEventConsumerUtils.java
similarity index 94%
rename from src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingVarHandleDesugaringEventConsumerUtils.java
rename to src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingVarHandleDesugaringEventConsumerUtils.java
index 4d2e9b8..8792769 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingVarHandleDesugaringEventConsumerUtils.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ProfileRewritingVarHandleDesugaringEventConsumerUtils.java
@@ -10,7 +10,7 @@
import com.android.tools.r8.graph.ProgramDefinition;
import com.android.tools.r8.profile.art.ArtProfileOptions;
-public class ArtProfileRewritingVarHandleDesugaringEventConsumerUtils {
+public class ProfileRewritingVarHandleDesugaringEventConsumerUtils {
static void handleVarHandleDesugaringClassContext(
DexProgramClass varHandleClass,
diff --git a/src/main/java/com/android/tools/r8/shaking/RootSetBuilderEventConsumer.java b/src/main/java/com/android/tools/r8/shaking/RootSetBuilderEventConsumer.java
index 4f6967c..4102d80 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetBuilderEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetBuilderEventConsumer.java
@@ -6,14 +6,13 @@
import com.android.tools.r8.graph.ProgramMethod;
import com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer;
-import com.android.tools.r8.profile.art.rewriting.ArtProfileRewritingRootSetBuilderEventConsumer;
import com.android.tools.r8.profile.art.rewriting.ProfileCollectionAdditions;
+import com.android.tools.r8.profile.art.rewriting.ProfileRewritingRootSetBuilderEventConsumer;
public interface RootSetBuilderEventConsumer extends InterfaceMethodDesugaringBaseEventConsumer {
static RootSetBuilderEventConsumer create(ProfileCollectionAdditions profileCollectionAdditions) {
- return ArtProfileRewritingRootSetBuilderEventConsumer.attach(
- profileCollectionAdditions, empty());
+ return ProfileRewritingRootSetBuilderEventConsumer.attach(profileCollectionAdditions, empty());
}
static EmptyRootSetBuilderEventConsumer empty() {
