Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to WALA 1.6.4 #174

Merged
merged 10 commits into from
Mar 29, 2024
Merged

Upgrade to WALA 1.6.4 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
781f095
Upgrade to WALA 1.6.4-SNAPSHOT.
khatchad Mar 23, 2024
6d433a3
Apply spotless.
khatchad Mar 23, 2024
7866a0d
Update Driver.java
khatchad Mar 23, 2024
7a2ff3b
Merge branch 'master' into update_wala
khatchad Mar 26, 2024
d6dc1b6
Fix compilation errors.
khatchad Mar 27, 2024
3687f27
More compilation fixes.
khatchad Mar 27, 2024
1058fd3
Finish fixing compilation errors.
khatchad Mar 27, 2024
fee6e7b
Merge branch 'master' into update_wala
khatchad Mar 27, 2024
918fae9
Apply spotless.
khatchad Mar 27, 2024
832699f
Use WALA 1.6.4.
khatchad Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ython.jython3.test/test-source/com/ibm/wala/cast/python/jython3/test/TestAnnotations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -123,7 +123,7 @@ public void testAnnotation2()
});
});

CAstCallGraphUtil.AVOID_DUMP = false;
CAstCallGraphUtil.AVOID_DUMP.set(false);
CAstCallGraphUtil.dumpCG(
(SSAContextInterpreter) builder.getContextInterpreter(), builder.getPointerAnalysis(), CG);

Expand Down
2 changes: 1 addition & 1 deletion ...m.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestMNISTExamples.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion ...st.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestPythonMLCallGraphShape.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,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(),
Expand Down
2 changes: 1 addition & 1 deletion ...ala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestTensorflow2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestAssign.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
12 changes: 6 additions & 6 deletions com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestCalls.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand All @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestClasses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestMulti.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPrimitives.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ....wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPythonCallGraphShape.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,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(),
Expand Down
2 changes: 1 addition & 1 deletion com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestSlice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion com.ibm.wala.cast.python/source/com/ibm/wala/cast/python/driver/Driver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading