From 17dba00264a3ff91bdfb9f7f73ad4b2aa8e560a0 Mon Sep 17 00:00:00 2001 From: Anders Schack-Mulligen Date: Mon, 26 Sep 2022 16:09:42 +0200 Subject: [PATCH] Dataflow: Minor visibility cleanup. --- .../code/java/dataflow/internal/DataFlowImpl.qll | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll index 468f8640a78..2638347463b 100644 --- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll +++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll @@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) { } private module Stage1 implements StageSig { - class ApApprox = Unit; - class Ap = Unit; - class ApOption = Unit; - - class Cc = boolean; + private class Cc = boolean; /* Begin: Stage 1 logic. */ /** @@ -613,7 +609,7 @@ private module Stage1 implements StageSig { * The Boolean `cc` records whether the node is reached through an * argument in a call. */ - predicate fwdFlow(NodeEx node, Cc cc, Configuration config) { + private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) { sourceNode(node, _, config) and if hasSourceCallCtx(config) then cc = true else cc = false or @@ -753,7 +749,7 @@ private module Stage1 implements StageSig { * the enclosing callable in order to reach a sink. */ pragma[nomagic] - predicate revFlow(NodeEx node, boolean toReturn, Configuration config) { + private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) { revFlow0(node, toReturn, config) and fwdFlow(node, config) }