hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-25 08:45:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Geoffrey White
2024-04-10 17:28:42 +01:00
parent 41ce4ffe4b
commit 959300f963
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
View File

@@ -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()
)
}

4
cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
View File

@@ -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) }

7
cpp/ql/test/library-tests/dataflow/models-as-data/SummaryCall.ql
View File

@@ -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() != "" }