From 925ec9c437b8711e40a020c71d6883d7e05fe0ab Mon Sep 17 00:00:00 2001
From: "Achim D. Brucker" <adbrucker@0x5f.org>
Date: Tue, 23 Oct 2018 21:30:39 +0100
Subject: [PATCH] Upgrade to latest WALA version.

---
 .../logicalhacking/dasca/dataflow/util/AnalysisUtil.java   | 7 ++++---
 .../src/main/java/com/logicalhacking/dasca/js/GUI.java     | 4 ++--
 .../dasca/js/ImprovedJSCallGraphBuilderUtil.java           | 1 -
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/AnalysisUtil.java b/src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/AnalysisUtil.java
index 18fb74d..5cb7cd1 100644
--- a/src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/AnalysisUtil.java
+++ b/src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/AnalysisUtil.java
@@ -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
 
diff --git a/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/GUI.java b/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/GUI.java
index e720c71..ec537aa 100644
--- a/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/GUI.java
+++ b/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/GUI.java
@@ -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);
diff --git a/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/ImprovedJSCallGraphBuilderUtil.java b/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/ImprovedJSCallGraphBuilderUtil.java
index 13784e1..2917326 100644
--- a/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/ImprovedJSCallGraphBuilderUtil.java
+++ b/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/ImprovedJSCallGraphBuilderUtil.java
@@ -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.