bug fix

diff --git a/Robust/src/Analysis/Locality/DiscoverConflicts.java b/Robust/src/Analysis/Locality/DiscoverConflicts.java
index cdb7c7063a181638e82ac9721b271d20f633f3e7..4db3435236306315422e01ff6368ea86c5a7b476 100644 (file)
--- 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>();