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

in the Function.apply() context selector, only add one-level of call strings when an ApplyContext is also being used 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@4474 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
msridhar1 2012-02-17 20:17:22 +00:00
parent a34b8967e1
commit fcf0aa824d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestMediawikiCallGraphShape.java
View File

@ -31,7 +31,7 @@ public abstract class TestMediawikiCallGraphShape extends TestJSCallGraphShape {
@Test public void testSwineFlu() throws IOException, IllegalArgumentException, CancelException {
URL url = new URL("http://en.wikipedia.org/wiki/2009_swine_flu_outbreak");
// don't handle call / apply; it makes things blow up
CallGraph CG = Util.makeHTMLCG(url, false);
CallGraph CG = Util.makeHTMLCG(url);
verifyGraphAssertions(CG, assertionsForSwineFlu);
}

4
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextSelector.java
View File

@ -143,8 +143,6 @@ public class JavaScriptFunctionApplyContextSelector implements ContextSelector {
IClass declaringClass = callee.getDeclaringClass();
IMethod method = declaringClass.getMethod(AstMethodReference.fnSelector);
Context baseCtxt = base.getCalleeTarget(caller, site, callee, receiver);
if(USE_ONE_LEVEL_CALLSTRING)
baseCtxt = new DelegatingContext(oneLevel.getCalleeTarget(caller, site, callee, receiver), baseCtxt);
if (method != null) {
String s = method.getReference().getDeclaringClass().getName().toString();
if (s.equals("Lprologue.js/functionApply")) {
@ -155,6 +153,8 @@ public class JavaScriptFunctionApplyContextSelector implements ContextSelector {
isNonNullArray = true;
}
}
if (USE_ONE_LEVEL_CALLSTRING)
baseCtxt = new DelegatingContext(oneLevel.getCalleeTarget(caller, site, callee, receiver), baseCtxt);
return new ApplyContext(baseCtxt, isNonNullArray);
}
}