From: bdemsky <bdemsky>
Date: Wed, 24 Jun 2009 06:18:27 +0000 (+0000)
Subject: more bug fixes
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0a1f938241bb91f74e33ad7322ac451b01cec9a1;p=IRC.git

more bug fixes
---

diff --git a/Robust/src/Analysis/Locality/DelayComputation.java b/Robust/src/Analysis/Locality/DelayComputation.java
index 5396750f..b65ef1a1 100644
--- a/Robust/src/Analysis/Locality/DelayComputation.java
+++ b/Robust/src/Analysis/Locality/DelayComputation.java
@@ -283,9 +283,6 @@ public class DelayComputation {
 	  if (!set0.equals(set1)||set0.size()>1) {
 	    //This branch is important--need to remember how it goes
 	    livenodes.add(fn);
-	  } else {
-	    System.out.println("Removing branch:"+fn);
-	    System.out.println("set0="+set0+" set1="+set1);
 	  }
 	}
       }
@@ -576,7 +573,7 @@ public class DelayComputation {
     //(B). You read a field/element in the transactional set
     //(C). The source didn't have a transactional read on it
 
-    dcopts=new DiscoverConflicts(locality, state, typeanalysis);
+    dcopts=new DiscoverConflicts(locality, state, typeanalysis, cannotdelay);
     dcopts.doAnalysis();
     MethodDescriptor md=lb.getMethod();
     FlatMethod fm=state.getMethodFlat(md);