Skip to content

Dataflow: Minor join-order fix #18507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aschackmull merged 2 commits into from
Jan 16, 2025
Merged

Dataflow: Minor join-order fix #18507

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f11ae49
Dataflow: Fix a poor join-order.
aschackmull Jan 16, 2025
4223971
Dataflow: Remove outdated comment.
aschackmull Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3127,6 +3127,14 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
override predicate isSource() { sourceNode(node, state) }
}

bindingset[p, state, t, ap, stored]
pragma[inline_late]
private SummaryCtxSome mkSummaryCtxSome(
ParamNodeEx p, FlowState state, Typ t, Ap ap, TypOption stored
) {
result = TSummaryCtxSome(p, state, t, ap, stored)
}

pragma[nomagic]
private predicate fwdFlowInStep(
ArgNodeEx arg, ParamNodeEx p, FlowState state, Cc outercc, CcCall innercc,
Expand All @@ -3138,7 +3146,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
or
FwdFlowInThrough::fwdFlowIn(_, arg, _, p, state, outercc, innercc, outerSummaryCtx, t,
ap, stored, _) and
innerSummaryCtx = TSummaryCtxSome(p, state, t, ap, stored)
innerSummaryCtx = mkSummaryCtxSome(p, state, t, ap, stored)
}

pragma[nomagic]
Expand Down Expand Up @@ -3871,11 +3879,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
bindingset[node, state, t0, ap]
predicate filter(NodeEx node, FlowState state, Typ t0, Ap ap, Typ t) {
exists(state) and
// We can get away with not using type strengthening here, since we aren't
// going to use the tracked types in the construction of Stage 4 access
// paths. For Stage 4 and onwards, the tracked types must be consistent as
// the cons candidates including types are used to construct subsequent
// access path approximations.
t0 = t and
(
notExpectsContent(node)
Expand Down