From: bdemsky <bdemsky>
Date: Mon, 13 Apr 2009 09:21:47 +0000 (+0000)
Subject: bug fix
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0441a95f015c847ea5b4b46b56616de309fbf31f;p=IRC.git

bug fix
---

diff --git a/Robust/src/Analysis/Locality/DiscoverConflicts.java b/Robust/src/Analysis/Locality/DiscoverConflicts.java
index cdb7c706..4db34352 100644
--- a/Robust/src/Analysis/Locality/DiscoverConflicts.java
+++ b/Robust/src/Analysis/Locality/DiscoverConflicts.java
@@ -113,7 +113,7 @@ public class DiscoverConflicts {
 	  if (tfpset!=null) {
 	    for(Iterator<TempFlatPair> tfpit=tfpset.iterator();tfpit.hasNext();) {
 	      TempFlatPair tfp=tfpit.next();
-	      if (tfset.contains(tfp)) {
+	      if (tfset.contains(tfp)||ok(tfp)) {
 		srctrans.add(fsfn);
 		break;
 	      }
@@ -130,7 +130,7 @@ public class DiscoverConflicts {
 	  if (tfpset!=null) {
 	    for(Iterator<TempFlatPair> tfpit=tfpset.iterator();tfpit.hasNext();) {
 	      TempFlatPair tfp=tfpit.next();
-	      if (tfset.contains(tfp)) {
+	      if (tfset.contains(tfp)||ok(tfp)) {
 		srctrans.add(fsen);
 		break;
 	      }
@@ -144,6 +144,11 @@ public class DiscoverConflicts {
     }
   }
 
+  public boolean ok(TempFlatPair tfp) {
+    FlatNode fn=tfp.f;
+    return fn.kind()==FKind.FlatCall;
+  }
+
   HashSet<TempFlatPair> computeTranslationSet(LocalityBinding lb, FlatMethod fm, Hashtable<FlatNode, Hashtable<TempDescriptor, Set<TempFlatPair>>> fnmap) {
     HashSet<TempFlatPair> tfset=new HashSet<TempFlatPair>();