Skip to content

Rust: Add support for neutral models. #21271

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
geoffw0 merged 11 commits into from
Feb 25, 2026
Merged

Rust: Add support for neutral models. #21271

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
97f7dcb
Rust: Add dataflow test cases for neutral models.
geoffw0 Feb 4, 2026
d400713
Rust: Implement neutral models for Rust.
geoffw0 Feb 3, 2026
9de5f5c
Rust: Clean up and change note.
geoffw0 Feb 5, 2026
c0a5c63
Merge branch 'main' into neutralmodels
geoffw0 Feb 5, 2026
05a487e
Rust: Repair following merge.
geoffw0 Feb 5, 2026
08174d7
Rust: Add test cases for summaries as well.
geoffw0 Feb 6, 2026
a5aeadd
Rust: Fix for neutral summaries.
geoffw0 Feb 6, 2026
6b7f339
Rust: Define neutralElement in the shared data flow input.
geoffw0 Feb 23, 2026
e951156
Rust: Autoformat.
geoffw0 Feb 23, 2026
8769059
Rust: Remove another call to neutralModel we don't need to make expli…
geoffw0 Feb 24, 2026
ccc3181
Rust: Add an empty.model.yml similar to the one in CPP, to avoid erro…
geoffw0 Feb 25, 2026
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
Prev Previous commit
Next Next commit
Rust: Define neutralElement in the shared data flow input.
  • Loading branch information
@geoffw0
geoffw0 committed Feb 23, 2026
commit 6b7f3392877b58f6c3fa3c6cbe17a0feab287ac2
11 changes: 11 additions & 0 deletions rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ private import codeql.rust.dataflow.internal.DataFlowImpl
private import codeql.rust.internal.PathResolution
private import codeql.rust.dataflow.FlowSummary
private import codeql.rust.dataflow.Ssa
private import codeql.rust.dataflow.internal.ModelsAsData
private import Content

predicate encodeContentTupleField(TupleFieldContent c, string arg) {
Expand Down Expand Up @@ -46,6 +47,16 @@ module Input implements InputSig<Location, RustDataFlow> {

abstract class SinkBase extends SourceSinkBase { }

predicate neutralElement(
Input::SummarizedCallableBase c, string kind, string provenance, boolean isExact
) {
exists(string path |
neutralModel(path, kind, provenance, _) and
c.getCanonicalPath() = path and
isExact = true
)
}

private class CallExprFunction extends SourceBase, SinkBase {
private CallExpr call;

Expand Down
11 changes: 4 additions & 7 deletions rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,19 +140,14 @@ private class SummarizedCallableFromModel extends SummarizedCallable::Range {
|
this = f and
isExact_ = true and
p_ = p and
// Do not apply generated models where there is a neutral model
not (
p_.isGenerated() and
neutralModel(path, "summary", _, _)
)
p_ = p
or
this.implements(f) and
isExact_ = false and
// making inherited models generated means that source code definitions and
// exact generated models take precedence
p_ = "hq-generated" and
// Do not apply inherited models where there is a neutral model
// Do not apply inherited models (which are considered generated) where there is a neutral model
not neutralModel(path, "summary", _, _)
Comment thread
geoffw0 marked this conversation as resolved.
Outdated
)
}
Expand Down Expand Up @@ -183,6 +178,7 @@ private class FlowSourceFromModel extends FlowSource::Range {
model = "MaD:" + madId.toString()
) and
// Only apply generated models when no neutral model exists
// (the shared code only applies neutral models to summaries at present)
not (
provenance.isGenerated() and
neutralModel(path, "source", _, _)
Expand All @@ -204,6 +200,7 @@ private class FlowSinkFromModel extends FlowSink::Range {
model = "MaD:" + madId.toString()
) and
// Only apply generated models when no neutral model exists
// (the shared code only applies neutral models to summaries at present)
not (
provenance.isGenerated() and
neutralModel(path, "sink", _, _)
Expand Down
Loading