Skip to content

Commit 9f1bbf2

Browse files
aschackmullaschackmull
authored
Merge pull request #10575 from aschackmull/dataflow/cleanup-module
Dataflow: Minor visibility cleanup
2 parents 88baf08 + 1687d08 commit 9f1bbf2

36 files changed

+108
-252
lines changed

‎cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) {
598598
}
599599

600600
private module Stage1 implements StageSig {
601-
class ApApprox = Unit;
602-
603601
class Ap = Unit;
604602

605-
class ApOption = Unit;
606-
607-
class Cc = boolean;
603+
private class Cc = boolean;
608604

609605
/* Begin: Stage 1 logic. */
610606
/**
@@ -613,7 +609,7 @@ private module Stage1 implements StageSig {
613609
* The Boolean `cc` records whether the node is reached through an
614610
* argument in a call.
615611
*/
616-
predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
612+
private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
617613
sourceNode(node, _, config) and
618614
if hasSourceCallCtx(config) then cc = true else cc = false
619615
or
@@ -753,7 +749,7 @@ private module Stage1 implements StageSig {
753749
* the enclosing callable in order to reach a sink.
754750
*/
755751
pragma[nomagic]
756-
predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
752+
private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
757753
revFlow0(node, toReturn, config) and
758754
fwdFlow(node, config)
759755
}

‎cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) {
598598
}
599599

600600
private module Stage1 implements StageSig {
601-
class ApApprox = Unit;
602-
603601
class Ap = Unit;
604602

605-
class ApOption = Unit;
606-
607-
class Cc = boolean;
603+
private class Cc = boolean;
608604

609605
/* Begin: Stage 1 logic. */
610606
/**
@@ -613,7 +609,7 @@ private module Stage1 implements StageSig {
613609
* The Boolean `cc` records whether the node is reached through an
614610
* argument in a call.
615611
*/
616-
predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
612+
private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
617613
sourceNode(node, _, config) and
618614
if hasSourceCallCtx(config) then cc = true else cc = false
619615
or
@@ -753,7 +749,7 @@ private module Stage1 implements StageSig {
753749
* the enclosing callable in order to reach a sink.
754750
*/
755751
pragma[nomagic]
756-
predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
752+
private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
757753
revFlow0(node, toReturn, config) and
758754
fwdFlow(node, config)
759755
}

‎cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) {
598598
}
599599

600600
private module Stage1 implements StageSig {
601-
class ApApprox = Unit;
602-
603601
class Ap = Unit;
604602

605-
class ApOption = Unit;
606-
607-
class Cc = boolean;
603+
private class Cc = boolean;
608604

609605
/* Begin: Stage 1 logic. */
610606
/**
@@ -613,7 +609,7 @@ private module Stage1 implements StageSig {
613609
* The Boolean `cc` records whether the node is reached through an
614610
* argument in a call.
615611
*/
616-
predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
612+
private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
617613
sourceNode(node, _, config) and
618614
if hasSourceCallCtx(config) then cc = true else cc = false
619615
or
@@ -753,7 +749,7 @@ private module Stage1 implements StageSig {
753749
* the enclosing callable in order to reach a sink.
754750
*/
755751
pragma[nomagic]
756-
predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
752+
private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
757753
revFlow0(node, toReturn, config) and
758754
fwdFlow(node, config)
759755
}

‎cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) {
598598
}
599599

600600
private module Stage1 implements StageSig {
601-
class ApApprox = Unit;
602-
603601
class Ap = Unit;
604602

605-
class ApOption = Unit;
606-
607-
class Cc = boolean;
603+
private class Cc = boolean;
608604

609605
/* Begin: Stage 1 logic. */
610606
/**
@@ -613,7 +609,7 @@ private module Stage1 implements StageSig {
613609
* The Boolean `cc` records whether the node is reached through an
614610
* argument in a call.
615611
*/
616-
predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
612+
private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
617613
sourceNode(node, _, config) and
618614
if hasSourceCallCtx(config) then cc = true else cc = false
619615
or
@@ -753,7 +749,7 @@ private module Stage1 implements StageSig {
753749
* the enclosing callable in order to reach a sink.
754750
*/
755751
pragma[nomagic]
756-
predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
752+
private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
757753
revFlow0(node, toReturn, config) and
758754
fwdFlow(node, config)
759755
}

‎cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) {
598598
}
599599

