hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-02-11 12:41:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10806 from aschackmull/dataflow/additional

Browse Source 
Dataflow:  Add additional annotation.
This commit is contained in:
Anders Schack-Mulligen
2022-10-13 13:02:48 +02:00
committed by GitHub
parent a65850e922 036724ce8d
commit d79a7e863a
37 changed files with 518 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplForContentDataFlow.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForOnActivityResult.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForHttpClientLibraries.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForPathname.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForRegExp.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and

26
swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll
View File

@@ -838,13 +838,13 @@ private module Stage1 implements StageSig {
* by `revFlow`. * by `revFlow`.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlowIsReadAndStored(Content c, Configuration conf) { additional predicate revFlowIsReadAndStored(Content c, Configuration conf) {
revFlowConsCand(c, conf) and revFlowConsCand(c, conf) and
revFlowStore(c, _, _, conf) revFlowStore(c, _, _, conf)
} }
pragma[nomagic] pragma[nomagic]
predicate viableReturnPosOutNodeCandFwd1( additional predicate viableReturnPosOutNodeCandFwd1(
DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config DataFlowCall call, ReturnPosition pos, NodeEx out, Configuration config
) { ) {
fwdFlowReturnPosition(pos, _, config) and fwdFlowReturnPosition(pos, _, config) and
@@ -860,7 +860,7 @@ private module Stage1 implements StageSig {
} }
pragma[nomagic] pragma[nomagic]
predicate viableParamArgNodeCandFwd1( additional predicate viableParamArgNodeCandFwd1(
DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config DataFlowCall call, ParamNodeEx p, ArgNodeEx arg, Configuration config
) { ) {
viableParamArgEx(call, p, arg) and viableParamArgEx(call, p, arg) and
@@ -907,7 +907,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate revFlowState(FlowState state, Configuration config) { additional predicate revFlowState(FlowState state, Configuration config) {
exists(NodeEx node | exists(NodeEx node |
sinkNode(node, state, config) and sinkNode(node, state, config) and
revFlow(node, _, pragma[only_bind_into](config)) and revFlow(node, _, pragma[only_bind_into](config)) and
@@ -999,7 +999,7 @@ private module Stage1 implements StageSig {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and
@@ -1260,7 +1260,7 @@ private module MkStage<StageSig PrevStage> {
* argument. * argument.
*/ */
pragma[nomagic] pragma[nomagic]
predicate fwdFlow( additional predicate fwdFlow(
NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config NodeEx node, FlowState state, Cc cc, ApOption argAp, Ap ap, Configuration config
) { ) {
fwdFlow0(node, state, cc, argAp, ap, config) and fwdFlow0(node, state, cc, argAp, ap, config) and
@@ -1484,7 +1484,7 @@ private module MkStage<StageSig PrevStage> {
* the access path of the returned value. * the access path of the returned value.
*/ */
pragma[nomagic] pragma[nomagic]
predicate revFlow( additional predicate revFlow(
NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config NodeEx node, FlowState state, boolean toReturn, ApOption returnAp, Ap ap, Configuration config
) { ) {
revFlow0(node, state, toReturn, returnAp, ap, config) and revFlow0(node, state, toReturn, returnAp, ap, config) and
@@ -1662,7 +1662,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate revFlow(NodeEx node, FlowState state, Configuration config) { additional predicate revFlow(NodeEx node, FlowState state, Configuration config) {
revFlow(node, state, _, _, _, config) revFlow(node, state, _, _, _, config)
} }
@@ -1675,11 +1675,13 @@ private module MkStage<StageSig PrevStage> {
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, Configuration config) { revFlow(node, _, _, _, _, config) } additional predicate revFlowAlias(NodeEx node, Configuration config) {
revFlow(node, _, _, _, _, config)
}
// use an alias as a workaround for bad functionality-induced joins // use an alias as a workaround for bad functionality-induced joins
pragma[nomagic] pragma[nomagic]
predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) { additional predicate revFlowAlias(NodeEx node, FlowState state, Ap ap, Configuration config) {
revFlow(node, state, ap, config) revFlow(node, state, ap, config)
} }
@@ -1700,7 +1702,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate consCand(TypedContent tc, Ap ap, Configuration config) { additional predicate consCand(TypedContent tc, Ap ap, Configuration config) {
revConsCand(tc, ap, config) and revConsCand(tc, ap, config) and
validAp(ap, config) validAp(ap, config)
} }
@@ -1742,7 +1744,7 @@ private module MkStage<StageSig PrevStage> {
) )
} }
predicate stats( additional predicate stats(
boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config boolean fwd, int nodes, int fields, int conscand, int states, int tuples, Configuration config
) { ) {
fwd = true and fwd = true and