Rebased with parallel passes

Fraunhofer-AISEC · Dec 30, 2023 · 93f11a3 · 93f11a3
1 parent 6febb7b
commit 93f11a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/builder/Fluent.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/builder/Fluent.kt
@@ -50,17 +50,13 @@ fun LanguageFrontend<*, *>.translationResult(
     node.addComponent(component)
     init(node)
 
-<<<<<<< HEAD
     if (ctx.config.useParallelPasses) {
         for (list in ctx.config.registeredPasses) {
             executePassesInParallel(list, ctx, node, listOf())
         }
     } else {
         ctx.config.registeredPasses.flatten().forEach { executePass(it, ctx, node, listOf()) }
     }
-=======
-    ctx.config.registeredPasses.flatten().forEach { executePassSequential(it, ctx, node, listOf()) }
->>>>>>> 0dc5b459c (Experimental support to run passes in parallel)
 
     return node
 }

diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/ControlFlowSensitiveDFGPass.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/ControlFlowSensitiveDFGPass.kt
@@ -111,13 +111,17 @@ open class ControlFlowSensitiveDFGPass(ctx: TranslationContext) : EOGStarterPass
                 // elements. We have the indices here, so it's amazing.
                 key.elements.forEachIndexed { i, element ->
                     element.addAllPrevDFG(
-                        value.elements.filterNot { it is VariableDeclaration && key == it },
+                        value.elements.filterNot {
+                            (it is VariableDeclaration || it is ParameterDeclaration) && key == it
+                        },
                         mutableMapOf(Properties.INDEX to i)
                     )
                 }
             } else {
                 key.addAllPrevDFG(
-                    value.elements.filterNot { it is VariableDeclaration && key == it }
+                    value.elements.filterNot {
+                        (it is VariableDeclaration || it is ParameterDeclaration) && key == it
+                    }
                 )
             }
         }