Update to new WALA API.
This commit is contained in:
parent
2ec25a65ae
commit
86ee611ab9
|
@ -34,6 +34,7 @@ import com.ibm.wala.cast.js.loader.JavaScriptLoader;
|
||||||
import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
|
import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
|
||||||
import com.ibm.wala.cast.loader.CAstAbstractLoader;
|
import com.ibm.wala.cast.loader.CAstAbstractLoader;
|
||||||
import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
|
import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
|
||||||
|
import com.ibm.wala.cfg.Util;
|
||||||
import com.ibm.wala.classLoader.IMethod;
|
import com.ibm.wala.classLoader.IMethod;
|
||||||
import com.ibm.wala.classLoader.SourceModule;
|
import com.ibm.wala.classLoader.SourceModule;
|
||||||
import com.ibm.wala.classLoader.SourceURLModule;
|
import com.ibm.wala.classLoader.SourceURLModule;
|
||||||
|
@ -232,9 +233,9 @@ public class ImprovedJSCallGraphBuilderUtil
|
||||||
|
|
||||||
public static CallGraph makeHTMLCG(URL url) throws IOException,
|
public static CallGraph makeHTMLCG(URL url) throws IOException,
|
||||||
IllegalArgumentException, CancelException, WalaException {
|
IllegalArgumentException, CancelException, WalaException {
|
||||||
PropagationCallGraphBuilder b = makeHTMLCGBuilder(url);
|
JSCFABuilder b = makeHTMLCGBuilder(url);
|
||||||
CallGraph CG = b.makeCallGraph(b.getOptions());
|
CallGraph CG = b.makeCallGraph(b.getOptions());
|
||||||
dumpCG(b.getPointerAnalysis(), CG);
|
dumpCG(b.getCFAContextInterpreter(), b.getPointerAnalysis(), CG);
|
||||||
return CG;
|
return CG;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -266,6 +267,7 @@ public class ImprovedJSCallGraphBuilderUtil
|
||||||
JSCFABuilder builder = new JSZeroOrOneXCFABuilder(cha, options,
|
JSCFABuilder builder = new JSZeroOrOneXCFABuilder(cha, options,
|
||||||
cache, null, null, ZeroXInstanceKeys.ALLOCATIONS,
|
cache, null, null, ZeroXInstanceKeys.ALLOCATIONS,
|
||||||
builderType.useOneCFA());
|
builderType.useOneCFA());
|
||||||
|
|
||||||
if (builderType.extractCorrelatedPairs())
|
if (builderType.extractCorrelatedPairs())
|
||||||
builder.setContextSelector(new PropertyNameContextSelector(
|
builder.setContextSelector(new PropertyNameContextSelector(
|
||||||
builder.getAnalysisCache(), 2, builder
|
builder.getAnalysisCache(), 2, builder
|
||||||
|
|
Loading…
Reference in New Issue