Minor update to fix YouTube 13.37 test
Change-Id: I34b42fdbb23b6a944ca8d5d03f3124a78925bd4f
diff --git a/src/main/java/com/android/tools/r8/ir/analysis/proto/GeneratedMessageLiteBuilderShrinker.java b/src/main/java/com/android/tools/r8/ir/analysis/proto/GeneratedMessageLiteBuilderShrinker.java
index ed5de69..8da13ed 100644
--- a/src/main/java/com/android/tools/r8/ir/analysis/proto/GeneratedMessageLiteBuilderShrinker.java
+++ b/src/main/java/com/android/tools/r8/ir/analysis/proto/GeneratedMessageLiteBuilderShrinker.java
@@ -120,14 +120,12 @@
PredicateSet<DexType> alwaysClassInline,
Set<DexType> neverMerge,
Set<DexMethod> alwaysInline,
- Set<DexMethod> neverInline,
Set<DexMethod> bypassClinitforInlining) {
new RootSetExtension(
appView,
alwaysClassInline,
neverMerge,
alwaysInline,
- neverInline,
bypassClinitforInlining)
.extend();
}
@@ -286,7 +284,6 @@
private final Set<DexType> neverMerge;
private final Set<DexMethod> alwaysInline;
- private final Set<DexMethod> neverInline;
private final Set<DexMethod> bypassClinitforInlining;
RootSetExtension(
@@ -294,14 +291,12 @@
PredicateSet<DexType> alwaysClassInline,
Set<DexType> neverMerge,
Set<DexMethod> alwaysInline,
- Set<DexMethod> neverInline,
Set<DexMethod> bypassClinitforInlining) {
this.appView = appView;
this.references = appView.protoShrinker().references;
this.alwaysClassInline = alwaysClassInline;
this.neverMerge = neverMerge;
this.alwaysInline = alwaysInline;
- this.neverInline = neverInline;
this.bypassClinitforInlining = bypassClinitforInlining;
}
@@ -310,7 +305,6 @@
// GeneratedMessageLite heuristics.
alwaysInlineCreateBuilderFromGeneratedMessageLite();
- neverInlineIsInitializedFromGeneratedMessageLite();
// * extends GeneratedMessageLite heuristics.
bypassClinitforInliningNewBuilderMethods();
@@ -357,13 +351,5 @@
neverMerge.add(references.generatedMessageLiteBuilderType);
neverMerge.add(references.generatedMessageLiteExtendableBuilderType);
}
-
- /**
- * Without this rule, GeneratedMessageLite$Builder.build() becomes too big for class inlining.
- * TODO(b/112437944): Maybe introduce a -neverinlineinto rule instead?
- */
- private void neverInlineIsInitializedFromGeneratedMessageLite() {
- neverInline.add(references.generatedMessageLiteMethods.isInitializedMethod);
- }
}
}
diff --git a/src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java b/src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java
index 2dce7ce..928de3a 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetBuilder.java
@@ -312,7 +312,6 @@
alwaysClassInline,
neverMerge,
alwaysInline,
- neverInline,
bypassClinitforInlining);
}
assert Sets.intersection(neverInline, alwaysInline).isEmpty()