600600
private module Stage1 implements StageSig {
601-
class ApApprox = Unit;
602-
603601
class Ap = Unit;
604602

605-
class ApOption = Unit;
606-
607-
class Cc = boolean;
603+
private class Cc = boolean;
608604

609605
/* Begin: Stage 1 logic. */
610606
/**
@@ -613,7 +609,7 @@ private module Stage1 implements StageSig {
613609
* The Boolean `cc` records whether the node is reached through an
614610
* argument in a call.
615611
*/
616-
predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
612+
private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
617613
sourceNode(node, _, config) and
618614
if hasSourceCallCtx(config) then cc = true else cc = false
619615
or
@@ -753,7 +749,7 @@ private module Stage1 implements StageSig {
753749
* the enclosing callable in order to reach a sink.
754750
*/
755751
pragma[nomagic]
756-
predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
752+
private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
757753
revFlow0(node, toReturn, config) and
758754
fwdFlow(node, config)
759755
}

‎cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) {
598598
}
599599

600600
private module Stage1 implements StageSig {
601-
class ApApprox = Unit;
602-
603601
class Ap = Unit;
604602

605-
class ApOption = Unit;
606-
607-
class Cc = boolean;
603+
private class Cc = boolean;
608604

609605
/* Begin: Stage 1 logic. */
610606
/**
@@ -613,7 +609,7 @@ private module Stage1 implements StageSig {
613609
* The Boolean `cc` records whether the node is reached through an
614610
* argument in a call.
615611
*/
616-
predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
612+
private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
617613
sourceNode(node, _, config) and
618614
if hasSourceCallCtx(config) then cc = true else cc = false
619615
or
@@ -753,7 +749,7 @@ private module Stage1 implements StageSig {
753749
* the enclosing callable in order to reach a sink.
754750
*/
755751
pragma[nomagic]
756-
predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
752+
private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
757753
revFlow0(node, toReturn, config) and
758754
fwdFlow(node, config)
759755
}

‎cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) {
598598
}
599599

600600
private module Stage1 implements StageSig {
601-
class ApApprox = Unit;
602-
603601
class Ap = Unit;
604602

605-
class ApOption = Unit;
606-
607-
class Cc = boolean;
603+
private class Cc = boolean;
608604

609605
/* Begin: Stage 1 logic. */
610606
/**
@@ -613,7 +609,7 @@ private module Stage1 implements StageSig {
613609
* The Boolean `cc` records whether the node is reached through an
614610
* argument in a call.
615611
*/
616-
predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
612+
private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
617613
sourceNode(node, _, config) and
618614
if hasSourceCallCtx(config) then cc = true else cc = false
619615
or
@@ -753,7 +749,7 @@ private module Stage1 implements StageSig {
753749
* the enclosing callable in order to reach a sink.
754750
*/
755751
pragma[nomagic]
756-
predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
752+
private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
757753
revFlow0(node, toReturn, config) and
758754
fwdFlow(node, config)
759755
}

‎cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) {
598598
}
599599

600600
private module Stage1 implements StageSig {
601-
class ApApprox = Unit;
602-
603601
class Ap = Unit;
604602

605-
class ApOption = Unit;
606-
607-
class Cc = boolean;
603+
private class Cc = boolean;
608604

609605
/* Begin: Stage 1 logic. */
610606
/**
@@ -613,7 +609,7 @@ private module Stage1 implements StageSig {
613609
* The Boolean `cc` records whether the node is reached through an
614610
* argument in a call.
615611
*/
616-
predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
612+
private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
617613
sourceNode(node, _, config) and
618614
if hasSourceCallCtx(config) then cc = true else cc = false
619615
or
@@ -753,7 +749,7 @@ private module Stage1 implements StageSig {
753749
* the enclosing callable in order to reach a sink.
754750
*/
755751
pragma[nomagic]
756-
predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
752+
private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
757753
revFlow0(node, toReturn, config) and
758754
fwdFlow(node, config)
759755
}

‎cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) {
598598
}
599599

