Rust: Basic control flow graph setup #17415
Merged
Conversation
This file contains 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
hvitved
requested changes
Sep 10, 2024
| * A basic block, that is, a maximal straight-line sequence of control flow nodes | ||
| * without branches or joins. | ||
| */ | ||
| class BasicBlock extends TBasicBlockStart { |
There was a problem hiding this comment.
BasicBlock is extended further down in the file so I did
final class BasicBlock = BasicBlockImpl;
private class BasicBlockImpl extends TBasicBlockStart { ... }similar to what you suggested for SuccessorType.
| private import internal.Completion | ||
| private import internal.SuccessorType | ||
| private import codeql.rust.controlflow.BasicBlocks | ||
| import internal.Scope |
There was a problem hiding this comment.
This exposes the abstract class CfgScope, which users could then in principle extend. So I think it would be better to do
private import internal.Scope as Scope
final class CfgScope = Scope::CfgScope;There was a problem hiding this comment.
I've done as suggested. But I wonder if it would make sense to do it inside Scope.qll instead?
rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImplSpecific.qll
Outdated
Show resolved
Hide resolved
rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
Outdated
Show resolved
Hide resolved
rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
Outdated
Show resolved
Hide resolved
rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
Outdated
Show resolved
Hide resolved
paldepind
force-pushed
the
rust-control-flow-graph
branch
from
e1f83de to
6d972be
Compare
paldepind
force-pushed
the
rust-control-flow-graph
branch
from
1126dc4 to
857edb7
Compare
|
I've addressed the comments 👍 I think we have the basic foundation for the CFG now. Looking at the result of the test we are at the very least creating some nodes and edges :) My guess it that they will still require some tweaking to be entirely right though. |
hvitved
approved these changes
Sep 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an attempt to add the basic setup/boilerplate needed to construct a CFG.
The PR is based on looking at how the CFG library is used for Swift, Kaleidoscope, Ruby, and C#. I've mixed and matched a bit form these, but mostly taken stuff from Swift (because it also uses codegen) and Kaleidoscope (because it's the simplest setup). I've erred on the side of simplicity to avoid adding stuff that we don't need (right away at least).