Remove uses of legacy run on CodeRewriterPass
Change-Id: Ifcc4b35f61dc1a4633afe772554bf17f13858c5f
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 53a5072..ee60f6a 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
@@ -8,6 +8,7 @@
import static com.android.tools.r8.ir.analysis.type.Nullability.definitelyNotNull;
import static com.android.tools.r8.ir.analysis.type.Nullability.maybeNull;
+import com.android.tools.r8.contexts.CompilationContext.MethodProcessingContext;
import com.android.tools.r8.graph.AppInfoWithClassHierarchy;
import com.android.tools.r8.graph.AppView;
import com.android.tools.r8.graph.DexClass;
@@ -361,6 +362,7 @@
IRCode code,
OptimizationFeedback feedback,
MethodProcessor methodProcessor,
+ MethodProcessingContext methodProcessingContext,
Inliner inliner) {
strengthenCheckCastInstructions(code);
@@ -371,7 +373,8 @@
// Run the enum optimization to optimize all Enum.ordinal() invocations. This is required to
// get rid of the enum switch in dynamicMethod().
- new EnumValueOptimizer(appView).run(code, Timing.empty());
+ new EnumValueOptimizer(appView)
+ .run(code, methodProcessor, methodProcessingContext, Timing.empty());
}
/**
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliner.java b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliner.java
index a359197..48e501a 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliner.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliner.java
@@ -233,7 +233,7 @@
appView.withGeneratedMessageLiteBuilderShrinker(
shrinker ->
shrinker.inlineCallsToDynamicMethod(
- method, code, feedback, methodProcessor, inliner));
+ method, code, feedback, methodProcessor, methodProcessingContext, inliner));
}
if (anyInlinedMethods) {
