commit ce9326895bc2256daa0e89699bc7551bf52b4247
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Jan 25 13:04:03 2019 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue Jan 29 10:25:58 2019 +0000
tree ebc10b084740c89d7b0c578386a7a428d4812e70
parent 1e55aa6d906402dff24691198cd7aa4b70bb891f

Disallow stack-operations after throwing instructions

Bug: 122445224
Bug: 119771771
Change-Id: I33766fe7a6cfa6ece593fc7d76f49dc3458dca2c

src/main/java/com/android/tools/r8/ir/code/IRCode.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/IRCode.java b/src/main/java/com/android/tools/r8/ir/code/IRCode.java
index 651a3df..29e0927 100644
--- a/src/main/java/com/android/tools/r8/ir/code/IRCode.java
+++ b/src/main/java/com/android/tools/r8/ir/code/IRCode.java
@@ -668,10 +668,7 @@
           // TODO(mkroghj) Temporarily allow stack-operations to be after throwing instructions.
           if (seenThrowing) {
             assert instruction.isDebugInstruction()
-                || instruction.isJumpInstruction()
-                || instruction.isDup()
-                || instruction.isDup2()
-                || instruction.isSwap();
+                || instruction.isJumpInstruction();
           }
         }
       }