fix breaking merge changes

Fraunhofer-AISEC · Oct 16, 2024 · 5c20b05 · 5c20b05
1 parent cc8eb48
commit 5c20b05
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/...alysis/src/main/kotlin/de/fraunhofer/aisec/cpg/analysis/abstracteval/AbstractEvaluator.kt b/...alysis/src/main/kotlin/de/fraunhofer/aisec/cpg/analysis/abstracteval/AbstractEvaluator.kt
@@ -144,9 +144,7 @@ class AbstractEvaluator {
         // This is implemented in IntervalState.push
         // Only do this if we have not reached the goal node
         if (currentNode != goalNode) {
-            currentNode.nextEOG.forEach {
-                newState.push(it, newState[currentNode])
-            }
+            currentNode.nextEOG.forEach { newState.push(it, newState[currentNode]) }
         }
 
         return newState

diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/helpers/EOGWorklist.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/helpers/EOGWorklist.kt
@@ -26,7 +26,7 @@
 package de.fraunhofer.aisec.cpg.helpers
 
 import de.fraunhofer.aisec.cpg.graph.Node
-import de.fraunhofer.aisec.cpg.graph.edge.PropertyEdge
+import de.fraunhofer.aisec.cpg.graph.edges.Edge
 import java.util.IdentityHashMap
 
 /**
@@ -273,15 +273,15 @@ inline fun <reified K : Node, V> iterateEOG(
     return iterateEOG(startNode, startState, transformation, null)
 }
 
-inline fun <reified K : PropertyEdge<Node>, N : Any, V> iterateEOG(
+inline fun <reified K : Edge<Node>, N : Any, V> iterateEOG(
     startEdges: List<K>,
     startState: State<N, V>,
     transformation: (K, State<N, V>) -> State<N, V>
 ): State<N, V>? {
     return iterateEOG(startEdges, startState) { k, s, _ -> transformation(k, s) }
 }
 
-inline fun <reified K : PropertyEdge<Node>, N : Any, V> iterateEOG(
+inline fun <reified K : Edge<Node>, N : Any, V> iterateEOG(
     startEdges: List<K>,
     startState: State<N, V>,
     transformation: (K, State<N, V>, Worklist<K, N, V>) -> State<N, V>

diff --git a/cpg-neo4j/src/main/kotlin/de/fraunhofer/aisec/cpg_vis_neo4j/Application.kt b/cpg-neo4j/src/main/kotlin/de/fraunhofer/aisec/cpg_vis_neo4j/Application.kt
@@ -624,7 +624,7 @@ class Application : Callable<Int> {
         val targetNodes = nodes.filter { it.name.localName == "a" }
         val focusNode =
             targetNodes.first {
-                it.location?.region?.startLine == 87 &&
+                it.location?.region?.startLine == 101 &&
                     it is Reference &&
                     it.type.name.toString() ==
                         "int" // "java.util.LinkedList<java.lang.Integer>" // "int[]"