changes to handle fixed point analysis properly + bug fix.

[IRC.git] / Robust / src / Analysis / ReachingDefs.java

diff --git a/Robust/src/Analysis/ReachingDefs.java b/Robust/src/Analysis/ReachingDefs.java
index f10f3f26e34e2b9d4a9889e088b3959cb35e77a2..d0f3ebd288018cf1d5ae4ebaa5419c86240e90cd 100644 (file)
--- a/Robust/src/Analysis/ReachingDefs.java
+++ b/Robust/src/Analysis/ReachingDefs.java
@@ -5,6 +5,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.Iterator;
 import java.util.Hashtable;
+import Analysis.Locality.*;
 
 public class ReachingDefs {
   /* This methods takes in a FlatMethod and returns a map from a
@@ -13,6 +14,10 @@ public class ReachingDefs {
   /* liveintoset if true computes the reaching defs into the node and if false computes the reaching defs out of the node. */
 
   public static Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> computeReachingDefs(FlatMethod fm, Hashtable<FlatNode, Set<TempDescriptor>> livemap, boolean liveintoset) {
+    return computeReachingDefs(fm, livemap, liveintoset, null);
+  }
+
+  public static Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> computeReachingDefs(FlatMethod fm, Hashtable<FlatNode, Set<TempDescriptor>> livemap, boolean liveintoset, LocalityBinding lb) {
     Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> nodetotemps=new Hashtable<FlatNode, Hashtable<TempDescriptor,Set<FlatNode>>>();
 
     Hashtable<FlatNode, Hashtable<TempDescriptor, Set<FlatNode>>> liveinto=liveintoset?new Hashtable<FlatNode, Hashtable<TempDescriptor,Set<FlatNode>>>():null;
@@ -47,13 +52,15 @@ public class ReachingDefs {
        liveinto.put(fn, new Hashtable<TempDescriptor, Set<FlatNode>>(tempset));
       }
       
-      TempDescriptor writes[]=fn.writesTemps();
-      for(int i=0;i<writes.length;i++) {
-       HashSet<FlatNode> s=new HashSet<FlatNode>();
-       s.add(fn);
-       tempset.put(writes[i],s);
+      if (lb==null||(!(fn instanceof FlatGlobalConvNode))||
+         ((FlatGlobalConvNode) fn).getLocality()==lb) {
+       TempDescriptor writes[]=fn.writesTemps();
+       for(int i=0;i<writes.length;i++) {
+         HashSet<FlatNode> s=new HashSet<FlatNode>();
+         s.add(fn);
+         tempset.put(writes[i],s);
+       }
       }
-
       if (!nodetotemps.containsKey(fn)||
           !nodetotemps.get(fn).equals(tempset)) {
        nodetotemps.put(fn, tempset);
@@ -63,5 +70,4 @@ public class ReachingDefs {
     }
     return liveintoset?liveinto:nodetotemps;
   }
-  
 }
\ No newline at end of file