Skip to content

Commit 1a27a06

Browse files
committed
Merge branch 'main' into mathiasvp/replace-ast-with-ir-use-usedataflow
2 parents be359a3 + ee442e4 commit 1a27a06

168 files changed

Lines changed: 12079 additions & 5914 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ updates:
55
schedule:
66
interval: "daily"
77

8+
- package-ecosystem: "cargo"
9+
directory: "ql"
10+
schedule:
11+
interval: "daily"
12+
813
- package-ecosystem: "github-actions"
914
directory: "/"
1015
schedule:

config/identical-files.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll",
3737
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll",
3838
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll",
39-
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForRegExp.qll",
4039
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForHttpClientLibraries.qll",
4140
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForPathname.qll",
4241
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1487,14 +1487,18 @@ private module MkStage<StageSig PrevStage> {
14871487
PrevStage::readStepCand(node1, _, _, config)
14881488
}
14891489

1490+
bindingset[ap, c]
1491+
pragma[inline_late]
1492+
private predicate hasHeadContent(Ap ap, Content c) { getHeadContent(ap) = c }
1493+
14901494
pragma[nomagic]
14911495
private predicate fwdFlowRead(
14921496
Ap ap, Content c, NodeEx node1, NodeEx node2, FlowState state, Cc cc,
14931497
ParamNodeOption summaryCtx, ApOption argAp, Configuration config
14941498
) {
14951499
fwdFlowRead0(node1, state, cc, summaryCtx, argAp, ap, config) and
14961500
PrevStage::readStepCand(node1, c, node2, config) and
1497-
getHeadContent(ap) = c
1501+
hasHeadContent(ap, c)
14981502
}
14991503

15001504
pragma[nomagic]

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1487,14 +1487,18 @@ private module MkStage<StageSig PrevStage> {
14871487
PrevStage::readStepCand(node1, _, _, config)
14881488
}
14891489

1490+
bindingset[ap, c]
1491+
pragma[inline_late]
1492+
private predicate hasHeadContent(Ap ap, Content c) { getHeadContent(ap) = c }
1493+
14901494
pragma[nomagic]
14911495
private predicate fwdFlowRead(
14921496
Ap ap, Content c, NodeEx node1, NodeEx node2, FlowState state, Cc cc,
14931497
ParamNodeOption summaryCtx, ApOption argAp, Configuration config
14941498
) {
14951499
fwdFlowRead0(node1, state, cc, summaryCtx, argAp, ap, config) and
14961500
PrevStage::readStepCand(node1, c, node2, config) and
1497-
getHeadContent(ap) = c
1501+
hasHeadContent(ap, c)
14981502
}
14991503

15001504
pragma[nomagic]

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1487,14 +1487,18 @@ private module MkStage<StageSig PrevStage> {
14871487
PrevStage::readStepCand(node1, _, _, config)
14881488
}
14891489

1490+
bindingset[ap, c]
1491+
pragma[inline_late]
1492+
private predicate hasHeadContent(Ap ap, Content c) { getHeadContent(ap) = c }
1493+
14901494
pragma[nomagic]
14911495
private predicate fwdFlowRead(
14921496
Ap ap, Content c, NodeEx node1, NodeEx node2, FlowState state, Cc cc,
14931497
ParamNodeOption summaryCtx, ApOption argAp, Configuration config
14941498
) {
14951499
fwdFlowRead0(node1, state, cc, summaryCtx, argAp, ap, config) and
14961500
PrevStage::readStepCand(node1, c, node2, config) and
1497-
getHeadContent(ap) = c
1501+
hasHeadContent(ap, c)
14981502
}
14991503

15001504
pragma[nomagic]

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1487,14 +1487,18 @@ private module MkStage<StageSig PrevStage> {
14871487
PrevStage::readStepCand(node1, _, _, config)
14881488
}
14891489

1490+
bindingset[ap, c]
1491+
pragma[inline_late]
1492+
private predicate hasHeadContent(Ap ap, Content c) { getHeadContent(ap) = c }
1493+
14901494
pragma[nomagic]
14911495
private predicate fwdFlowRead(
14921496
Ap ap, Content c, NodeEx node1, NodeEx node2, FlowState state, Cc cc,
14931497
ParamNodeOption summaryCtx, ApOption argAp, Configuration config
14941498
) {
14951499
fwdFlowRead0(node1, state, cc, summaryCtx, argAp, ap, config) and
14961500
PrevStage::readStepCand(node1, c, node2, config) and
1497-
getHeadContent(ap) = c
1501+
hasHeadContent(ap, c)
14981502
}
14991503

