Shared: add back calls lost in the merge conflict

asgerf · asgerf · commit b6df83217d30 · 2024-08-22T11:31:01.000+02:00
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -2557,7 +2557,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             TPathNodeSink(NodeEx node, FlowState state) {
               exists(PathNodeMid sink |
                 sink.isAtSink() and
-                node = sink.getNodeEx() and
+                node = toNormalSinkNodeEx(sink.getNodeEx()) and
                 state = sink.getState()
               )
             } or
@@ -2780,7 +2780,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             PathNodeSink projectToSink(string model) {
               this.isAtSink() and
               sinkModel(node, model) and
-              result.getNodeEx() = node and
+              result.getNodeEx() = toNormalSinkNodeEx(node) and
               result.getState() = state
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -2557,7 +2557,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {`
`2557`	`2557`	`TPathNodeSink(NodeEx node, FlowState state) {`
`2558`	`2558`	`exists(PathNodeMid sink \|`
`2559`	`2559`	`sink.isAtSink() and`
`2560`		`- node = sink.getNodeEx() and`
	`2560`	`+ node = toNormalSinkNodeEx(sink.getNodeEx()) and`
`2561`	`2561`	`state = sink.getState()`
`2562`	`2562`	`)`
`2563`	`2563`	`} or`
`@@ -2780,7 +2780,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {`
`2780`	`2780`	`PathNodeSink projectToSink(string model) {`
`2781`	`2781`	`this.isAtSink() and`
`2782`	`2782`	`sinkModel(node, model) and`
`2783`		`- result.getNodeEx() = node and`
	`2783`	`+ result.getNodeEx() = toNormalSinkNodeEx(node) and`
`2784`	`2784`	`result.getState() = state`
`2785`	`2785`	`}`
`2786`	`2786`	`}`