Skip to content

Commit 740bb84

Browse files
committed
Dataflow: Rename prunedViableImplInCallContextReverse to viableImplCallContextReducedReverse.
1 parent 0561c65 commit 740bb84

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

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

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

25552555
private signature module Level1CallContextInputSig {
25562556
predicate reducedViableImplInReturn(DataFlowCallable c, DataFlowCall call);
2557-
2558-
DataFlowCall prunedViableImplInCallContextReverse(
2559-
DataFlowCallable callable, CallContextReturn ctx
2560-
);
25612557
}
25622558

25632559
private module Level1CallContext<Level1CallContextInputSig Input> {
@@ -2574,10 +2570,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
25742570

25752571
CcCall ccSomeCall() { result instanceof CallContextSomeCall }
25762572

2577-
DataFlowCall viableImplCallContextReducedReverse(DataFlowCallable c, CcNoCall ctx) {
2578-
result = Input::prunedViableImplInCallContextReverse(c, ctx)
2579-
}
2580-
25812573
predicate viableImplNotCallContextReducedReverse(CcNoCall ctx) {
25822574
ctx instanceof CallContextAny
25832575
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,8 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
582582
* the possible call sites are restricted.
583583
*/
584584
pragma[nomagic]
585-
DataFlowCall prunedViableImplInCallContextReverse(
586-
DataFlowCallable callable, CallContextReturn ctx
585+
DataFlowCall viableImplCallContextReducedReverse(
586+
DataFlowCallable callable, CallContextNoCall ctx
587587
) {
588588
exists(DataFlowCallable c0, DataFlowCall call0 |
589589
callEnclosingCallable(call0, callable) and
@@ -600,7 +600,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
600600
predicate resolveReturn(CallContextNoCall cc, DataFlowCallable callable, DataFlowCall call) {
601601
cc instanceof CallContextAny and relevantCallEdgeOut(call, callable)
602602
or
603-
call = prunedViableImplInCallContextReverse(callable, cc)
603+
call = viableImplCallContextReducedReverse(callable, cc)
604604
}
605605

606606
/** Gets the call context when returning from `c` to `call`. */
@@ -888,10 +888,10 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
888888
}
889889

890890
cached
891-
DataFlowCall prunedViableImplInCallContextReverse(
892-
DataFlowCallable callable, CallContextReturn ctx
891+
DataFlowCall viableImplCallContextReducedReverse(
892+
DataFlowCallable callable, CallContextNoCall ctx
893893
) {
894-
result = Impl2::prunedViableImplInCallContextReverse(callable, ctx)
894+
result = Impl2::viableImplCallContextReducedReverse(callable, ctx)
895895
}
896896
}
897897

0 commit comments

Comments
 (0)