dont call changeStackLocal when we already know its the same stacklocal

soot-oss · Dec 22, 2023 · ffb873c · ffb873c
1 parent d453781
commit ffb873c
Showing 1 changed file with 11 additions and 3 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
@@ -69,10 +69,18 @@ void mergeOutput(@Nonnull Operand outputOperand) {
     if (output == null) {
       output = outputOperand;
     } 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+").");
+      if (outputOperand.stackLocal == null) {
+        outputOperand.changeStackLocal(output.stackLocal);
+      } else {
+        if (output.stackLocal != outputOperand.stackLocal) {
+          throw new IllegalStateException(
+              "Incompatible stacklocal mismatch. There exist multiple, different possible output Locals ("
+                  + outputOperand.stackLocal
+                  + ", "
+                  + output.stackLocal
+                  + ").");
+        }
       }
-      outputOperand.changeStackLocal(output.stackLocal);
     }
   }