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

disabled LexicalScopingResolverContexts with new scheme 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@4468 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
msridhar1 2012-02-17 20:16:15 +00:00
parent 2dda77a0fb
commit 300377a428
4 changed files with 71 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSZeroOrOneXCFABuilder.java
View File

@ -12,6 +12,7 @@ package com.ibm.wala.cast.js.ipa.callgraph;
import com.ibm.wala.cast.ipa.callgraph.LexicalScopingResolverContexts;
import com.ibm.wala.cast.ipa.callgraph.ScopeMappingKeysContextSelector;
import com.ibm.wala.cast.ir.translator.AstTranslator;
import com.ibm.wala.ipa.callgraph.AnalysisCache;
import com.ibm.wala.ipa.callgraph.AnalysisScope;
import com.ibm.wala.ipa.callgraph.ContextSelector;
@ -64,7 +65,9 @@ public class JSZeroOrOneXCFABuilder extends JSCFABuilder {
if (options.handleCallApply()) {
contextSelector = new JavaScriptFunctionApplyContextSelector(contextSelector);
}
contextSelector = new LexicalScopingResolverContexts(this, contextSelector);
if (!AstTranslator.NEW_LEXICAL) {
contextSelector = new LexicalScopingResolverContexts(this, contextSelector);
}
if (doOneCFA) {
contextSelector = new nCFAContextSelector(1, contextSelector);
}

8
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptConstructorContextSelector.java
View File

@ -1,6 +1,8 @@
package com.ibm.wala.cast.js.ipa.callgraph;
import com.ibm.wala.cast.ipa.callgraph.LexicalScopingResolverContexts;
import com.ibm.wala.cast.ipa.callgraph.ScopeMappingKeysContextSelector.ScopeMappingContext;
import com.ibm.wala.cast.ir.translator.AstTranslator;
import com.ibm.wala.cast.js.ipa.callgraph.JavaScriptConstructTargetSelector.JavaScriptConstructor;
import com.ibm.wala.classLoader.CallSiteReference;
import com.ibm.wala.classLoader.IMethod;
@ -9,6 +11,7 @@ import com.ibm.wala.ipa.callgraph.Context;
import com.ibm.wala.ipa.callgraph.ContextSelector;
import com.ibm.wala.ipa.callgraph.DelegatingContext;
import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
import com.ibm.wala.ipa.callgraph.propagation.cfa.CallerSiteContext;
import com.ibm.wala.ipa.callgraph.propagation.cfa.nCFAContextSelector;
import com.ibm.wala.util.intset.IntSet;
@ -33,8 +36,11 @@ public class JavaScriptConstructorContextSelector implements ContextSelector {
if (callee instanceof JavaScriptConstructor) {
final Context oneLevelContext = oneLevel.getCalleeTarget(caller, site, callee, receiver);
final Context callerContext = caller.getContext();
if (callerContext instanceof ScopeMappingContext) {
if (!AstTranslator.NEW_LEXICAL && callerContext instanceof ScopeMappingContext) {
return new DelegatingContext(callerContext, new DelegatingContext(oneLevelContext, baseCtxt));
} else if (AstTranslator.NEW_LEXICAL && LexicalScopingResolverContexts.hasExposedUses(caller, site)) {
// use a caller-site context, to enable lexical scoping lookups
return new DelegatingContext(new CallerSiteContext(caller, site), baseCtxt);
} else {
// use at least one-level of call-string sensitivity for constructors always
return oneLevelContext;

2
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/LexicalScopingResolverContexts.java
View File

@ -548,7 +548,7 @@ public final class LexicalScopingResolverContexts implements ContextSelector {
return null;
}
private boolean hasExposedUses(CGNode caller, CallSiteReference site) {
public static boolean hasExposedUses(CGNode caller, CallSiteReference site) {
int uses[] = ((AstMethod) caller.getMethod()).lexicalInfo().getExposedUses(site.getProgramCounter());
if (uses != null && uses.length > 0) {
for (int use : uses) {

88
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScopeMappingInstanceKeys.java
View File

@ -13,11 +13,13 @@ package com.ibm.wala.cast.ipa.callgraph;
import java.util.Iterator;
import com.ibm.wala.cast.ipa.callgraph.LexicalScopingResolverContexts.LexicalScopingResolver;
import com.ibm.wala.cast.ir.translator.AstTranslator;
import com.ibm.wala.classLoader.IClass;
import com.ibm.wala.classLoader.NewSiteReference;
import com.ibm.wala.classLoader.ProgramCounter;
import com.ibm.wala.ipa.callgraph.CGNode;
import com.ibm.wala.ipa.callgraph.ContextItem;
import com.ibm.wala.ipa.callgraph.ContextKey;
import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
import com.ibm.wala.ipa.callgraph.propagation.InstanceKeyFactory;
import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
@ -91,37 +93,65 @@ abstract public class ScopeMappingInstanceKeys implements InstanceKeyFactory {
* @return
*/
Iterator<CGNode> getFunargNodes(Pair<String, String> name) {
Iterator<CGNode> result = EmptyIterator.instance();
LexicalScopingResolver r = (LexicalScopingResolver) creator.getContext().get(LexicalScopingResolverContexts.RESOLVER);
if (r != null) {
CGNode def = r.getOriginalDefiner(name);
if (def != null) {
result = new NonNullSingletonIterator<CGNode>(def);
if (AstTranslator.NEW_LEXICAL) {
CGNode callerOfConstructor = (CGNode) creator.getContext().get(ContextKey.CALLER);
if (callerOfConstructor == null) {
System.err.println(creator);
assert false;
}
}
// with multiple levels of nested functions, the creator itself may have
// been invoked by a function represented by a SMIK. E.g., see
// wrap3.js; the constructor of set() is invoked by wrapper(), and
// the wrapper() function object is a SMIK. In such cases, we need to
// recurse to find all the relevant CGNodes.
ContextItem nested = creator.getContext().get(ScopeMappingKeysContextSelector.scopeKey);
if (nested != null) {
result = new CompoundIterator<CGNode>(result, ((ScopeMappingInstanceKey) nested).getFunargNodes(name));
}
// TODO what does this code do??? commenting out does not cause any
// regression failures --MS
PointerKey funcKey = builder.getPointerKeyForLocal(creator, 1);
OrdinalSet<InstanceKey> funcPtrs = builder.getPointerAnalysis().getPointsToSet(funcKey);
for (InstanceKey x : funcPtrs) {
if (x instanceof ScopeMappingInstanceKey) {
result = new CompoundIterator<CGNode>(result, ((ScopeMappingInstanceKey) x).getFunargNodes(name));
if (callerOfConstructor.getMethod().getReference().getDeclaringClass().getName().toString().equals(name.snd)){
return new NonNullSingletonIterator<CGNode>(callerOfConstructor);
} else {
PointerKey funcKey = builder.getPointerKeyForLocal(callerOfConstructor, 1);
OrdinalSet<InstanceKey> funcPtrs = builder.getPointerAnalysis().getPointsToSet(funcKey);
assert funcPtrs.size() == 1;
InstanceKey funcPtr = funcPtrs.iterator().next();
if (funcPtr instanceof ScopeMappingInstanceKey) {
return ((ScopeMappingInstanceKey) funcPtr).getFunargNodes(name);
} else {
return EmptyIterator.instance();
}
// Iterator<CGNode> result = EmptyIterator.instance();
// for (InstanceKey x : funcPtrs) {
// if (x instanceof ScopeMappingInstanceKey) {
// result = new CompoundIterator<CGNode>(result, ((ScopeMappingInstanceKey) x).getFunargNodes(name));
// }
// }
// return result;
}
}
} else {
Iterator<CGNode> result = EmptyIterator.instance();
return result;
LexicalScopingResolver r = (LexicalScopingResolver) creator.getContext().get(LexicalScopingResolverContexts.RESOLVER);
if (r != null) {
CGNode def = r.getOriginalDefiner(name);
if (def != null) {
result = new NonNullSingletonIterator<CGNode>(def);
}
}
// with multiple levels of nested functions, the creator itself may have
// been invoked by a function represented by a SMIK. E.g., see
// wrap3.js; the constructor of set() is invoked by wrapper(), and
// the wrapper() function object is a SMIK. In such cases, we need to
// recurse to find all the relevant CGNodes.
ContextItem nested = creator.getContext().get(ScopeMappingKeysContextSelector.scopeKey);
if (nested != null) {
result = new CompoundIterator<CGNode>(result, ((ScopeMappingInstanceKey) nested).getFunargNodes(name));
}
// TODO what does this code do??? commenting out does not cause any
// regression failures --MS
PointerKey funcKey = builder.getPointerKeyForLocal(creator, 1);
OrdinalSet<InstanceKey> funcPtrs = builder.getPointerAnalysis().getPointsToSet(funcKey);
for (InstanceKey x : funcPtrs) {
if (x instanceof ScopeMappingInstanceKey) {
result = new CompoundIterator<CGNode>(result, ((ScopeMappingInstanceKey) x).getFunargNodes(name));
}
}
return result;
}
}
public int hashCode() {
@ -136,7 +166,7 @@ abstract public class ScopeMappingInstanceKeys implements InstanceKeyFactory {
public String toString() {
return "SMIK:" + base + "@" + creator;
}
public InstanceKey getBase() {
return base;
}