Skip to content

Commit aa87243

Browse files
committed
Dataflow: Rename prunedViableImplInCallContext to viableImplCallContextReduced
1 parent ace369f commit aa87243

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

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

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

25552555
private signature module Level1CallContextInputSig {
2556-
DataFlowCallable prunedViableImplInCallContext(DataFlowCall call, CallContextSpecificCall ctx);
2557-
25582556
bindingset[call, ctx]
25592557
predicate noPrunedViableImplInCallContext(DataFlowCall call, CallContext ctx);
25602558

@@ -2579,10 +2577,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
25792577

25802578
CcCall ccSomeCall() { result instanceof CallContextSomeCall }
25812579

2582-
DataFlowCallable viableImplCallContextReduced(DataFlowCall call, CcCall ctx) {
2583-
result = Input::prunedViableImplInCallContext(call, ctx)
2584-
}
2585-
25862580
bindingset[call, ctx]
25872581
predicate viableImplNotCallContextReduced(DataFlowCall call, Cc ctx) {
25882582
Input::noPrunedViableImplInCallContext(call, ctx)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
543543
* makes a difference.
544544
*/
545545
pragma[nomagic]
546-
DataFlowCallable prunedViableImplInCallContext(DataFlowCall call, CallContextSpecificCall ctx) {
546+
DataFlowCallable viableImplCallContextReduced(DataFlowCall call, CallContextCall ctx) {
547547
exists(DataFlowCall outer | ctx = TSpecificCall(outer) |
548548
result = viableImplInCallContextExtIn(call, outer) and
549549
Input2::reducedViableImplInCallContext(call, _, outer)
@@ -570,7 +570,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
570570
*/
571571
bindingset[call, cc]
572572
DataFlowCallable resolveCall(DataFlowCall call, CallContext cc) {
573-
result = prunedViableImplInCallContext(call, cc)
573+
result = viableImplCallContextReduced(call, cc)
574574
or
575575
noPrunedViableImplInCallContext(call, cc) and
576576
relevantCallEdgeIn(call, result)
@@ -883,8 +883,8 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
883883
import Impl2
884884

885885
cached
886-
DataFlowCallable prunedViableImplInCallContext(DataFlowCall call, CallContextSpecificCall ctx) {
887-
result = Impl2::prunedViableImplInCallContext(call, ctx)
886+
DataFlowCallable viableImplCallContextReduced(DataFlowCall call, CallContextCall ctx) {
887+
result = Impl2::viableImplCallContextReduced(call, ctx)
888888
}
889889

890890
cached

0 commit comments

Comments
 (0)