commit 9b577f99b6cd7147f55fe71bca89c1353b6f60b9
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Sep 25 14:51:52 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Sep 25 12:59:30 2020 +0000
tree ce5072173cbe12387c5817af9daea9df683bcb88
parent 0726e427e845fd832e070de28fd412455a9f2b9f

Reorder computeInlining() and getDowncastTypeIfNeeded()

Change-Id: I612b658750ee7c7b292f6e5d7e790865e405259e

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 f0f1c29..273f7b7 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
@@ -994,17 +994,6 @@
             continue;
           }
 
-          DexType downcastTypeOrNull = getDowncastTypeIfNeeded(strategy, invoke, singleTarget);
-          if (downcastTypeOrNull != null) {
-            DexClass downcastClass = appView.definitionFor(downcastTypeOrNull, context);
-            if (downcastClass == null
-                || AccessControl.isClassAccessible(downcastClass, context, appView)
-                    .isPossiblyFalse()) {
-              continue;
-            }
-          }
-
-
           DexEncodedMethod singleTargetMethod = singleTarget.getDefinition();
           WhyAreYouNotInliningReporter whyAreYouNotInliningReporter =
               oracle.isForcedInliningOracle()
@@ -1023,6 +1012,16 @@
             continue;
           }
 
+          DexType downcastTypeOrNull = getDowncastTypeIfNeeded(strategy, invoke, singleTarget);
+          if (downcastTypeOrNull != null) {
+            DexClass downcastClass = appView.definitionFor(downcastTypeOrNull, context);
+            if (downcastClass == null
+                || AccessControl.isClassAccessible(downcastClass, context, appView)
+                    .isPossiblyFalse()) {
+              continue;
+            }
+          }
+
           if (!inlineeStack.isEmpty()
               && !strategy.allowInliningOfInvokeInInlinee(
                   action, inlineeStack.size(), whyAreYouNotInliningReporter)) {