From: bdemsky <bdemsky>
Date: Sat, 27 Jun 2009 23:22:28 +0000 (+0000)
Subject: missing check ins
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d39660f8051a6e3ec1c00d95558fbee30bac917b;p=IRC.git

missing check ins
---

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 28a05fe2..41343cd2 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -2043,7 +2043,7 @@ public class BuildCode {
 	    }
 	  }
 	  if (computeside) {
-	    Set<FlatNode> leftset=DelayComputation.getBranchNodes(current_node, 0, unionset);
+	    Set<FlatNode> leftset=DelayComputation.getBranchNodes(current_node, 0, unionset, lb,locality);
 	    int branch=0;
 	    if (leftset.size()==0)
 	      branch=1;
diff --git a/Robust/src/IR/Flat/FlatCondBranch.java b/Robust/src/IR/Flat/FlatCondBranch.java
index 34b0d903..ed620683 100644
--- a/Robust/src/IR/Flat/FlatCondBranch.java
+++ b/Robust/src/IR/Flat/FlatCondBranch.java
@@ -60,7 +60,7 @@ public class FlatCondBranch extends FlatNode {
   }
 
   public String toString() {
-    return "conditional branch";
+    return "conditional branch("+test_cond.toString()+")";
   }
 
   public String toString(String negjump) {
diff --git a/Robust/src/IR/Flat/Inliner.java b/Robust/src/IR/Flat/Inliner.java
index 61a209ef..60fa52e3 100644
--- a/Robust/src/IR/Flat/Inliner.java
+++ b/Robust/src/IR/Flat/Inliner.java
@@ -59,6 +59,9 @@ public class Inliner {
 	  continue;
 
 	Set<FlatNode> inlinefnset=inline(fc, typeutil, state);
+	if (inlinefnset==null)
+	  continue;
+	
 	toexclude.push(md);
 	if (depth>1)
 	  recursive(state, typeutil, inlinefnset, depth-1, toexclude);