15001504
pragma[nomagic]

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1487,14 +1487,18 @@ private module MkStage<StageSig PrevStage> {
14871487
PrevStage::readStepCand(node1, _, _, config)
14881488
}
14891489

1490+
bindingset[ap, c]
1491+
pragma[inline_late]
1492+
private predicate hasHeadContent(Ap ap, Content c) { getHeadContent(ap) = c }
1493+
14901494
pragma[nomagic]
14911495
private predicate fwdFlowRead(
14921496
Ap ap, Content c, NodeEx node1, NodeEx node2, FlowState state, Cc cc,
14931497
ParamNodeOption summaryCtx, ApOption argAp, Configuration config
14941498
) {
14951499
fwdFlowRead0(node1, state, cc, summaryCtx, argAp, ap, config) and
14961500
PrevStage::readStepCand(node1, c, node2, config) and
1497-
getHeadContent(ap) = c
1501+
hasHeadContent(ap, c)
14981502
}
14991503

15001504
pragma[nomagic]

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1487,14 +1487,18 @@ private module MkStage<StageSig PrevStage> {
14871487
PrevStage::readStepCand(node1, _, _, config)
14881488
}
14891489

1490+
bindingset[ap, c]
1491+
pragma[inline_late]
1492+
private predicate hasHeadContent(Ap ap, Content c) { getHeadContent(ap) = c }
1493+
14901494
pragma[nomagic]
14911495
private predicate fwdFlowRead(
14921496
Ap ap, Content c, NodeEx node1, NodeEx node2, FlowState state, Cc cc,
14931497
ParamNodeOption summaryCtx, ApOption argAp, Configuration config
14941498
) {
14951499
fwdFlowRead0(node1, state, cc, summaryCtx, argAp, ap, config) and
14961500
PrevStage::readStepCand(node1, c, node2, config) and
1497-
getHeadContent(ap) = c
1501+
hasHeadContent(ap, c)
14981502
}
14991503

15001504
pragma[nomagic]

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1487,14 +1487,18 @@ private module MkStage<StageSig PrevStage> {
14871487
PrevStage::readStepCand(node1, _, _, config)
14881488
}
14891489

1490+
bindingset[ap, c]
1491+
pragma[inline_late]
1492+
private predicate hasHeadContent(Ap ap, Content c) { getHeadContent(ap) = c }
1493+
14901494
pragma[nomagic]
14911495
private predicate fwdFlowRead(
14921496
Ap ap, Content c, NodeEx node1, NodeEx node2, FlowState state, Cc cc,
14931497
ParamNodeOption summaryCtx, ApOption argAp, Configuration config
14941498
) {
14951499
fwdFlowRead0(node1, state, cc, summaryCtx, argAp, ap, config) and
14961500
PrevStage::readStepCand(node1, c, node2, config) and
1497-
getHeadContent(ap) = c
1501+
hasHeadContent(ap, c)
14981502
}
14991503

15001504
pragma[nomagic]

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1487,14 +1487,18 @@ private module MkStage<StageSig PrevStage> {
14871487
PrevStage::readStepCand(node1, _, _, config)
14881488
}
14891489

1490+
bindingset[ap, c]
1491+
pragma[inline_late]
1492+
private predicate hasHeadContent(Ap ap, Content c) { getHeadContent(ap) = c }
1493+
14901494
pragma[nomagic]
14911495
private predicate fwdFlowRead(
14921496
Ap ap, Content c, NodeEx node1, NodeEx node2, FlowState state, Cc cc,
14931497
ParamNodeOption summaryCtx, ApOption argAp, Configuration config
14941498
) {
14951499
fwdFlowRead0(node1, state, cc, summaryCtx, argAp, ap, config) and
14961500
PrevStage::readStepCand(node1, c, node2, config) and
1497-
getHeadContent(ap) = c
1501+
hasHeadContent(ap, c)
14981502
}
14991503

15001504
pragma[nomagic]

0 commit comments

Comments
 (0)