-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Python: add new shared-CFG-backed control flow graph (additive) #21921
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.
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
Merged
Changes from 4 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
872c081
Python: add shared-CFG AstSig adapter (AstNodeImpl)
yoff fbfbbd3
Python: add new shared-CFG-backed control flow graph facade (Cfg)
yoff 41c9d8b
Python: model exception edges for raise-prone expressions inside try/…
yoff 47d2b05
Python: visit function parameter and return annotations in new CFG
yoff 661463d
python: remove non-actionable change notes
yoff cc0156d
python: remove the use of toAst
yoff a683b64
python: removed superflous module
yoff 90c1ddf
Update python/ql/lib/ide-contextual-queries/printCfg.ql
yoff 1068add
Split tests with disjoint concerns
yoff 2c0ed98
python: remove uninformative headers
yoff aa305c2
Python: mark definition of type ascription as `SPURIOUS`
yoff 05aa8de
python: make `LoopStmt` final
yoff fa94dc9
Python: remove reference to line numbers
yoff 665e046
Python: add overlay annotations to inlined predicates
yoff 3206ab0
Python: address CodeQL alerts
yoff 9b4de2b
Python: add tests for short-circuiting comparisons
yoff c11b491
Update python/ql/lib/semmle/python/controlflow/internal/AstNodeImpl.qll
yoff c516d1f
python: forward rather implement subtle predicates
yoff 3ad4861
Python: fix replace of upper-case characters
yoff File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| import semmle.python.controlflow.internal.AstNodeImpl | ||
| import ControlFlow::Consistency |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| --- | ||
| category: minorAnalysis | ||
| --- | ||
| * A new Python control flow graph implementation has been added under `semmle.python.controlflow.internal.Cfg` (backed by `AstNodeImpl.qll`), built on the shared `codeql.controlflow.ControlFlowGraph` library. It is not yet used by the dataflow library or any production query; the legacy CFG in `semmle/python/Flow.qll` remains the default. The new library is exposed for tests and for upcoming migrations. | ||
4 changes: 4 additions & 0 deletions
4
python/ql/lib/change-notes/2026-06-04-cfg-parameter-annotations.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| --- | ||
| category: minorAnalysis | ||
| --- | ||
| * The new (shared-CFG-based) Python control flow graph now visits parameter and return type annotations as CFG nodes for function definitions, matching the legacy CFG. This restores annotation-based type tracking through framework models such as FastAPI's `Depends()`, Pydantic request models, Starlette `WebSocket` handlers, and any other models that flow a class reference through `Parameter.getAnnotation()` to identify instances of the annotated class. | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same. |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /** | ||
| * @name Print CFG | ||
| * @description Produces a representation of a file's Control Flow Graph. | ||
| * This query is used by the VS Code extension. | ||
| * @id py/print-cfg | ||
| * @kind graph | ||
| * @tags ide-contextual-queries/print-cfg | ||
| */ | ||
|
|
||
| import semmle.python.Files as Files | ||
| // import semmle.python.Scope | ||
|
yoff marked this conversation as resolved.
Outdated
|
||
| import semmle.python.controlflow.internal.AstNodeImpl | ||
|
|
||
| external string selectedSourceFile(); | ||
|
|
||
| private predicate selectedSourceFileAlias = selectedSourceFile/0; | ||
|
|
||
| external int selectedSourceLine(); | ||
|
|
||
| private predicate selectedSourceLineAlias = selectedSourceLine/0; | ||
|
|
||
| external int selectedSourceColumn(); | ||
|
|
||
| private predicate selectedSourceColumnAlias = selectedSourceColumn/0; | ||
|
|
||
| module ViewCfgQueryInput implements ControlFlow::ViewCfgQueryInputSig<Files::File> { | ||
| predicate selectedSourceFile = selectedSourceFileAlias/0; | ||
|
|
||
| predicate selectedSourceLine = selectedSourceLineAlias/0; | ||
|
|
||
| predicate selectedSourceColumn = selectedSourceColumnAlias/0; | ||
|
|
||
| predicate cfgScopeSpan( | ||
| Ast::Callable scope, Files::File file, int startLine, int startColumn, int endLine, | ||
| int endColumn | ||
| ) { | ||
| file = scope.getLocation().getFile() and | ||
| scope.getLocation().hasLocationInfo(_, startLine, startColumn, endLine, endColumn) | ||
| } | ||
| } | ||
|
|
||
| import ControlFlow::ViewCfgQuery<Files::File, ViewCfgQueryInput> | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rhetorical question: Do any of our change-note consumers care about or need this information? I think the only two things we need to communicate in change notes are expected query result changes, and information for custom query writers if they need to adapt their QL code somehow. I.e. I don't think this PR should have a change note.