fix merging outputLocals when they are the same Local

soot-oss · Dec 22, 2023 · d453781 · d453781
1 parent bc81639
commit d453781
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/OperandMerging.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/OperandMerging.java
@@ -68,11 +68,11 @@ final class OperandMerging {
   void mergeOutput(@Nonnull Operand outputOperand) {
     if (output == null) {
       output = outputOperand;
-    } else {
-      if (output.stackLocal != null) {
-        assert outputOperand.stackLocal == null;
-        outputOperand.changeStackLocal(output.stackLocal);
+    } else if (output.stackLocal != null) {
+      if (output.stackLocal != outputOperand.stackLocal && outputOperand.stackLocal != null) {
+        throw new IllegalStateException("Incompatible StackLocals. There already exists more than one StackLocal (" + outputOperand.stackLocal + " != " + output.stackLocal+").");
       }
+      outputOperand.changeStackLocal(output.stackLocal);
     }
   }