commit | 38b04ed99a345a39a49105ceb8fd6dd9a88562fb | [log] [tgz] |
---|---|---|
author | Christoffer Quist Adamsen <christofferqa@google.com> | Thu Dec 06 16:09:42 2018 +0100 |
committer | Christoffer Quist Adamsen <christofferqa@google.com> | Thu Dec 06 16:09:42 2018 +0100 |
tree | 2c75e3f7b0163312b198ce31770f4961c9096b75 | |
parent | a5dc00a8e5d05ca06b566a9231a3ba71f62ef7b6 [diff] |
Reinsert removal of roots in class inliner Change-Id: Ia6009baf9d3b8ef5090a81bd7b326b71adb2a6a3
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 03dd7f2..30cd8b7 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
@@ -154,6 +154,7 @@ if (!processor.isInstanceEligible() || !processor.isClassAndUsageEligible()) { // This root will never be inlined. + rootsIterator.remove(); continue; } @@ -174,6 +175,7 @@ // Restore normality. code.removeAllTrivialPhis(); assert code.isConsistentSSA(); + rootsIterator.remove(); repeat = true; } } while (repeat);