missing check ins

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 28a05fe2a8aab91f2301b9cd142caf4f7635d868..41343cd2d50525d7b7efb469cc6a501f866c65bf 100644 (file)
--- 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 34b0d9038400b1fe6211daf3e95206c8d30e7d14..ed62068383767f52b20d015eebb38b6185792e85 100644 (file)
--- 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 61a209efe265cdda3cde1d50a730e27eea643412..60fa52e31b14bb416371bc8f59122b7ba923e3f7 100644 (file)
--- 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);