Rename getStartupOrder() to getStartupProfile()
Change-Id: If161c6c5a0cd469aa9382fc1c1c3bf81fd36b198
diff --git a/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java b/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java
index 2f68a94..e434115 100644
--- a/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java
+++ b/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java
@@ -243,7 +243,7 @@
// order is only used for writing the app, so we create it here for the first time.
StartupProfile startupProfile =
appView.appInfo().hasClassHierarchy()
- ? appView.getStartupOrder()
+ ? appView.getStartupProfile()
: StartupProfile.createInitialStartupOrderForD8(appView);
distributor =
new VirtualFile.FillFilesDistributor(
diff --git a/src/main/java/com/android/tools/r8/experimental/startup/StartupCompleteness.java b/src/main/java/com/android/tools/r8/experimental/startup/StartupCompleteness.java
index c7ae80d..2fa1094 100644
--- a/src/main/java/com/android/tools/r8/experimental/startup/StartupCompleteness.java
+++ b/src/main/java/com/android/tools/r8/experimental/startup/StartupCompleteness.java
@@ -26,7 +26,7 @@
this.appView = appView;
this.startupProfile =
appView.hasClassHierarchy()
- ? appView.getStartupOrder()
+ ? appView.getStartupProfile()
: StartupProfile.createInitialStartupOrder(appView.options(), null);
}
diff --git a/src/main/java/com/android/tools/r8/features/ClassToFeatureSplitMap.java b/src/main/java/com/android/tools/r8/features/ClassToFeatureSplitMap.java
index db1c46f..dc33db7 100644
--- a/src/main/java/com/android/tools/r8/features/ClassToFeatureSplitMap.java
+++ b/src/main/java/com/android/tools/r8/features/ClassToFeatureSplitMap.java
@@ -106,7 +106,7 @@
public Map<FeatureSplit, Set<DexProgramClass>> getFeatureSplitClasses(
Set<DexProgramClass> classes, AppView<? extends AppInfoWithClassHierarchy> appView) {
return getFeatureSplitClasses(
- classes, appView.options(), appView.getStartupOrder(), appView.getSyntheticItems());
+ classes, appView.options(), appView.getStartupProfile(), appView.getSyntheticItems());
}
public Map<FeatureSplit, Set<DexProgramClass>> getFeatureSplitClasses(
@@ -127,7 +127,7 @@
public FeatureSplit getFeatureSplit(
ProgramDefinition definition, AppView<? extends AppInfoWithClassHierarchy> appView) {
return getFeatureSplit(
- definition, appView.options(), appView.getStartupOrder(), appView.getSyntheticItems());
+ definition, appView.options(), appView.getStartupProfile(), appView.getSyntheticItems());
}
public FeatureSplit getFeatureSplit(
@@ -141,7 +141,7 @@
public FeatureSplit getFeatureSplit(
DexType type, AppView<? extends AppInfoWithClassHierarchy> appView) {
return getFeatureSplit(
- type, appView.options(), appView.getStartupOrder(), appView.getSyntheticItems());
+ type, appView.options(), appView.getStartupProfile(), appView.getSyntheticItems());
}
public FeatureSplit getFeatureSplit(
@@ -193,7 +193,7 @@
public boolean isInBase(
DexProgramClass clazz, AppView<? extends AppInfoWithClassHierarchy> appView) {
return isInBase(
- clazz, appView.options(), appView.getStartupOrder(), appView.getSyntheticItems());
+ clazz, appView.options(), appView.getStartupProfile(), appView.getSyntheticItems());
}
public boolean isInBase(
@@ -209,7 +209,11 @@
ProgramDefinition context,
AppView<? extends AppInfoWithClassHierarchy> appView) {
return isInBaseOrSameFeatureAs(
- clazz, context, appView.options(), appView.getStartupOrder(), appView.getSyntheticItems());
+ clazz,
+ context,
+ appView.options(),
+ appView.getStartupProfile(),
+ appView.getSyntheticItems());
}
public boolean isInBaseOrSameFeatureAs(
@@ -227,7 +231,11 @@
ProgramDefinition context,
AppView<? extends AppInfoWithClassHierarchy> appView) {
return isInBaseOrSameFeatureAs(
- clazz, context, appView.options(), appView.getStartupOrder(), appView.getSyntheticItems());
+ clazz,
+ context,
+ appView.options(),
+ appView.getStartupProfile(),
+ appView.getSyntheticItems());
}
public boolean isInBaseOrSameFeatureAs(
@@ -252,7 +260,7 @@
public boolean isInSameFeatureOrBothInSameBase(
ProgramMethod a, ProgramMethod b, AppView<? extends AppInfoWithClassHierarchy> appView) {
return isInSameFeatureOrBothInSameBase(
- a, b, appView.options(), appView.getStartupOrder(), appView.getSyntheticItems());
+ a, b, appView.options(), appView.getStartupProfile(), appView.getSyntheticItems());
}
public boolean isInSameFeatureOrBothInSameBase(
@@ -268,7 +276,7 @@
public boolean isInSameFeatureOrBothInSameBase(
DexProgramClass a, DexProgramClass b, AppView<? extends AppInfoWithClassHierarchy> appView) {
return isInSameFeatureOrBothInSameBase(
- a, b, appView.options(), appView.getStartupOrder(), appView.getSyntheticItems());
+ a, b, appView.options(), appView.getStartupProfile(), appView.getSyntheticItems());
}
public boolean isInSameFeatureOrBothInSameBase(
@@ -321,6 +329,6 @@
DexProgramClass clazz, AppView<? extends AppInfoWithClassHierarchy> appView) {
return getMap(appView)
.isInFeature(
- clazz, appView.options(), appView.getStartupOrder(), appView.getSyntheticItems());
+ clazz, appView.options(), appView.getStartupProfile(), appView.getSyntheticItems());
}
}
diff --git a/src/main/java/com/android/tools/r8/features/FeatureSplitBoundaryOptimizationUtils.java b/src/main/java/com/android/tools/r8/features/FeatureSplitBoundaryOptimizationUtils.java
index 8badf5b..37f1494 100644
--- a/src/main/java/com/android/tools/r8/features/FeatureSplitBoundaryOptimizationUtils.java
+++ b/src/main/java/com/android/tools/r8/features/FeatureSplitBoundaryOptimizationUtils.java
@@ -66,7 +66,7 @@
}
// Next perform startup checks.
- StartupProfile startupProfile = appView.getStartupOrder();
+ StartupProfile startupProfile = appView.getStartupProfile();
OptionalBool callerIsStartupMethod = isStartupMethod(caller, startupProfile);
if (callerIsStartupMethod.isTrue()) {
// If the caller is a startup method, then only allow inlining if the callee is also a startup
@@ -113,7 +113,7 @@
// If the source class is a startup class then require that the target class is also a startup
// class.
- StartupProfile startupProfile = appView.getStartupOrder();
+ StartupProfile startupProfile = appView.getStartupProfile();
if (startupProfile.containsClassRule(sourceClass.getType())
&& !startupProfile.containsClassRule(targetClass.getType())) {
return false;
diff --git a/src/main/java/com/android/tools/r8/graph/AccessControl.java b/src/main/java/com/android/tools/r8/graph/AccessControl.java
index eac86b3..ecb1640 100644
--- a/src/main/java/com/android/tools/r8/graph/AccessControl.java
+++ b/src/main/java/com/android/tools/r8/graph/AccessControl.java
@@ -27,7 +27,7 @@
context,
appView.appInfo().getClassToFeatureSplitMap(),
appView.options(),
- appView.getStartupOrder(),
+ appView.getStartupProfile(),
appView.getSyntheticItems());
}
@@ -91,7 +91,7 @@
context,
appInfo.getClassToFeatureSplitMap(),
appInfo.options(),
- appView.getStartupOrder(),
+ appView.getStartupProfile(),
appInfo.getSyntheticItems());
if (classAccessibility.isFalse()) {
return OptionalBool.FALSE;
diff --git a/src/main/java/com/android/tools/r8/graph/AppView.java b/src/main/java/com/android/tools/r8/graph/AppView.java
index 5bf8bd1..d7d5948 100644
--- a/src/main/java/com/android/tools/r8/graph/AppView.java
+++ b/src/main/java/com/android/tools/r8/graph/AppView.java
@@ -377,11 +377,11 @@
this.artProfileCollection = artProfileCollection;
}
- public StartupProfile getStartupOrder() {
+ public StartupProfile getStartupProfile() {
return startupProfile;
}
- public void setStartupOrder(StartupProfile startupProfile) {
+ public void setStartupProfile(StartupProfile startupProfile) {
this.startupProfile = startupProfile;
}
@@ -851,7 +851,7 @@
if (hasRootSet()) {
rootSet.pruneItems(prunedItems);
}
- setStartupOrder(getStartupOrder().withoutPrunedItems(prunedItems, getSyntheticItems()));
+ setStartupProfile(getStartupProfile().withoutPrunedItems(prunedItems, getSyntheticItems()));
if (hasMainDexRootSet()) {
setMainDexRootSet(mainDexRootSet.withoutPrunedItems(prunedItems));
}
@@ -971,7 +971,7 @@
if (appView.hasRootSet()) {
appView.setRootSet(appView.rootSet().rewrittenWithLens(lens));
}
- appView.setStartupOrder(appView.getStartupOrder().rewrittenWithLens(lens));
+ appView.setStartupProfile(appView.getStartupProfile().rewrittenWithLens(lens));
});
}
diff --git a/src/main/java/com/android/tools/r8/graph/MethodResolutionResult.java b/src/main/java/com/android/tools/r8/graph/MethodResolutionResult.java
index 14c36c3..f2a07b1 100644
--- a/src/main/java/com/android/tools/r8/graph/MethodResolutionResult.java
+++ b/src/main/java/com/android/tools/r8/graph/MethodResolutionResult.java
@@ -1312,7 +1312,7 @@
context,
appInfo.getClassToFeatureSplitMap(),
appView.options(),
- appView.getStartupOrder(),
+ appView.getStartupProfile(),
appView.getSyntheticItems())
.isPossiblyFalse())),
method -> {
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 fab68db..066c144 100644
--- a/src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java
+++ b/src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java
@@ -610,7 +610,7 @@
if (appView.hasClassHierarchy()) {
AppInfoWithClassHierarchy appInfo = appView.appInfoWithClassHierarchy();
return getSynthesizingContext(
- context, appInfo.getClassToFeatureSplitMap(), options, appView.getStartupOrder());
+ context, appInfo.getClassToFeatureSplitMap(), options, appView.getStartupProfile());
}
return getSynthesizingContext(
context,
