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;
         }
       }
     }