C++: Fixes for internals that are now private.

geoffw0 · geoffw0 · commit 959300f96305 · 2024-04-10T17:32:10.000+01:00
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
@@ -29,7 +29,7 @@ DataFlowCallable defaultViableCallable(DataFlowCall call) {
   )
   or
   // Virtual dispatch
-  result = TSourceCallable(call.(VirtualDispatch::DataSensitiveCall).resolve())
+  result.asSourceCallable() = call.(VirtualDispatch::DataSensitiveCall).resolve()
 }
 
 /**
@@ -284,11 +284,8 @@ DataFlowCallable viableImplInCallContext(DataFlowCall call, DataFlowCall ctx) {
   exists(int i, DataFlowCallable f |
     mayBenefitFromCallContext(pragma[only_bind_into](call), f, i) and
     f = ctx.getStaticCallTarget() and
-    result =
-      TSourceCallable(ctx.getArgument(i)
-            .getUnconvertedResultExpression()
-            .(FunctionAccess)
-            .getTarget())
+    result.asSourceCallable() =
+      ctx.getArgument(i).getUnconvertedResultExpression().(FunctionAccess).getTarget()
   )
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
@@ -1063,7 +1063,7 @@ class DataFlowCallable extends TDataFlowCallable {
  * unmodeled flows or duplicate paths), and includes variables (for reasons
  * explained in `DataFlowCallable`).
  */
-private class SourceCallable extends DataFlowCallable, TSourceCallable {
+class SourceCallable extends DataFlowCallable, TSourceCallable {
   Cpp::Declaration decl;
 
   SourceCallable() { this = TSourceCallable(decl) }
@@ -1078,7 +1078,7 @@ private class SourceCallable extends DataFlowCallable, TSourceCallable {
  * models-as-data models as a place to contain the corresponding
  * `FlowSummaryNode`s.
  */
-private class SummarizedCallable extends DataFlowCallable, TSummarizedCallable {
+class SummarizedCallable extends DataFlowCallable, TSummarizedCallable {
   FlowSummaryImpl::Public::SummarizedCallable sc;
 
   SummarizedCallable() { this = TSummarizedCallable(sc) }
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/SummaryCall.ql b/cpp/ql/test/library-tests/dataflow/models-as-data/SummaryCall.ql
@@ -4,9 +4,6 @@ private import semmle.code.cpp.ir.dataflow.internal.DataFlowUtil
 
 query predicate summaryCalls(SummaryCall c) { any() }
 
-query predicate summarizedCallables(DataFlowCallable c) { c = TSummarizedCallable(_) }
+query predicate summarizedCallables(SummarizedCallable c) { any() }
 
-query predicate sourceCallables(DataFlowCallable c) {
-  c = TSourceCallable(_) and
-  c.getLocation().getFile().toString() != ""
-}
+query predicate sourceCallables(SourceCallable c) { c.getLocation().getFile().toString() != "" }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ DataFlowCallable defaultViableCallable(DataFlowCall call) {`
`29`	`29`	`)`
`30`	`30`	`or`
`31`	`31`	`// Virtual dispatch`
`32`		`- result = TSourceCallable(call.(VirtualDispatch::DataSensitiveCall).resolve())`
	`32`	`+ result.asSourceCallable() = call.(VirtualDispatch::DataSensitiveCall).resolve()`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
`@@ -284,11 +284,8 @@ DataFlowCallable viableImplInCallContext(DataFlowCall call, DataFlowCall ctx) {`
`284`	`284`	`exists(int i, DataFlowCallable f \|`
`285`	`285`	`mayBenefitFromCallContext(pragma[only_bind_into](call), f, i) and`
`286`	`286`	`f = ctx.getStaticCallTarget() and`
`287`		`- result =`
`288`		`- TSourceCallable(ctx.getArgument(i)`
`289`		`- .getUnconvertedResultExpression()`
`290`		`- .(FunctionAccess)`
`291`		`- .getTarget())`
	`287`	`+ result.asSourceCallable() =`
	`288`	`+ ctx.getArgument(i).getUnconvertedResultExpression().(FunctionAccess).getTarget()`
`292`	`289`	`)`
`293`	`290`	`}`
`294`	`291`