More stack height validation #319
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
chfast
force-pushed
the
max_stack_height
branch
2 times, most recently
from
49229ea
to
0ee5474
Compare
axic
reviewed
May 19, 2020
| @@ -76,6 +91,23 @@ void update_caller_frame(ControlFrame& frame, const FuncType& func_type) | |||
| frame.stack_height += stack_height_change; | |||
| } | |||
|
|
|||
| void validate_result_count(const ControlFrame& frame) | |||
There was a problem hiding this comment.
Why isn't this a helper or a constructor on ControlFrame?
There was a problem hiding this comment.
Conceptually: because ControlFrame is pure data type, and it does not know how to do validation.
Also: there is update_caller_frame().
gumb0
reviewed
May 19, 2020
gumb0
reviewed
May 19, 2020
gumb0
reviewed
May 19, 2020
|
This commit I think should be enough to get function arity information 5e86830 |
I'm leaving this for later, so we can parallelize validation and stack optimization PRs. |
gumb0
reviewed
May 19, 2020
axic
reviewed
May 20, 2020
| @@ -87,7 +121,9 @@ parser_result<Code> parse_expr(const uint8_t* pos, const uint8_t* end, const Mod | |||
| // For a block/if/else instruction the value is the block/if/else's immediate offset. | |||
| std::stack<ControlFrame> control_stack; | |||
|
|
|||
| control_stack.push({Instr::block}); // The function's implicit block. | |||
| // TODO: Get function result arity from the function type in Module. | |||
gumb0
reviewed
May 20, 2020
gumb0
reviewed
May 20, 2020
axic
approved these changes
May 21, 2020
Merged
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 validates if frames leave enough results they promised, however this check is missing for function frames (function type information is missing, but this is fixed in #312 - see a TODO comment). The situation where there is more results left is also not reported, but is easy to add - see TODO comment. This cannot be applied now because a lot of false positives when function result arity is so far assumed 0.
The frame
stack_heightnow uses absolute values what will be useful for jump resolving in #312 and makes computing code's max stack height straight forward (as it is max value of anyframe.stack_height).