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

Upgrade to latest WALA version.

This commit is contained in:
Achim D. Brucker 2018-10-23 21:30:39 +01:00
parent 1e2e1a26c1
commit 925ec9c437
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/AnalysisUtil.java
View File

@ -33,6 +33,7 @@ import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl.ConcreteJavaMethod;
import com.ibm.wala.cast.java.ssa.AstJavaInvokeInstruction;
import com.ibm.wala.classLoader.IClass;
import com.ibm.wala.classLoader.IMethod;
import com.ibm.wala.classLoader.Language;
import com.ibm.wala.ipa.callgraph.AnalysisCache;
import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
import com.ibm.wala.ipa.callgraph.AnalysisOptions;
@ -148,7 +149,7 @@ public class AnalysisUtil {
entryPoints = HashSetFactory.make();
for(IClass class1 : cha) {
if(class1.getClassLoader().getReference().equals(clr)) {
Collection<IMethod> allMethods = class1.getDeclaredMethods();
Collection<? extends IMethod> allMethods = class1.getDeclaredMethods();
for(IMethod m : allMethods) {
if(m.isPrivate()) {
continue;
@ -170,8 +171,8 @@ public class AnalysisUtil {
}
AnalysisOptions options = new AnalysisOptions(scope, entryPoints);
// CallGraphBuilder builder = com.ibm.wala.ipa.callgraph.impl.Util.makeRTABuilder(options, new AnalysisCacheImpl(), cha, scope); // Rapid Type Analysis
SSAPropagationCallGraphBuilder builder = com.ibm.wala.ipa.callgraph.impl.Util.makeZeroCFABuilder(options, new AnalysisCacheImpl(), cha, scope); // 0-CFA = context-insensitive, class-based heap
// CallGraphBuilder builder = com.ibm.wala.ipa.callgraph.impl.Util.makeRTABuilder(options, new AnalysisCacheImpl(), cha, scope); // Rapid Type Analysis
SSAPropagationCallGraphBuilder builder = com.ibm.wala.ipa.callgraph.impl.Util.makeZeroCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope); // 0-CFA = context-insensitive, class-based heap
// CallGraphBuilder builder = com.ibm.wala.ipa.callgraph.impl.Util.makeZeroOneCFABuilder(options, new AnalysisCacheImpl(), cha, scope); // 0-1-CFA = context-insensitive, allocation-site-based heap
// CallGraphBuilder builder = com.ibm.wala.ipa.callgraph.impl.Util.makeZeroOneContainerCFABuilder(options, new AnalysisCacheImpl(), cha, scope); // 0-1-Container-CFA = object-sensitive container

4
src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/GUI.java
View File

@ -2110,9 +2110,9 @@ public class GUI {
JavaScriptInvoke invoki;
invoki = (JavaScriptInvoke) ssaInstr;
System.out.println("Parametetrs="
+ invoki.getNumberOfParameters());
+ invoki.getNumberOfPositionalParameters());
System.out.println("GetFunction=" + invoki.getFunction());
for (int i = 0; i < invoki.getNumberOfParameters(); i++) {
for (int i = 0; i < invoki.getNumberOfPositionalParameters(); i++) {
System.out.println("Get Use=" + invoki.getUse(i));
name = getLocalNames(nodi1, name, ssaInstr, i);

1
src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/ImprovedJSCallGraphBuilderUtil.java
View File

@ -52,7 +52,6 @@ import com.ibm.wala.util.CancelException;
import com.ibm.wala.util.WalaException;
import com.ibm.wala.util.collections.HashSetFactory;
import com.ibm.wala.util.io.FileProvider;
import com.ibm.wala.util.functions.Function;
/**
* TODO this class is a mess. rewrite.