changes i forgot to check in

diff --git a/Robust/src/IR/Flat/BuildFlat.java b/Robust/src/IR/Flat/BuildFlat.java
index 3e683db340dbc53933d12b7678332cf89369352c..6a250cc8a40bd332ad08d6778a9a599792aa5ec8 100644 (file)
--- a/Robust/src/IR/Flat/BuildFlat.java
+++ b/Robust/src/IR/Flat/BuildFlat.java
@@ -184,6 +184,7 @@ public class BuildFlat {
       for(int i=0; i<currmd.numParameters(); i++) {
        fm.addParameterTemp(getTempforParam(currmd.getParameter(i)));
       }
+
       state.addFlatCode(currmd,fm);
     }
   }
@@ -951,6 +952,9 @@ public class BuildFlat {
        true_np.getEnd().addNext(nopend);
     if (false_np.getEnd()!=null)
        false_np.getEnd().addNext(nopend);
+    if (nopend.numPrev()==0)
+      return new NodePair(cond.getBegin(), null);
+
     return new NodePair(cond.getBegin(), nopend);
   }
 

diff --git a/Robust/src/IR/Flat/FlatNop.java b/Robust/src/IR/Flat/FlatNop.java
index 7b79dac3f73785b253be0a1ae283a3321f15455a..f8c1a1ea54e711278f1791a70a461d7a7d33e747 100644 (file)
--- a/Robust/src/IR/Flat/FlatNop.java
+++ b/Robust/src/IR/Flat/FlatNop.java
@@ -12,7 +12,7 @@ public class FlatNop extends FlatNode {
   public int kind() {
     return FKind.FlatNop;
   }
-  public FlatNode clone() {
+  public FlatNode clone(TempMap t) {
     return new FlatNop();
   }
   public void rewriteUse(TempMap t) {