Skip to content

Commit 0561c65

Browse files
committed
Dataflow: Rename noPrunedViableImplInCallContext to viableImplNotCallContextReduced.
1 parent aa87243 commit 0561c65

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2553,9 +2553,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
25532553
}
25542554

25552555
private signature module Level1CallContextInputSig {
2556-
bindingset[call, ctx]
2557-
predicate noPrunedViableImplInCallContext(DataFlowCall call, CallContext ctx);
2558-
25592556
predicate reducedViableImplInReturn(DataFlowCallable c, DataFlowCall call);
25602557

25612558
DataFlowCall prunedViableImplInCallContextReverse(
@@ -2577,11 +2574,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
25772574

25782575
CcCall ccSomeCall() { result instanceof CallContextSomeCall }
25792576

2580-
bindingset[call, ctx]
2581-
predicate viableImplNotCallContextReduced(DataFlowCall call, Cc ctx) {
2582-
Input::noPrunedViableImplInCallContext(call, ctx)
2583-
}
2584-
25852577
DataFlowCall viableImplCallContextReducedReverse(DataFlowCallable c, CcNoCall ctx) {
25862578
result = Input::prunedViableImplInCallContextReverse(c, ctx)
25872579
}

shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
552552

553553
/** Holds if `call` does not have a reduced set of dispatch targets in call context `ctx`. */
554554
bindingset[call, ctx]
555-
predicate noPrunedViableImplInCallContext(DataFlowCall call, CallContext ctx) {
555+
predicate viableImplNotCallContextReduced(DataFlowCall call, CallContext ctx) {
556556
exists(DataFlowCall outer | ctx = TSpecificCall(outer) |
557557
not Input2::reducedViableImplInCallContext(call, _, outer)
558558
)
@@ -572,7 +572,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
572572
DataFlowCallable resolveCall(DataFlowCall call, CallContext cc) {
573573
result = viableImplCallContextReduced(call, cc)
574574
or
575-
noPrunedViableImplInCallContext(call, cc) and
575+
viableImplNotCallContextReduced(call, cc) and
576576
relevantCallEdgeIn(call, result)
577577
}
578578

0 commit comments

Comments
 (0)