C++ and Swift: Fix merge conflicts.

Author: geoffw0

cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll

@@ -1969,14 +1969,13 @@ private module Cached {
   cached
   predicate localFlowStep(Node nodeFrom, Node nodeTo) {
     // common dataflow steps
-    simpleLocalFlowStep(nodeFrom, nodeTo)
+    simpleLocalFlowStep(nodeFrom, nodeTo, _)
     or
     // models-as-data summarized flow for local data flow (i.e. special case for flow
     // through calls to modeled functions, without relying on global dataflow to join
     // the dots).
     FlowSummaryImpl::Private::Steps::summaryThroughStepValue(nodeFrom, nodeTo, _)
   }
-  predicate localFlowStep(Node nodeFrom, Node nodeTo) { simpleLocalFlowStep(nodeFrom, nodeTo, _) }
 
   private predicate indirectionOperandFlow(RawIndirectOperand nodeFrom, Node nodeTo) {
     nodeFrom != nodeTo and
@@ -2084,13 +2083,12 @@ private module Cached {
     // Reverse flow: data that flows from the definition node back into the indirection returned
     // by a function. This allows data to flow 'in' through references returned by a modeled
     // function such as `operator[]`.
-    reverseFlow(nodeFrom, nodeTo)
+    reverseFlow(nodeFrom, nodeTo) and
+    model = ""
     or
     // models-as-data summarized flow
     FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),
-      nodeTo.(FlowSummaryNode).getSummaryNode(), true)
-    reverseFlow(nodeFrom, nodeTo) and
-    model = ""
+      nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)
   }
 
   private predicate simpleInstructionLocalFlowStep(Operand opFrom, Instruction iTo) {

cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll

@@ -20,13 +20,12 @@ predicate localTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
   DataFlow::localFlowStep(nodeFrom, nodeTo)
   or
   // taint flow step
-  localAdditionalTaintStep(nodeFrom, nodeTo)
+  localAdditionalTaintStep(nodeFrom, nodeTo, _)
   or
   // models-as-data summarized flow for local data flow (i.e. special case for flow
   // through calls to modeled functions, without relying on global dataflow to join
   // the dots).
   FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(nodeFrom, nodeTo, _)
-  localAdditionalTaintStep(nodeFrom, nodeTo, _)
 }
 
 /**
@@ -55,7 +54,7 @@ predicate localAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeT
   or
   // models-as-data summarized flow
   FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),
-    nodeTo.(FlowSummaryNode).getSummaryNode(), false)
+    nodeTo.(FlowSummaryNode).getSummaryNode(), false, model)
   or
   // object->field conflation for content that is a `TaintInheritingContent`.
   exists(DataFlow::ContentSet f |

swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll

@@ -323,10 +323,9 @@ private module Cached {
   /** This is the local flow predicate that is exposed. */
   cached
   predicate localFlowStepImpl(Node nodeFrom, Node nodeTo) {
-    localFlowStepCommon(nodeFrom, nodeTo)
+    localFlowStepCommon(nodeFrom, nodeTo, _)
     or
     // models-as-data summarized flow
-    localFlowStepCommon(nodeFrom, nodeTo, _) or
     FlowSummaryImpl::Private::Steps::summaryThroughStepValue(nodeFrom, nodeTo, _)
   }