Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Make sure to move typeObservers from old to new node when replacing nodes #1783

Merged
merged 2 commits into from
Oct 7, 2024
Merged

Make sure to move typeObservers from old to new node when replacing nodes #1783

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7963422
Make sure to move `typeObservers` from old to new node when replacing…
oxisto Oct 7, 2024
994e4eb
Added doc for typeobservers
oxisto Oct 7, 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
10 changes: 9 additions & 1 deletion cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/helpers/SubgraphWalker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import de.fraunhofer.aisec.cpg.graph.declarations.RecordDeclaration
import de.fraunhofer.aisec.cpg.graph.edges.ast.AstEdge
import de.fraunhofer.aisec.cpg.graph.edges.collections.EdgeCollection
import de.fraunhofer.aisec.cpg.graph.statements.expressions.Expression
import de.fraunhofer.aisec.cpg.graph.types.HasType
import de.fraunhofer.aisec.cpg.passes.Pass
import de.fraunhofer.aisec.cpg.processing.strategy.Strategy
import java.lang.annotation.AnnotationFormatError
Expand Down Expand Up @@ -349,13 +350,14 @@ object SubgraphWalker {
/**
* Tries to replace the [old] expression with a [new] one, given the [parent].
*
* There are two things to consider:
* There are three things to consider:
* - First, this only works if [parent] is either an [ArgumentHolder] or [StatementHolder].
* Otherwise, we cannot instruct the parent to exchange the node
* - Second, since exchanging the node has influence on their edges (such as EOG, DFG, etc.), we
* only support a replacement very early in the pass system. To be specific, we only allow
* replacement before any DFG edges are set. We are re-wiring EOG edges, but nothing else. If one
* tries to replace a node with existing [Node.nextDFG] or [Node.prevDFG], we fail.
* - We also migrate [HasType.typeObservers] from the [old] to the [new] node.
*/
context(ContextProvider)
fun SubgraphWalker.ScopedWalker.replace(parent: Node?, old: Expression, new: Expression): Boolean {
Expand Down Expand Up @@ -391,6 +393,12 @@ fun SubgraphWalker.ScopedWalker.replace(parent: Node?, old: Expression, new: Exp
new.prevEOG = oldPrevEOG
new.nextEOG = oldNextEOG

// Also move over any type observers
old.typeObservers.forEach {
old.unregisterTypeObserver(it)
new.registerTypeObserver(it)
}

// Make sure to inform the walker about our change
this.registerReplacement(old, new)
}
Expand Down
Loading