Use lens code rewriter in class inliner
Fixes: b/309898528
Change-Id: I78e95ba39e39a44053accfe9c63621304abbf402
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java b/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java
index 8f38945..37a5c9b 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java
@@ -122,6 +122,10 @@
: null;
}
+ public LensCodeRewriter getLensCodeRewriter() {
+ return lensCodeRewriter;
+ }
+
@SuppressWarnings("ReferenceEquality")
private ConstraintWithTarget instructionAllowedForInlining(
Instruction instruction, InliningConstraints inliningConstraints, ProgramMethod context) {
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 19ced9d..020390f 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
@@ -180,7 +180,8 @@
// Is inlining allowed.
InliningIRProvider inliningIRProvider =
- new InliningIRProvider(appView, method, code, null, methodProcessor);
+ new InliningIRProvider(
+ appView, method, code, inliner.getLensCodeRewriter(), methodProcessor);
ClassInlinerCostAnalysis costAnalysis =
new ClassInlinerCostAnalysis(appView, inliningIRProvider, processor.getReceivers());
if (costAnalysis.willExceedInstructionBudget(
