Skip to content
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

Rust: SSA additions #17786

Merged
merged 10 commits into from
Oct 29, 2024
Merged

Rust: SSA additions #17786

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a1db359
Rust: Add variable tests involving borrowing and capture
paldepind Oct 16, 2024
577afc3
Rust: Support capture of mutable variables in SSA
paldepind Oct 16, 2024
76e1885
Rust: Make mutable variables that are only borrowed immutably amenabl…
paldepind Oct 16, 2024
85e59c9
Merge branch 'main' into rust-saa-additions
paldepind Oct 21, 2024
75103f4
Merge branch 'main' into rust-saa-additions
paldepind Oct 25, 2024
334602a
Rust: Handle calls that might read/write variables through closures
paldepind Oct 25, 2024
c5b01eb
Merge branch 'main' into rust-saa-additions
paldepind Oct 28, 2024
b86a581
Rust: Small refactor based on PR feedback
paldepind Oct 28, 2024
cab9164
Rust: Update unused value expected test result
paldepind Oct 28, 2024
8f8564d
Rust: Address PR comments
paldepind Oct 28, 2024
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
14 changes: 6 additions & 8 deletions rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,14 @@ module SsaInput implements SsaImplCommon::InputSig<Location> {
*/
class SourceVariable extends Variable {
SourceVariable() {
this.isImmutable()
or
this.isMutable() and
forall(VariableAccess va | va = this.getAnAccess() |
va instanceof VariableReadAccess and
this.isMutable()
implies
not exists(VariableAccess va | va = this.getAnAccess() |
exists(RefExpr re | va = re.getExpr() and re.isMut())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I prefer va = any(RefExpr re | re.isMut()).getExpr()

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. That is definitely nicer.

or
// receivers can be borrowed implicitly, cf.
// https://doc.rust-lang.org/reference/expressions/method-call-expr.html
not va = any(MethodCallExpr mce).getReceiver()
or
variableWrite(va, this)
va = any(MethodCallExpr mce).getReceiver()
)
}
}
Expand Down
4 changes: 3 additions & 1 deletion rust/ql/test/library-tests/variables/Ssa.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
nonSsaVariable
| variables.rs:28:13:28:13 | x |
| variables.rs:341:13:341:13 | a |
| variables.rs:349:13:349:13 | i |
| variables.rs:372:13:372:13 | x |
Expand All @@ -15,6 +14,8 @@ definition
| variables.rs:16:9:16:10 | x1 | variables.rs:16:9:16:10 | x1 |
| variables.rs:21:9:21:14 | x2 | variables.rs:21:13:21:14 | x2 |
| variables.rs:23:5:23:6 | x2 | variables.rs:21:13:21:14 | x2 |
| variables.rs:28:9:28:13 | x | variables.rs:28:13:28:13 | x |
| variables.rs:30:5:30:5 | x | variables.rs:28:13:28:13 | x |
| variables.rs:35:9:35:10 | x3 | variables.rs:35:9:35:10 | x3 |
| variables.rs:37:9:37:10 | x3 | variables.rs:37:9:37:10 | x3 |
| variables.rs:43:9:43:10 | x4 | variables.rs:43:9:43:10 | x4 |
Expand Down Expand Up @@ -542,6 +543,7 @@ ultimateDef
| variables.rs:439:5:447:5 | phi | variables.rs:444:9:444:9 | x |
assigns
| variables.rs:23:5:23:6 | x2 | variables.rs:23:10:23:10 | 5 |
| variables.rs:30:5:30:5 | x | variables.rs:30:9:30:9 | 2 |
| variables.rs:421:9:421:9 | y | variables.rs:421:13:421:13 | 3 |
| variables.rs:440:9:440:9 | x | variables.rs:440:13:440:13 | 2 |
| variables.rs:444:9:444:9 | x | variables.rs:444:13:444:13 | 3 |
Loading