600600
private module Stage1 implements StageSig {
601-
class ApApprox = Unit;
602-
603601
class Ap = Unit;
604602

605-
class ApOption = Unit;
606-
607-
class Cc = boolean;
603+
private class Cc = boolean;
608604

609605
/* Begin: Stage 1 logic. */
610606
/**
@@ -613,7 +609,7 @@ private module Stage1 implements StageSig {
613609
* The Boolean `cc` records whether the node is reached through an
614610
* argument in a call.
615611
*/
616-
predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
612+
private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
617613
sourceNode(node, _, config) and
618614
if hasSourceCallCtx(config) then cc = true else cc = false
619615
or
@@ -753,7 +749,7 @@ private module Stage1 implements StageSig {
753749
* the enclosing callable in order to reach a sink.
754750
*/
755751
pragma[nomagic]
756-
predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
752+
private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
757753
revFlow0(node, toReturn, config) and
758754
fwdFlow(node, config)
759755
}

‎cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) {
598598
}
599599

600600
private module Stage1 implements StageSig {
601-
class ApApprox = Unit;
602-
603601
class Ap = Unit;
604602

605-
class ApOption = Unit;
606-
607-
class Cc = boolean;
603+
private class Cc = boolean;
608604

609605
/* Begin: Stage 1 logic. */
610606
/**
@@ -613,7 +609,7 @@ private module Stage1 implements StageSig {
613609
* The Boolean `cc` records whether the node is reached through an
614610
* argument in a call.
615611
*/
616-
predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
612+
private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
617613
sourceNode(node, _, config) and
618614
if hasSourceCallCtx(config) then cc = true else cc = false
619615
or
@@ -753,7 +749,7 @@ private module Stage1 implements StageSig {
753749
* the enclosing callable in order to reach a sink.
754750
*/
755751
pragma[nomagic]
756-
predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
752+
private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
757753
revFlow0(node, toReturn, config) and
758754
fwdFlow(node, config)
759755
}

‎cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) {
598598
}
599599

600600
private module Stage1 implements StageSig {
601-
class ApApprox = Unit;
602-
603601
class Ap = Unit;
604602

605-
class ApOption = Unit;
606-
607-
class Cc = boolean;
603+
private class Cc = boolean;
608604

609605
/* Begin: Stage 1 logic. */
610606
/**
@@ -613,7 +609,7 @@ private module Stage1 implements StageSig {
613609
* The Boolean `cc` records whether the node is reached through an
614610
* argument in a call.
615611
*/
616-
predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
612+
private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
617613
sourceNode(node, _, config) and
618614
if hasSourceCallCtx(config) then cc = true else cc = false
619615
or
@@ -753,7 +749,7 @@ private module Stage1 implements StageSig {
753749
* the enclosing callable in order to reach a sink.
754750
*/
755751
pragma[nomagic]
756-
predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
752+
private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
757753
revFlow0(node, toReturn, config) and
758754
fwdFlow(node, config)
759755
}

‎cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,9 @@ private predicate hasSinkCallCtx(Configuration config) {
598598
}
599599

600600
private module Stage1 implements StageSig {
601-
class ApApprox = Unit;
602-
603601
class Ap = Unit;
604602

605-
class ApOption = Unit;
606-
607-
class Cc = boolean;
603+
private class Cc = boolean;
608604

609605
/* Begin: Stage 1 logic. */
610606
/**
@@ -613,7 +609,7 @@ private module Stage1 implements StageSig {
613609
* The Boolean `cc` records whether the node is reached through an
614610
* argument in a call.
615611
*/
616-
predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
612+
private predicate fwdFlow(NodeEx node, Cc cc, Configuration config) {
617613
sourceNode(node, _, config) and
618614
if hasSourceCallCtx(config) then cc = true else cc = false
619615
or
@@ -753,7 +749,7 @@ private module Stage1 implements StageSig {
753749
* the enclosing callable in order to reach a sink.
754750
*/
755751
pragma[nomagic]
756-
predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
752+
private predicate revFlow(NodeEx node, boolean toReturn, Configuration config) {
757753
revFlow0(node, toReturn, config) and
758754
fwdFlow(node, config)
759755
}

0 commit comments

Comments
 (0)