diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll index 1373345423f7..68a42f30794d 100644 --- a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll +++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll @@ -894,12 +894,6 @@ module MakeImpl Lang> { pragma[nomagic] predicate revFlow(NodeEx node) { revFlow(node, _) } - pragma[nomagic] - predicate revFlowAp(NodeEx node, Ap ap) { - revFlow(node) and - exists(ap) - } - bindingset[node, state] predicate revFlow(NodeEx node, FlowState state, Ap ap) { revFlow(node, _) and @@ -1278,8 +1272,6 @@ module MakeImpl Lang> { predicate revFlow(NodeEx node); - predicate revFlowAp(NodeEx node, Ap ap); - bindingset[node, state] predicate revFlow(NodeEx node, FlowState state, Ap ap); @@ -2456,16 +2448,11 @@ module MakeImpl Lang> { ) } - additional predicate revFlow(NodeEx node, FlowState state) { revFlow(node, state, _, _, _) } - predicate revFlow(NodeEx node, FlowState state, Ap ap) { revFlow(node, state, _, _, ap) } pragma[nomagic] predicate revFlow(NodeEx node) { revFlow(node, _, _, _, _) } - pragma[nomagic] - predicate revFlowAp(NodeEx node, Ap ap) { revFlow(node, _, _, _, ap) } - private predicate fwdConsCand(Content c, Ap ap) { storeStepFwd(_, ap, c, _, _) } private predicate revConsCand(Content c, Ap ap) { @@ -2620,7 +2607,7 @@ module MakeImpl Lang> { */ private class FlowCheckNode extends NodeEx { FlowCheckNode() { - revFlow(this, _, _) and + revFlow(this) and ( flowCheckNode(this) or Config::neverSkip(this.asNode())