Adapt to new SPDS version

CROSSINGTUD · Feb 4, 2025 · 6113734 · 6113734
1 parent 22718c7
commit 6113734
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/CryptoAnalysis/src/main/java/crypto/analysis/AnalysisSeedWithEnsuredPredicate.java b/CryptoAnalysis/src/main/java/crypto/analysis/AnalysisSeedWithEnsuredPredicate.java
@@ -31,14 +31,14 @@ public void execute() {
         scanner.getAnalysisReporter().onSeedStarted(this);
 
         relevantStatements.put(getOrigin(), -1);
-        for (ControlFlowGraph.Edge edge : analysisResults.asStatementValWeightTable().rowKeySet()) {
+        for (ControlFlowGraph.Edge edge : analysisResults.asEdgeValWeightTable().rowKeySet()) {
             Statement statement = edge.getTarget();
 
             if (!statement.containsInvokeExpr()) {
                 continue;
             }
 
-            Collection<Val> values = analysisResults.asStatementValWeightTable().row(edge).keySet();
+            Collection<Val> values = analysisResults.asEdgeValWeightTable().row(edge).keySet();
 
             InvokeExpr invokeExpr = statement.getInvokeExpr();
             for (int i = 0; i < invokeExpr.getArgs().size(); i++) {

diff --git a/CryptoAnalysis/src/main/java/crypto/analysis/AnalysisSeedWithSpecification.java b/CryptoAnalysis/src/main/java/crypto/analysis/AnalysisSeedWithSpecification.java
@@ -142,14 +142,14 @@ private Optional<CrySLForbiddenMethod> isForbiddenMethod(DeclaredMethod declared
     private void evaluateTypestateOrder() {
         Collection<ControlFlowGraph.Edge> allTypestateChangeStatements = new HashSet<>();
         for (Table.Cell<ControlFlowGraph.Edge, Val, TransitionFunction> cell :
-                analysisResults.asStatementValWeightTable().cellSet()) {
+                analysisResults.asEdgeValWeightTable().cellSet()) {
             Collection<ControlFlowGraph.Edge> edges =
                     cell.getValue().getLastStateChangeStatements();
             allTypestateChangeStatements.addAll(edges);
         }
 
         for (Table.Cell<ControlFlowGraph.Edge, Val, TransitionFunction> c :
-                analysisResults.asStatementValWeightTable().cellSet()) {
+                analysisResults.asEdgeValWeightTable().cellSet()) {
             ControlFlowGraph.Edge curr = c.getRowKey();
 
             // The initial statement is always the start of the CFG edge, all other statements are
@@ -399,7 +399,7 @@ private Collection<IAnalysisSeed> computeRequiredSeeds(
                 ControlFlowGraph.Edge edge = new ControlFlowGraph.Edge(statement, successor);
 
                 Collection<Val> values =
-                        seed.getAnalysisResults().asStatementValWeightTable().row(edge).keySet();
+                        seed.getAnalysisResults().asEdgeValWeightTable().row(edge).keySet();
                 if (values.contains(val)) {
                     result.add(seed);
                 }
@@ -542,7 +542,7 @@ private Collection<IAnalysisSeed> computeGeneratedParameterSeeds(
 
         for (IAnalysisSeed seed : seeds) {
             Collection<Val> values =
-                    seed.getAnalysisResults().asStatementValWeightTable().row(edge).keySet();
+                    seed.getAnalysisResults().asEdgeValWeightTable().row(edge).keySet();
 
             if (values.contains(fact)) {
                 result.add(seed);
@@ -700,7 +700,7 @@ private Collection<State> getStatesAtStatement(Statement statement) {
                 ControlFlowGraph.Edge edge = new ControlFlowGraph.Edge(pred, statement);
 
                 Map<Val, TransitionFunction> rows =
-                        analysisResults.asStatementValWeightTable().row(edge);
+                        analysisResults.asEdgeValWeightTable().row(edge);
                 Collection<Val> values = rows.keySet();
 
                 for (Val arg : invokeExpr.getArgs()) {

diff --git a/CryptoAnalysis/src/main/java/crypto/constraints/EvaluableConstraint.java b/CryptoAnalysis/src/main/java/crypto/constraints/EvaluableConstraint.java
@@ -210,7 +210,7 @@ protected Map<Integer, Val> extractArray(ExtractedValue extractedValue) {
             ForwardBoomerangResults<?> results = solver.solve(forwardQuery);
 
             for (Table.Cell<ControlFlowGraph.Edge, Val, ?> entry :
-                    results.asStatementValWeightTable().cellSet()) {
+                    results.asEdgeValWeightTable().cellSet()) {
                 Statement stmt = entry.getRowKey().getStart();
                 if (!stmt.isArrayStore()) {
                     continue;

diff --git a/CryptoAnalysis/src/test/java/test/UsagePatternResultsListener.java b/CryptoAnalysis/src/test/java/test/UsagePatternResultsListener.java
@@ -54,7 +54,7 @@ public void typestateAnalysisResults(
 
         for (Map.Entry<Statement, StateResult> entry : expectedTypestateResults.entries()) {
             for (Table.Cell<ControlFlowGraph.Edge, Val, TransitionFunction> cell :
-                    results.asStatementValWeightTable().cellSet()) {
+                    results.asEdgeValWeightTable().cellSet()) {
                 Statement expectedStatement = entry.getKey();
                 Collection<Val> expectedVal = entry.getValue().getVal();