DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more comments 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@4511 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
msridhar1 2012-02-17 20:26:36 +00:00
parent 5bc7fb3e44
commit 5c2ca88ba2
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/ForInContextSelector.java
View File

@ -31,9 +31,8 @@ import com.ibm.wala.ipa.callgraph.impl.Everywhere;
import com.ibm.wala.ipa.callgraph.propagation.ConcreteTypeKey;
import com.ibm.wala.ipa.callgraph.propagation.ConstantKey;
import com.ibm.wala.ipa.callgraph.propagation.FilteredPointerKey;
import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
import com.ibm.wala.ipa.callgraph.propagation.FilteredPointerKey.SingleInstanceFilter;
import com.ibm.wala.ipa.callgraph.propagation.cfa.OneLevelSiteContextSelector;
import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
import com.ibm.wala.ipa.cha.IClassHierarchy;
import com.ibm.wala.ssa.DefUse;
import com.ibm.wala.ssa.IR;
@ -176,25 +175,44 @@ public class ForInContextSelector implements ContextSelector {
public String toString() {
return "for in hack filter for " + get(ContextKey.PARAMETERS[index]) + " over " + this.base;
}
/**
* get the {@link InstanceKey} used to distinguish this context
*/
public InstanceKey getInstanceKey() {
return ((SingleInstanceFilter)get(ContextKey.PARAMETERS[index])).getInstance();
}
}
/**
* A "dummy" for-in context used for callees of a method analyzed in a real
* {@link ForInContext}. The purpose of this class is to clone callees based
* on the same {@link InstanceKey} used for the caller context, but without
* returning a {@link SingleInstanceFilter} {@link ContextItem} that filters
* possible parameter values.
*/
class MarkerForInContext extends ForInContext {
MarkerForInContext(Context base, InstanceKey obj) {
super(base, obj);
// TODO Auto-generated constructor stub
}
/**
* Like {@link ForInContext#get(ContextKey)}, but don't return a
* {@link SingleInstanceFilter} for the distinguishing {@link InstanceKey}
*/
@Override
public ContextItem get(ContextKey key) {
final ContextItem contextItem = super.get(key);
return (contextItem instanceof SingleInstanceFilter) ? null : contextItem;
}
/**
* we need to override this method since
* {@link MarkerForInContext#get(ContextKey)} does not return the
* {@link SingleInstanceFilter} containing the {@link InstanceKey}. Instead,
* we invoke {@link ForInContext#get(ContextKey)} from the superclass.
*/
@Override
public InstanceKey getInstanceKey() {
return ((SingleInstanceFilter)super.get(ContextKey.PARAMETERS[index])).getInstance();
@ -202,7 +220,7 @@ public class ForInContextSelector implements ContextSelector {
}
private final ContextSelector base;
private final ContextSelector oneLevel;
// private final ContextSelector oneLevel;
private final int index;
private void collectValues(DefUse du, SSAInstruction inst, MutableIntSet values) {
@ -245,7 +263,7 @@ public class ForInContextSelector implements ContextSelector {
public ForInContextSelector(int index, ContextSelector base) {
this.index = index;
this.base = base;
this.oneLevel = new OneLevelSiteContextSelector(base);
// this.oneLevel = new OneLevelSiteContextSelector(base);
}
private final HashMap<MethodReference, Boolean> forInOnFirstArg_cache = HashMapFactory.make();
@ -375,6 +393,8 @@ public class ForInContextSelector implements ContextSelector {
// if (!RecursionCheckContextSelector.recursiveContext(calleeTarget, callee)) {
// return calleeTarget;
// }
// use a MarkerForInContext to clone based on the InstanceKey used in the caller context
// TODO the cast below isn't safe; fix
InstanceKey callerIk = ((ForInContext)caller.getContext()).getInstanceKey();
return new MarkerForInContext(baseContext, callerIk);
} else {