C++: Fixes after changes to the flow summary API.

MathiasVP · MathiasVP · commit 076b01cbfc97 · 2026-06-23T20:33:08.000+01:00
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll
@@ -102,6 +102,10 @@ module Input implements InputSig<Location, DataFlowImplSpecific::CppDataFlow> {
 private import Make<Location, DataFlowImplSpecific::CppDataFlow, Input> as Impl
 
 private module StepsInput implements Impl::Private::StepsInputSig {
+  Impl::Private::SummaryNode getSummaryNode(Node n) {
+    result = n.(FlowSummaryNode).getSummaryNode()
+  }
+
   DataFlowCall getACall(Public::SummarizedCallable sc) {
     result.getStaticCallTarget().getUnderlyingCallable() = sc
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowNodes.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowNodes.qll
@@ -1534,12 +1534,8 @@ class FlowSummaryNode extends Node, TFlowSummaryNode {
     result = this.getSummaryNode().getSummarizedCallable()
   }
 
-  /**
-   * Gets the enclosing callable. For a `FlowSummaryNode` this is always the
-   * summarized function this node is part of.
-   */
   override DataFlowCallable getEnclosingCallable() {
-    result.asSummarizedCallable() = this.getSummarizedCallable()
+    result = FlowSummaryImpl::Private::getEnclosingCallable(this.getSummaryNode())
   }
 
   override Location getLocationImpl() { result = this.getSummarizedCallable().getLocation() }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -158,7 +158,7 @@ private module Cached {
     model = ""
     or
     // models-as-data summarized flow
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
       nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)
   }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
@@ -67,7 +67,7 @@ private module Cached {
     model = ""
     or
     // models-as-data summarized flow
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
       nodeTo.(FlowSummaryNode).getSummaryNode(), false, model)
     or
     // object->field conflation for content that is a `TaintInheritingContent`.

Original file line number	Diff line number	Diff line change
`@@ -1534,12 +1534,8 @@ class FlowSummaryNode extends Node, TFlowSummaryNode {`
`1534`	`1534`	`result = this.getSummaryNode().getSummarizedCallable()`
`1535`	`1535`	`}`
`1536`	`1536`
`1537`		`- /**`
`1538`		- * Gets the enclosing callable. For a `FlowSummaryNode` this is always the
`1539`		`- * summarized function this node is part of.`
`1540`		`- */`
`1541`	`1537`	`override DataFlowCallable getEnclosingCallable() {`
`1542`		`- result.asSummarizedCallable() = this.getSummarizedCallable()`
	`1538`	`+ result = FlowSummaryImpl::Private::getEnclosingCallable(this.getSummaryNode())`
`1543`	`1539`	`}`
`1544`	`1540`
`1545`	`1541`	`override Location getLocationImpl() { result = this.getSummarizedCallable().getLocation() }`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ private module Cached {`
`158`	`158`	`model = ""`
`159`	`159`	`or`
`160`	`160`	`// models-as-data summarized flow`
`161`		`- FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),`
	`161`	`+ FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,`
`162`	`162`	`nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)`
`163`	`163`	`}`
`164`	`164`