Validate stack height at branch instructions #386
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
Codecov Report
@@ Coverage Diff @@
## master #386 +/- ##
==========================================
+ Coverage 99.32% 99.33% +0.01%
==========================================
Files 42 42
Lines 12489 12688 +199
==========================================
+ Hits 12405 12604 +199
Misses 84 84 |
gumb0
force-pushed
the
validate-br-stack
branch
4 times, most recently
from
b5d528e
to
a5b0de0
Compare
gumb0
commented
Jun 15, 2020
lib/fizzy/parser_expr.cpp
Outdated
| inline void validate_branch_stack_height( | ||
| const ControlFrame& current_frame, const ControlFrame& branch_frame) | ||
| { | ||
| // assert(current_frame.stack_height >= current_frame.parent_stack_height); |
There was a problem hiding this comment.
This can be enabled after #384 is merged
gumb0
changed the title
chfast
reviewed
Jun 16, 2020
lib/fizzy/parser_expr.cpp
Outdated
| { | ||
| // assert(current_frame.stack_height >= current_frame.parent_stack_height); | ||
|
|
||
| if (!current_frame.unreachable && get_branch_arity(branch_frame) == 1 && |
There was a problem hiding this comment.
I think this can be expressed without assuming branch_airty ∈{0,1}. E.g. like
current_frame.stack_height - get_branch_arity(branch_frame) < current_frame.parent_stack_heightJust make sure this uses signed integer types.
There was a problem hiding this comment.
Nice suggestion, I changed it to be similar to checks in validate_result_count
chfast
approved these changes
Jun 17, 2020
chfast
approved these changes
Jun 17, 2020
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.
No description provided.