commit 533ef9b6b1cffe86eaf8468eae050ed5a18d807e
author Jake Wharton <jakew@google.com> Tue Apr 23 09:47:58 2019 -0400
committer Jake Wharton <jakew@google.com> Tue Apr 23 15:51:04 2019 +0000
tree 563746a8262f5cf8358d765d786bf310227ceb57
parent a03580c89bea3837e6e75ce00f384e71f0d3277f

Don't count return instrunctions when inlining

These do not contribute to the instrunction count once inlined.

Change-Id: I9a2054b8841ed370ef4be7d2a1fa584fc61f589a

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

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 46a66ad..e89d060 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
@@ -519,6 +519,12 @@
             continue;
           }
         }
+
+        // Do not include return instructions since they do not materialize once inlined.
+        if (instruction.isReturn()) {
+          continue;
+        }
+
         ++numberOfInstructions;
       }
     }