From: bdemsky <bdemsky>
Date: Wed, 24 Jun 2009 20:25:50 +0000 (+0000)
Subject: changes i forgot to check in
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6aa1e4c8e78d8cf788611c43d391482ea7401976;p=IRC.git

changes i forgot to check in
---

diff --git a/Robust/src/IR/Flat/BuildFlat.java b/Robust/src/IR/Flat/BuildFlat.java
index 3e683db3..6a250cc8 100644
--- 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 7b79dac3..f8c1a1ea 100644
--- 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) {