Rust: Add support for defining barriers and barrier guards using models-as-data by owen-mc · Pull Request #21475 · github/codeql

owen-mc · 2026-03-15T22:35:32Z

No description provided.

+ * `branch` is either `true` or `false`, indicating which branch of the guard
+ * is protecting the parameter.
+ */
+extensible predicate barrierGuardModel(


hvitved · 2026-03-16T12:59:09Z

I have opened owen-mc#6 against this branch.

hvitved · 2026-03-20T09:28:25Z

Fix for barrier guards: owen-mc#7

owen-mc · 2026-03-20T14:24:22Z

Rerun has been triggered.

Copilot

Pull request overview

Adds Rust dataflow support for defining flow barriers and barrier guards via models-as-data, wiring them through the shared flow summary infrastructure and exposing a small Rust-facing API plus tests.

Changes:

Introduces shared and Rust-specific flow-summary support for barrier and barrier-guard elements/specs.
Adds Rust models-as-data extensibles (barrierModel, barrierGuardModel) and a public FlowBarrier library API to consume them.
Updates Rust library tests to exercise barrier and barrier-guard behavior using an .ext.yml MaD extension.

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll	Adds barrier/barrier-guard element/spec plumbing to shared flow-summary implementation.
rust/ql/test/library-tests/dataflow/barrier/main.rs	Extends the Rust test program with barrier and barrier-guard scenarios.
rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql	Updates inline flow test configuration to use the new barrier API.
rust/ql/test/library-tests/dataflow/barrier/inline-flow.ext.yml	Adds MaD extension rows for a barrier and a barrier guard used by the test.
rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected	Updates expected results for the inline flow test.
rust/ql/lib/codeql/rust/dataflow/internal/empty.model.yml	Ensures barrier/barrier-guard extensibles have at least one definition (empty) in the pack.
rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll	Adds internal support for parameterized barrier guards.
rust/ql/lib/codeql/rust/dataflow/internal/Node.qll	Fixes typos in source/sink node documentation comments.
rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll	Defines MaD extensible predicates and model pretty-printing for barriers and barrier guards.
rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll	Adjusts Rust flow-summary integration to support barrier node extraction details.
rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll	Wires barriers/barrier-guards into Rust dataflow via barrier nodes and guard checks.
rust/ql/lib/codeql/rust/dataflow/FlowBarrier.qll	Adds a public Rust library entry point for barriers and barrier guards (and `barrierNode`).

Copilot · 2026-03-20T14:28:42Z

+ * the value referred to by `input` is assumed to lead to a parameter of a call
+ * (possibly `self`), and the call is guarding the parameter.
+ * `branch` is either `true` or `false`, indicating which branch of the guard
+ * is protecting the parameter.


The barrierGuardModel doc comment has a couple issues: the sentence at line 115 starts with a lowercase "the", and branch is documented as boolean (true/false) even though the predicate parameter is a string. Please adjust the wording to be grammatically consistent and clarify the expected string values (for example, literal strings "true"/"false").
Suggested change
*thevaluereferredtoby `input` isassumedtoleadtoaparameterofa call
*(possibly `self`),andthecallisguardingthe parameter.
* `branch` iseither `true` or `false`,indicatingwhichbranchofthe guard
*isprotectingthe parameter.
*Thevalue referred to by `input` is assumed to lead to a parameter of a call
*(possibly `self`),andthecallisguardingthe parameter.
* `branch` iseither `"true"` or `"false"` (asastringliteral), indicating which
*branchoftheguardisprotectingthe parameter.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

owen-mc · 2026-03-20T22:32:35Z

Rerun has been triggered.

hvitved

LGTM, just some QL doc nits. I have triggered a DCA run.

owen-mc · 2026-03-23T16:24:55Z

Thanks. I've addressed those comments.

I meant to ask if you think there should be a QueryBarrier class, that different queries can extend?

hvitved · 2026-03-23T16:36:08Z

I meant to ask if you think there should be a QueryBarrier class, that different queries can extend?

Not sure, doesn't look like other languages have it?

owen-mc · 2026-03-23T21:37:23Z

Rerun has been triggered: 4 restarted 🚀

github-actionsBot added Rust Pull requests that update Rust code DataFlow Library labels Mar 15, 2026

github-advanced-securityBot found potential problems Mar 15, 2026
View reviewed changes

owen-mc force-pushed the rust/mad-barriers branch from 4af95da to 56d459aCompare March 19, 2026 16:41

owen-mc added 13 commits March 20, 2026 11:06

Add extensible predicates
bceab0b

Update empty.model.yml
f342bae

Update interpretModelForTest
f9521e9

Shared: Add barrierElement in FlowSummaryImpl.qll
f455054

Add FlowBarrier.qll
d3177b9

Instantiate flow barriers from MaD
e86ce8f

Add test for MaD barriers
93c6560

Misc: fix typos in QLDocs
2f0d328

Add (failing) test for MaD barrier guard
c5457d3

Add MaD barrier guard model to make test pass
77cb353

Add FlowBarrierGuard to FlowBarrier.qll
7d65bac

Instantiate flow barrier guards from MaD
769b3a6

Update MaD barrier guard test output
bde9378

owen-mc force-pushed the rust/mad-barriers branch from 9b1e73e to bde9378Compare March 20, 2026 11:13

owen-mc marked this pull request as ready for review March 20, 2026 14:23

owen-mc requested review from a team as code owners March 20, 2026 14:23

CopilotAI review requested due to automatic review settings March 20, 2026 14:23

Copilotstarted reviewing on behalf of owen-mc March 20, 2026 14:24 View session

CopilotAI reviewed Mar 20, 2026
View reviewed changes

owen-mc added the no-change-note-required This PR does not need a change note label Mar 20, 2026

Fix incorrect QLDoc
093c279
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

hvitved requested changes Mar 23, 2026
View reviewed changes

Comment threadrust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll Outdated
Comment threadrust/ql/lib/codeql/rust/dataflow/FlowBarrier.qll

owen-mc added 3 commits March 23, 2026 16:11

Fix QLDoc formatting
d82fc67

Update QLDoc in FlowBarrier.qll
97ebc0e

Fix parameter -> argument in QLDoc
8d16a2b

hvitved approved these changes Mar 23, 2026
View reviewed changes

owen-mc merged commit fd8821f into github:mainMar 24, 2026
136 checks passed

owen-mc deleted the rust/mad-barriers branch March 24, 2026 09:31

Navigation Menu

Uh oh!

Rust: Add support for defining barriers and barrier guards using models-as-data - #21475

Rust: Add support for defining barriers and barrier guards using models-as-data#21475
owen-mc merged 17 commits into
github:mainfrom
owen-mc:rust/mad-barriers

owen-mc commented Mar 15, 2026

Uh oh!

Uh oh!

hvitved commented Mar 16, 2026

Uh oh!

hvitved commented Mar 20, 2026

Uh oh!

owen-mc commented Mar 20, 2026•
edited by prior-bot Bot
Loading

Uh oh!

CopilotAI left a comment

Uh oh!

CopilotAIMar 20, 2026

Uh oh!

Uh oh!

owen-mc commented Mar 20, 2026•
edited by kairos-prod-bot Bot
Loading

Uh oh!

hvitved left a comment

Uh oh!

Uh oh!

Uh oh!

owen-mc commented Mar 23, 2026

Uh oh!

hvitved commented Mar 23, 2026

Uh oh!

owen-mc commented Mar 23, 2026•
edited by codeql-ci
Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

-*thevaluereferredtoby `input` isassumedtoleadtoaparameterofa call
-*(possibly `self`),andthecallisguardingthe parameter.
-* `branch` iseither `true` or `false`,indicatingwhichbranchofthe guard
-*isprotectingthe parameter.
+*Thevalue referred to by `input` is assumed to lead to a parameter of a call
+*(possibly `self`),andthecallisguardingthe parameter.
+* `branch` iseither `"true"` or `"false"` (asastringliteral), indicating which
+*branchoftheguardisprotectingthe parameter.

Uh oh!

Conversation

owen-mc commented Mar 15, 2026

Uh oh!

Uh oh!

hvitved commented Mar 16, 2026

Uh oh!

hvitved commented Mar 20, 2026

Uh oh!

owen-mc commented Mar 20, 2026• edited by prior-bot BotLoading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

CopilotAIMar 20, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

owen-mc commented Mar 20, 2026• edited by kairos-prod-bot BotLoading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hvitved left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

owen-mc commented Mar 23, 2026

Uh oh!

hvitved commented Mar 23, 2026

Uh oh!

owen-mc commented Mar 23, 2026• edited by codeql-ci Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

owen-mc commented Mar 20, 2026•
edited by prior-bot Bot
Loading

owen-mc commented Mar 20, 2026•
edited by kairos-prod-bot Bot
Loading

owen-mc commented Mar 23, 2026•
edited by codeql-ci
Loading