From d983bb3524f87c3996c0fd3f4fa09cab19024a96 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Fri, 26 Jun 2009 23:46:13 +0000
Subject: [PATCH] changes

---
 Robust/src/Analysis/Locality/DelayComputation.java  | 4 ----
 Robust/src/Analysis/Locality/DiscoverConflicts.java | 4 ++--
 Robust/src/Analysis/Locality/LocalityBinding.java   | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Robust/src/Analysis/Locality/DelayComputation.java b/Robust/src/Analysis/Locality/DelayComputation.java
index 2bade8a1..3a6b7196 100644
--- a/Robust/src/Analysis/Locality/DelayComputation.java
+++ b/Robust/src/Analysis/Locality/DelayComputation.java
@@ -393,7 +393,6 @@ public class DelayComputation {
   public void analyzeMethod(LocalityBinding lb) {
     MethodDescriptor md=lb.getMethod();
     FlatMethod fm=state.getMethodFlat(md);
-    System.out.println("Analyzing "+md);
     HashSet<FlatNode> cannotdelay=new HashSet<FlatNode>();
     Hashtable<FlatNode, Integer> atomictable=locality.getAtomic(lb);
     if (lb.isAtomic()) {
@@ -616,9 +615,6 @@ public class DelayComputation {
     if (lb.getHasAtomic()) {
       cannotdelaymap.put(lb, cannotdelay);
     }
-
-
-
   } //end of method
 
   //Problems:
diff --git a/Robust/src/Analysis/Locality/DiscoverConflicts.java b/Robust/src/Analysis/Locality/DiscoverConflicts.java
index d8eaadcd..e1399289 100644
--- a/Robust/src/Analysis/Locality/DiscoverConflicts.java
+++ b/Robust/src/Analysis/Locality/DiscoverConflicts.java
@@ -289,13 +289,13 @@ public class DiscoverConflicts {
 
   HashSet<TempFlatPair> computeTranslationSet(LocalityBinding lb, FlatMethod fm, Hashtable<FlatNode, Hashtable<TempDescriptor, Set<TempFlatPair>>> fnmap) {
     HashSet<TempFlatPair> tfset=new HashSet<TempFlatPair>();
-    
+
     for(Iterator<FlatNode> fnit=fm.getNodeSet().iterator();fnit.hasNext();) {
       FlatNode fn=fnit.next();
       Hashtable<FlatNode, Integer> atomictable=locality.getAtomic(lb);
 
       //Check whether this node matters for delayed computation
-      if (cannotdelaymap!=null&&cannotdelaymap.contains(lb)&&!cannotdelaymap.get(lb).contains(fn))
+      if (cannotdelaymap!=null&&cannotdelaymap.containsKey(lb)&&!cannotdelaymap.get(lb).contains(fn))
 	continue;
 
       if (atomictable.get(fn).intValue()>0) {
diff --git a/Robust/src/Analysis/Locality/LocalityBinding.java b/Robust/src/Analysis/Locality/LocalityBinding.java
index 58545066..b54ed820 100644
--- a/Robust/src/Analysis/Locality/LocalityBinding.java
+++ b/Robust/src/Analysis/Locality/LocalityBinding.java
@@ -157,7 +157,6 @@ public class LocalityBinding {
     if (a==null) {
       return b==null;
     } else if (b==null) {
-      //a is not null
       return a==null;
     } else return a.equals(b);
   }
-- 
2.34.1