-
Notifications
You must be signed in to change notification settings - Fork 1.9k
C++: Implement DataFlow::BarrierGuard for AST+IR #2213
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 all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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
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
68 changes: 68 additions & 0 deletions
68
cpp/ql/test/library-tests/dataflow/dataflow-tests/BarrierGuard.cpp
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,68 @@ | ||
| int source(); | ||
| void sink(int); | ||
| bool guarded(int); | ||
|
|
||
| void bg_basic(int source) { | ||
| if (guarded(source)) { | ||
| sink(source); // no flow | ||
| } else { | ||
| sink(source); // flow | ||
| } | ||
| } | ||
|
|
||
| void bg_not(int source) { | ||
| if (!guarded(source)) { | ||
| sink(source); // flow | ||
| } else { | ||
| sink(source); // no flow | ||
| } | ||
| } | ||
|
|
||
| void bg_and(int source, bool arbitrary) { | ||
| if (guarded(source) && arbitrary) { | ||
| sink(source); // no flow | ||
| } else { | ||
| sink(source); // flow | ||
| } | ||
| } | ||
|
|
||
| void bg_or(int source, bool arbitrary) { | ||
| if (guarded(source) || arbitrary) { | ||
| sink(source); // flow | ||
| } else { | ||
| sink(source); // flow | ||
| } | ||
| } | ||
|
|
||
| void bg_return(int source) { | ||
| if (!guarded(source)) { | ||
| return; | ||
| } | ||
| sink(source); // no flow | ||
| } | ||
|
|
||
| struct XY { | ||
| int x, y; | ||
| }; | ||
|
|
||
| void bg_stackstruct(XY s1, XY s2) { | ||
| s1.x = source(); | ||
| if (guarded(s1.x)) { | ||
| sink(s1.x); // no flow | ||
| } else if (guarded(s1.y)) { | ||
| sink(s1.x); // flow | ||
| } else if (guarded(s2.y)) { | ||
| sink(s1.x); // flow | ||
| } | ||
| } | ||
|
|
||
| void bg_structptr(XY *p1, XY *p2) { | ||
| p1->x = source(); | ||
| if (guarded(p1->x)) { | ||
| sink(p1->x); // no flow [FALSE POSITIVE in AST] | ||
| } else if (guarded(p1->y)) { | ||
| sink(p1->x); // flow [NOT DETECTED in IR] | ||
| } else if (guarded(p2->x)) { | ||
| sink(p1->x); // flow [NOT DETECTED in IR] | ||
| } | ||
| } |
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
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
10 changes: 10 additions & 0 deletions
10
cpp/ql/test/library-tests/dataflow/dataflow-tests/test.expected
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
3 changes: 3 additions & 0 deletions
3
cpp/ql/test/library-tests/dataflow/dataflow-tests/test_diff.expected
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
7 changes: 7 additions & 0 deletions
7
cpp/ql/test/library-tests/dataflow/dataflow-tests/test_ir.expected
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
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
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.
b->branch(or vice versa)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.
Good catch. I had trouble with the naming of this Boolean since there's a field named
branchon theIRGuardConditionclass, and parameters are not allowed to shadow fields. I've named itbso it's consistent between IR and non-IR.