Merge branch 'master' into contrib_PYTHONPATH

wala · Mar 29, 2024 · a9bb846 · a9bb846
2 parents c423159 + eb59763
commit a9bb846
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 23 deletions.
diff --git a/...ython.jython3.test/test-source/com/ibm/wala/cast/python/jython3/test/TestAnnotations.java b/...ython.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/...m.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestMNISTExamples.java b/...m.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/...st.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestPythonMLCallGraphShape.java b/...st.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestPythonMLCallGraphShape.java
@@ -129,7 +129,7 @@ public static void main(String[] args)
     CallGraphBuilder<? super InstanceKey> 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/...ala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestTensorflow2Model.java b/...ala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestTensorflow2Model.java
@@ -1660,7 +1660,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/....wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPythonCallGraphShape.java b/....wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPythonCallGraphShape.java
@@ -146,7 +146,7 @@ public static void main(String[] args)
     CallGraphBuilder<? super InstanceKey> 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
@@ -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
@@ -65,7 +65,7 @@ protected <T> T runit(PythonAnalysisEngine<T> E, String... args)
     @SuppressWarnings("unchecked")
     PointerAnalysis<InstanceKey> PA = (PointerAnalysis<InstanceKey>) 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
@@ -29,7 +29,7 @@
     <maven.compiler.version>3.10.1</maven.compiler.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <build-alias>b000</build-alias>
-    <wala.version>1.6.0</wala.version>
+    <wala.version>1.6.4</wala.version>
     <spotless.version>2.43.0</spotless.version>
     <maven.surefire.version>3.0.0-M7</maven.surefire.version>
     <parallel>both</parallel>