FlowSummaryImpl: Model more source/sink steps as jump steps

Author: hvitved

shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll

@@ -2260,22 +2260,18 @@ module Make<
       /** Provides a compilation of flow summaries to atomic data-flow steps. */
       module Steps<StepsInputSig StepsInput> {
         private predicate sourceExitStep(SourceOutputNode nodeFrom, Node nodeTo, boolean local) {
-          exists(SummaryComponent sc, SourceSinkReportingElement e |
-            nodeFrom.isExit(_, sc, e, _) and
+          exists(SummaryComponent sc, SourceSinkReportingElement e, string model |
+            nodeFrom.isExit(_, sc, e, model) and
             nodeTo = getSourceDataFlowNode(e, sc) and
-            if e.getEnclosingCallable() = getNodeEnclosingCallable(nodeTo)
-            then local = true
-            else local = false
+            if nodeFrom.isEntry(_, model) then local = true else local = false
           )
         }
 
         private predicate sinkEntryStep(Node nodeFrom, SinkInputNode nodeTo, boolean local) {
-          exists(SummaryComponent sc, SourceSinkReportingElement e |
-            nodeTo.isEntry(_, sc, e, _) and
+          exists(SummaryComponent sc, SourceSinkReportingElement e, string model |
+            nodeTo.isEntry(_, sc, e, model) and
             nodeFrom = getSinkDataFlowNode(e, sc) and
-            if e.getEnclosingCallable() = getNodeEnclosingCallable(nodeFrom)
-            then local = true
-            else local = false
+            if nodeTo.isExit(_, model) then local = true else local = false
           )
         }