commit c4804228939602bf84b44fe873abc60b078e2342
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Oct 29 13:36:04 2019 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Oct 29 13:36:04 2019 +0100
tree 50d988e3a2d94b559f7789ca57d2e9d9a14af9e1
parent ab9c2c1541a9890c48bd54a34f74daad3dbfb684

Set DefaultInliningOracle.instructionAllowance to -1 in the class inliner

Change-Id: Iff08046ed1739c0285e758871f7ad94d92cc501a

src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
index 5ce17dd..af553e5 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
@@ -1325,7 +1325,9 @@
                       isProcessedConcurrently,
                       callSiteInformation,
                       options.classInliningInstructionLimit,
-                      options.classInliningInstructionAllowance)));
+                      // Inlining instruction allowance is not needed for the class inliner since it
+                      // always uses a force inlining oracle for inlining.
+                      -1)));
       assert code.isConsistentSSA();
       assert code.verifyTypes(appView);
     }