From eb597639f971e31d9e0aaa9af9cf2b86c61da7ea Mon Sep 17 00:00:00 2001 From: Raffi Khatchadourian Date: Fri, 29 Mar 2024 14:02:49 -0400 Subject: [PATCH] Upgrade to WALA 1.6.4 (#174) Test issue https://github.com/wala/WALA/issues/1377. --- .../cast/python/jython3/test/TestAnnotations.java | 4 ++-- .../wala/cast/python/ml/test/TestMNISTExamples.java | 2 +- .../python/ml/test/TestPythonMLCallGraphShape.java | 2 +- .../cast/python/ml/test/TestTensorflow2Model.java | 2 +- .../com/ibm/wala/cast/python/test/TestAssign.java | 2 +- .../com/ibm/wala/cast/python/test/TestCalls.java | 12 ++++++------ .../com/ibm/wala/cast/python/test/TestClasses.java | 2 +- .../com/ibm/wala/cast/python/test/TestMulti.java | 10 +++++----- .../ibm/wala/cast/python/test/TestPrimitives.java | 2 +- .../cast/python/test/TestPythonCallGraphShape.java | 2 +- .../com/ibm/wala/cast/python/test/TestSlice.java | 2 +- .../com/ibm/wala/cast/python/driver/Driver.java | 2 +- pom.xml | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/com.ibm.wala.cast.python.jython3.test/test-source/com/ibm/wala/cast/python/jython3/test/TestAnnotations.java b/com.ibm.wala.cast.python.jython3.test/test-source/com/ibm/wala/cast/python/jython3/test/TestAnnotations.java index b19714539..d9093d820 100644 --- a/com.ibm.wala.cast.python.jython3.test/test-source/com/ibm/wala/cast/python/jython3/test/TestAnnotations.java +++ b/com.ibm.wala.cast.python.jython3.test/test-source/com/ibm/wala/cast/python/jython3/test/TestAnnotations.java @@ -38,7 +38,7 @@ public void testAnnotation1() PythonSSAPropagationCallGraphBuilder builder = bb.defaultCallGraphBuilder(); CallGraph CG = builder.makeCallGraph(builder.getOptions()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) builder.getContextInterpreter(), builder.getPointerAnalysis(), CG); @@ -123,7 +123,7 @@ public void testAnnotation2() }); }); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) builder.getContextInterpreter(), builder.getPointerAnalysis(), CG); diff --git a/com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestMNISTExamples.java b/com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestMNISTExamples.java index e1bb06cd7..eb80eb3fe 100644 --- a/com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestMNISTExamples.java +++ b/com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestMNISTExamples.java @@ -77,7 +77,7 @@ public void testEx2Tensors() throws IllegalArgumentException, CancelException, I checkTensorOps( Ex2URL, (PropagationCallGraphBuilder cgBuilder, CallGraph CG, TensorTypeAnalysis result) -> { - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) cgBuilder.getContextInterpreter(), cgBuilder.getPointerAnalysis(), diff --git a/com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestPythonMLCallGraphShape.java b/com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestPythonMLCallGraphShape.java index 0eb911b0d..9f5edc938 100644 --- a/com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestPythonMLCallGraphShape.java +++ b/com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestPythonMLCallGraphShape.java @@ -117,7 +117,7 @@ public static void main(String[] args) CallGraphBuilder builder = E.defaultCallGraphBuilder(); CallGraph CG = builder.makeCallGraph(E.getOptions(), new NullProgressMonitor()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( ((SSAPropagationCallGraphBuilder) builder).getCFAContextInterpreter(), E.getPointerAnalysis(), diff --git a/com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestTensorflow2Model.java b/com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestTensorflow2Model.java index 4b088ac67..2745b60a3 100644 --- a/com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestTensorflow2Model.java +++ b/com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestTensorflow2Model.java @@ -1505,7 +1505,7 @@ private void test( assertNotNull(CG); if (LOGGER.isLoggable(Level.FINE)) { - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( ((SSAPropagationCallGraphBuilder) builder).getCFAContextInterpreter(), builder.getPointerAnalysis(), diff --git a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestAssign.java b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestAssign.java index c88515e8d..c2dcc9232 100644 --- a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestAssign.java +++ b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestAssign.java @@ -48,7 +48,7 @@ public void testAssign2() CallGraph CG = B.makeCallGraph(B.getOptions()); verifyGraphAssertions(CG, assertionsAssign2); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) B.getContextInterpreter(), B.getPointerAnalysis(), CG); } diff --git a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestCalls.java b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestCalls.java index c6e6b3645..d784a0472 100644 --- a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestCalls.java +++ b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestCalls.java @@ -155,7 +155,7 @@ public Void performAnalysis(PropagationCallGraphBuilder builder) throws CancelEx PropagationCallGraphBuilder cgBuilder = (PropagationCallGraphBuilder) e.defaultCallGraphBuilder(); CallGraph CG = cgBuilder.makeCallGraph(cgBuilder.getOptions()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) cgBuilder.getContextInterpreter(), cgBuilder.getPointerAnalysis(), @@ -190,7 +190,7 @@ public Void performAnalysis(PropagationCallGraphBuilder builder) throws CancelEx PropagationCallGraphBuilder cgBuilder = (PropagationCallGraphBuilder) e.defaultCallGraphBuilder(); CallGraph CG = cgBuilder.makeCallGraph(cgBuilder.getOptions()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) cgBuilder.getContextInterpreter(), cgBuilder.getPointerAnalysis(), @@ -228,7 +228,7 @@ public Void performAnalysis(PropagationCallGraphBuilder builder) throws CancelEx PropagationCallGraphBuilder cgBuilder = (PropagationCallGraphBuilder) e.defaultCallGraphBuilder(); CallGraph CG = cgBuilder.makeCallGraph(cgBuilder.getOptions()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) cgBuilder.getContextInterpreter(), cgBuilder.getPointerAnalysis(), @@ -268,7 +268,7 @@ public Void performAnalysis(PropagationCallGraphBuilder builder) throws CancelEx CallGraph callGraph = callGraphBuilder.makeCallGraph(callGraphBuilder.getOptions()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) callGraphBuilder.getContextInterpreter(), callGraphBuilder.getPointerAnalysis(), @@ -300,7 +300,7 @@ public void testPytestCalls2() CallGraph callGraph = callGraphBuilder.makeCallGraph(callGraphBuilder.getOptions()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) callGraphBuilder.getContextInterpreter(), callGraphBuilder.getPointerAnalysis(), @@ -321,7 +321,7 @@ public void testPytestCalls3() PropagationCallGraphBuilder callGraphBuilder = engine.defaultCallGraphBuilder(); addPytestEntrypoints(callGraphBuilder); CallGraph callGraph = callGraphBuilder.makeCallGraph(callGraphBuilder.getOptions()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) callGraphBuilder.getContextInterpreter(), callGraphBuilder.getPointerAnalysis(), diff --git a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestClasses.java b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestClasses.java index d417b3b14..874435611 100644 --- a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestClasses.java +++ b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestClasses.java @@ -114,7 +114,7 @@ public void testClasses3() (SSAPropagationCallGraphBuilder) engine.defaultCallGraphBuilder(); CallGraph CG = builder.makeCallGraph(builder.getOptions()); System.err.println(CG); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) builder.getContextInterpreter(), builder.getPointerAnalysis(), CG); verifyGraphAssertions(CG, assertionsClasses3); diff --git a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestMulti.java b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestMulti.java index 7a27637ad..40738567e 100644 --- a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestMulti.java +++ b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestMulti.java @@ -37,7 +37,7 @@ public void testMulti1() PropagationCallGraphBuilder builder = (PropagationCallGraphBuilder) engine.defaultCallGraphBuilder(); CallGraph CG = builder.makeCallGraph(engine.getOptions(), new NullProgressMonitor()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) builder.getContextInterpreter(), builder.getPointerAnalysis(), CG); verifyGraphAssertions(CG, assertionsMulti1); @@ -59,7 +59,7 @@ public void testMulti2() PropagationCallGraphBuilder builder = (PropagationCallGraphBuilder) engine.defaultCallGraphBuilder(); CallGraph CG = builder.makeCallGraph(engine.getOptions(), new NullProgressMonitor()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) builder.getContextInterpreter(), builder.getPointerAnalysis(), CG); verifyGraphAssertions(CG, assertionsMulti2); @@ -79,7 +79,7 @@ public void testMulti3() PropagationCallGraphBuilder builder = (PropagationCallGraphBuilder) engine.defaultCallGraphBuilder(); CallGraph CG = builder.makeCallGraph(engine.getOptions(), new NullProgressMonitor()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) builder.getContextInterpreter(), builder.getPointerAnalysis(), CG); verifyGraphAssertions(CG, assertionsMulti3); @@ -99,7 +99,7 @@ public void testMulti4() PropagationCallGraphBuilder builder = (PropagationCallGraphBuilder) engine.defaultCallGraphBuilder(); CallGraph CG = builder.makeCallGraph(engine.getOptions(), new NullProgressMonitor()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) builder.getContextInterpreter(), builder.getPointerAnalysis(), CG); verifyGraphAssertions(CG, assertionsMulti4); @@ -119,7 +119,7 @@ public void testMulti5() PropagationCallGraphBuilder builder = (PropagationCallGraphBuilder) engine.defaultCallGraphBuilder(); CallGraph CG = builder.makeCallGraph(engine.getOptions(), new NullProgressMonitor()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) builder.getContextInterpreter(), builder.getPointerAnalysis(), CG); verifyGraphAssertions(CG, assertionsMulti5); diff --git a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPrimitives.java b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPrimitives.java index cfc9d769a..cf8d312e1 100644 --- a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPrimitives.java +++ b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPrimitives.java @@ -19,7 +19,7 @@ public void testSource1() SSAPropagationCallGraphBuilder builder = (SSAPropagationCallGraphBuilder) engine.defaultCallGraphBuilder(); CallGraph CG = builder.makeCallGraph(builder.getOptions()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) builder.getContextInterpreter(), builder.getPointerAnalysis(), CG); // verifyGraphAssertions(CG, assertionsCalls1); diff --git a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPythonCallGraphShape.java b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPythonCallGraphShape.java index 6ae027889..39b622b39 100644 --- a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPythonCallGraphShape.java +++ b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPythonCallGraphShape.java @@ -132,7 +132,7 @@ public static void main(String[] args) CallGraphBuilder builder = E.defaultCallGraphBuilder(); CallGraph CG = builder.makeCallGraph(E.getOptions(), new NullProgressMonitor()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( ((SSAPropagationCallGraphBuilder) builder).getCFAContextInterpreter(), builder.getPointerAnalysis(), diff --git a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestSlice.java b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestSlice.java index fb060a6a4..1fbbdbc7d 100644 --- a/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestSlice.java +++ b/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestSlice.java @@ -85,7 +85,7 @@ public void testSlice2() SSAPropagationCallGraphBuilder builder = (SSAPropagationCallGraphBuilder) engine.defaultCallGraphBuilder(); CallGraph CG = builder.makeCallGraph(builder.getOptions()); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( (SSAContextInterpreter) builder.getContextInterpreter(), builder.getPointerAnalysis(), CG); verifyGraphAssertions(CG, assertionsSlice2); diff --git a/com.ibm.wala.cast.python/source/com/ibm/wala/cast/python/driver/Driver.java b/com.ibm.wala.cast.python/source/com/ibm/wala/cast/python/driver/Driver.java index e3e70192a..fb4da74e7 100644 --- a/com.ibm.wala.cast.python/source/com/ibm/wala/cast/python/driver/Driver.java +++ b/com.ibm.wala.cast.python/source/com/ibm/wala/cast/python/driver/Driver.java @@ -65,7 +65,7 @@ protected T runit(PythonAnalysisEngine E, String... args) @SuppressWarnings("unchecked") PointerAnalysis PA = (PointerAnalysis) builder.getPointerAnalysis(); - CAstCallGraphUtil.AVOID_DUMP = false; + CAstCallGraphUtil.AVOID_DUMP.set(false); CAstCallGraphUtil.dumpCG( ((SSAPropagationCallGraphBuilder) builder).getCFAContextInterpreter(), PA, CG); diff --git a/pom.xml b/pom.xml index 4a2b38b27..a09dc8006 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 3.10.1 UTF-8 b000 - 1.6.0 + 1.6.4 2.43.0 3.0.0-M7 both