From 55f33b95815faf4ffa7434a13a2673bb555119af Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Thu, 18 Jun 2009 18:43:20 +0000
Subject: [PATCH] small changes

---
 Robust/src/Analysis/Locality/DelayComputation.java |  9 +++++++--
 Robust/src/IR/Flat/BuildCode.java                  | 14 ++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Robust/src/Analysis/Locality/DelayComputation.java b/Robust/src/Analysis/Locality/DelayComputation.java
index e91fa3cf..3708e6f9 100644
--- a/Robust/src/Analysis/Locality/DelayComputation.java
+++ b/Robust/src/Analysis/Locality/DelayComputation.java
@@ -17,12 +17,15 @@ public class DelayComputation {
   GlobalFieldType gft;
   DiscoverConflicts dcopts;
 
-  public DelayComputation(LocalityAnalysis locality, State state, TypeAnalysis typeanalysis, GlobalFieldType gft, DiscoverConflicts dcopts) {
+  public DelayComputation(LocalityAnalysis locality, State state, TypeAnalysis typeanalysis, GlobalFieldType gft) {
     this.locality=locality;
     this.state=state;
     this.typeanalysis=typeanalysis;
     this.gft=gft;
-    this.dcopts=dcopts;
+  }
+
+  public DiscoverConflicts getConflicts() {
+    return dcopts;
   }
 
   public void doAnalysis() {
@@ -283,6 +286,8 @@ public class DelayComputation {
     //II. You read a field or element and both (A) you are not in the
     //cannot delay set and (B) you do a transactional access to object
 
+    dcopts=new DiscoverConflicts(locality, state, typeanalysis);
+
     MethodDescriptor md=lb.getMethod();
     FlatMethod fm=state.getMethodFlat(md);
     Hashtable<FlatNode, Integer> atomictable=locality.getAtomic(lb);
diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index fee4d32d..bf7c372f 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -107,12 +107,14 @@ public class BuildCode {
       TypeAnalysis typeanalysis=new TypeAnalysis(locality, st, typeutil,callgraph);
       this.dc=new DiscoverConflicts(locality, st, typeanalysis);
       dc.doAnalysis();
-      if (state.SINGLETM&&state.DELAYCOMP) {
-	//TypeAnalysis typeanalysis=new TypeAnalysis(locality, st, typeutil,callgraph);
-	GlobalFieldType gft=new GlobalFieldType(callgraph, st, typeutil.getMain());
-	delaycomp=new DelayComputation(locality, st, typeanalysis, gft, dc);
-	delaycomp.doAnalysis();
-      }
+    }
+    if (state.SINGLETM&&state.DELAYCOMP) {
+      //TypeAnalysis typeanalysis=new TypeAnalysis(locality, st, typeutil,callgraph);
+      TypeAnalysis typeanalysis=new TypeAnalysis(locality, st, typeutil,callgraph);
+      GlobalFieldType gft=new GlobalFieldType(callgraph, st, typeutil.getMain());
+      delaycomp=new DelayComputation(locality, st, typeanalysis, gft);
+      delaycomp.doAnalysis();
+      dc=delaycomp.getConflicts();
     }
 
     if(state.MLP) {
-- 
2.34.1