commit 70b2b7d68fbc514faaf89b08cabbfb2b16f902f7
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Nov 15 15:18:14 2023 +0100
committer Christoffer Adamsen <christofferqa@google.com> Thu Nov 16 08:19:25 2023 +0000
tree 64f56b62650b63a74255fa2a0b31bb7e86dbcc5f
parent 654fbdc1f1185f4e289c90a6a58f7928e3afde25

Remove odd condition in inlining heuristic

Change-Id: I7a9fd1eeb0fcac512958b38e913364b603a5793f

src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java b/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java
index df16858..f09a4e9 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java
@@ -262,12 +262,9 @@
           index < arguments.size();
           index++) {
         Value argument = arguments.get(index);
-        if (hints.get(index)) {
-          if ((argument.isArgument()
-              || (argument.getType().isReferenceType() && argument.isNeverNull()))) {
-            // 5-4 instructions per parameter check are expected to be removed.
-            instructionLimit += 4;
-          }
+        if (hints.get(index) && argument.getType().isReferenceType() && argument.isNeverNull()) {
+          // 5-4 instructions per parameter check are expected to be removed.
+          instructionLimit += 4;
         }
       }
     }