Skip to content

Commit f6eb82e

Browse files
committed
Dataflow: Simplify.
1 parent 5ac96d0 commit f6eb82e

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2552,11 +2552,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
25522552
CcNoCall getCallContextReturn(DataFlowCallable c, DataFlowCall call) { any() }
25532553
}
25542554

2555-
private signature module Level1CallContextInputSig {
2556-
predicate reducedViableImplInReturn(DataFlowCallable c, DataFlowCall call);
2557-
}
2558-
2559-
private module Level1CallContext<Level1CallContextInputSig Input> {
2555+
private module Level1CallContext {
25602556
class Cc = CallContext;
25612557

25622558
class CcCall = CallContextCall;
@@ -2608,12 +2604,12 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
26082604

26092605
ApOption apSome(Ap ap) { result = TBooleanSome(ap) }
26102606

2611-
private module Level1CallContextInput implements Level1CallContextInputSig {
2607+
private module Level1CallContextInput {
26122608
import CachedCallContextSensitivity
26132609
}
26142610

26152611
import Level1CallContextInput
2616-
import Level1CallContext<Level1CallContextInput>
2612+
import Level1CallContext
26172613
import NoLocalCallContext
26182614

26192615
bindingset[node1, state1]
@@ -2887,7 +2883,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
28872883

28882884
ApOption apSome(Ap ap) { result = TApproxAccessPathFrontSome(ap) }
28892885

2890-
additional module Level1CallContextInput implements Level1CallContextInputSig {
2886+
additional module Level1CallContextInput {
28912887
private module CallContextSensitivityInput implements CallContextSensitivityInputSig {
28922888
predicate relevantCallEdgeIn = PrevStage::relevantCallEdgeIn/2;
28932889

@@ -2904,7 +2900,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
29042900
}
29052901

29062902
import Level1CallContextInput
2907-
import Level1CallContext<Level1CallContextInput>
2903+
import Level1CallContext
29082904
import NoLocalCallContext
29092905

29102906
predicate localStep(
@@ -3280,7 +3276,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
32803276

32813277
ApOption apSome(Ap ap) { result = TAccessPathApproxSome(ap) }
32823278

3283-
additional module Level1CallContextInput implements Level1CallContextInputSig {
3279+
additional module Level1CallContextInput {
32843280
private module CallContextSensitivityInput implements CallContextSensitivityInputSig {
32853281
predicate relevantCallEdgeIn = PrevStage::relevantCallEdgeIn/2;
32863282

@@ -3297,7 +3293,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
32973293
}
32983294

32993295
import Level1CallContextInput
3300-
import Level1CallContext<Level1CallContextInput>
3296+
import Level1CallContext
33013297
import LocalCallContext
33023298

33033299
predicate localStep(

0 commit comments

Comments
 (0)