revert alias set computation changes, stick with old way

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

diff --git a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
index ee9954b7bdb27d830d138295a59ac29cad16ef5c..f7ff02f610eeee6fcc31ff9e94727d7997970948 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
@@ -977,7 +977,7 @@ public class OwnershipAnalysis {
        ogMergeOfAllPossibleCalleeResults = og;
 
        Set<Integer> aliasedParamIndices = 
-         ogMergeOfAllPossibleCalleeResults.calculateAliasedParamSet(fc, flatm);
+         ogMergeOfAllPossibleCalleeResults.calculateAliasedParamSet(fc, md.isStatic(), flatm);
 
        MethodContext mcNew = new MethodContext( md, aliasedParamIndices );
        Set contexts = mapDescriptorToAllMethodContexts.get( md );
@@ -1023,7 +1023,7 @@ public class OwnershipAnalysis {
          ogCopy.merge(og);
 
          Set<Integer> aliasedParamIndices = 
-           ogCopy.calculateAliasedParamSet(fc, pflatm);
+           ogCopy.calculateAliasedParamSet(fc, possibleMd.isStatic(), pflatm);
 
          MethodContext mcNew = new MethodContext( possibleMd, aliasedParamIndices );
          Set contexts = mapDescriptorToAllMethodContexts.get( md );
@@ -1516,7 +1516,7 @@ public class OwnershipAnalysis {
          
          MethodDescriptor md=fc.getMethod();
          FlatMethod flatm = state.getMethodFlat(md);
-         Set<Integer> aliasedParamIndices = mergeOG.calculateAliasedParamSet(fc, flatm);
+         Set<Integer> aliasedParamIndices = mergeOG.calculateAliasedParamSet(fc, md.isStatic(), flatm);
          MethodContext calleeMC = new MethodContext( md, aliasedParamIndices );
          
          return calleeMC;