X-Git-Url: http://git.megacz.com/?p=org.ibex.classgen.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FJSSA.java;h=1220b34698c37843122a5e0899b623e8b9c91b20;hp=513cab72cd44ab81e3619b4ed4322a281d1a2cf1;hb=5ab1e745d06879276d00ff6bf3438e8dd3edd85c;hpb=0861c02e22346b42e3ab0c683d4236f5452cfd27

diff --git a/src/org/ibex/classgen/JSSA.java b/src/org/ibex/classgen/JSSA.java
index 513cab7..1220b34 100644
--- a/src/org/ibex/classgen/JSSA.java
+++ b/src/org/ibex/classgen/JSSA.java
@@ -52,7 +52,7 @@ public class JSSA extends MethodGen implements CGConst {
             for(int i=0; i<sp; i++) stacks[newPC][i] = new Phi();
         }
         if (stacks[newPC].length != sp) throw new IllegalArgumentException("stack depth disagreement");
-        for(int i=0; i<stacks[newPC].length; i++) stacks[pc][i].merge(stack[i]);
+        for(int i=0; i<stacks[newPC].length; i++) stacks[newPC][i].merge(stack[i]);
     }
     
     private Object[] ops = new Object[65535];
@@ -74,7 +74,7 @@ public class JSSA extends MethodGen implements CGConst {
 
     private void push(Expr e) {
         if (e.getType() == Type.VOID) throw new IllegalArgumentException("can't push a void");
-        if (stack[sp+1] == null) stack[sp+1] = new Phi();
+        if (stack[sp] == null) stack[sp] = new Phi();
         stack[sp++].merge(e);
     }
     private Expr pop() {