commit | 8a626ba7f0bd78ba4dfa35e9b0b595117820c7b6 | [log] [tgz] |
---|---|---|
author | Christoffer Quist Adamsen <christofferqa@google.com> | Fri Jan 08 19:25:51 2021 +0100 |
committer | Christoffer Quist Adamsen <christofferqa@google.com> | Fri Jan 08 19:25:51 2021 +0100 |
tree | 4fd5d8756ad64c2b4f05dd3e0353a379de3622d1 | |
parent | 8d621b9329d0b991805b64f5244808e186ad814c [diff] |
Ensure simplifyKnownBooleanCondition() returns true if any changes Change-Id: I94226b179ddd09f221909b6d4a96485fb65cc738
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java index fabcd3e..89d9eb7 100644 --- a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java +++ b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
@@ -2502,7 +2502,9 @@ if (simplifyKnownBooleanCondition(code, block)) { simplified = true; - continue; + if (!block.exit().isIf()) { + continue; + } } // Simplify if conditions when possible. @@ -3157,6 +3159,7 @@ rewriteIfToGoto(code, block, theIf, trueBlock, falseBlock); return true; } + return deadPhis > 0; } } }