C++: Fix unintentionally changing the type of AdditionalCallTarget.viableTarget.

geoffw0 · geoffw0 · commit 13100b19bc78 · 2024-04-11T17:07:20.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
@@ -40,7 +40,7 @@ DataFlowCallable viableCallable(DataFlowCall call) {
   result = defaultViableCallable(call)
   or
   // Additional call targets
-  result =
+  result.getUnderlyingCallable() =
     any(AdditionalCallTarget additional)
         .viableTarget(call.asCallInstruction().getUnconvertedResultExpression())
 }
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
@@ -2681,5 +2681,5 @@ class AdditionalCallTarget extends Unit {
   /**
    * Gets a viable target for `call`.
    */
-  abstract DataFlowCallable viableTarget(Call call);
+  abstract Declaration viableTarget(Call call);
 }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ DataFlowCallable viableCallable(DataFlowCall call) {`
`40`	`40`	`result = defaultViableCallable(call)`
`41`	`41`	`or`
`42`	`42`	`// Additional call targets`
`43`		`- result =`
	`43`	`+ result.getUnderlyingCallable() =`
`44`	`44`	`any(AdditionalCallTarget additional)`
`45`	`45`	`.viableTarget(call.asCallInstruction().getUnconvertedResultExpression())`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2681,5 +2681,5 @@ class AdditionalCallTarget extends Unit {`
`2681`	`2681`	`/**`
`2682`	`2682`	* Gets a viable target for `call`.
`2683`	`2683`	`*/`
`2684`		`- abstract DataFlowCallable viableTarget(Call call);`
	`2684`	`+ abstract Declaration viableTarget(Call call);`
`2685`	`2685`	`}`