changes

diff --git a/Robust/src/Analysis/Locality/DelayComputation.java b/Robust/src/Analysis/Locality/DelayComputation.java
index 2bade8a1a66aa83a0cd7e25b498fb7b313a1a115..3a6b7196206174500f41e15f98f2cc9d73771a50 100644 (file)
--- 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 d8eaadcd7f5d15c29be4a8e49a2855d83cb3a4e6..e1399289c0d9857bf686c8e0762492357ddb875d 100644 (file)
--- 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 58545066864ca07ed11bb46fdbbee668adb0c84a..b54ed820cd4f17d46f4a4b59f0d3ea623782ffe3 100644 (file)
--- 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);
   }