Fix runtime cost ref.Val stack #517
Merged
Conversation
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
Contributor
Author
|
/assign @TristonianJones |
Contributor
Author
|
Feedback applied @TristonianJones |
TristonianJones
requested changes
Mar 22, 2022
interpreter/runtimecost.go
Outdated
| // the stack. | ||
| // WARNING: It is possible for multiple expressions with the same ID to exist (due to how macros are implemented) so it's | ||
| // possible that a dropped ID will remain on the stack. They should be removed when IDs on the stack are popped. | ||
| func (s *refValStack) popArgs(args []Interpretable) ([]ref.Val, bool) { |
Collaborator
There was a problem hiding this comment.
nit: consider calling this dropArgs
TristonianJones
approved these changes
Mar 22, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
I discovered that the stack that I had introduced in #494 as part of the introduction of runtime cost budgeting was not being managed correctly. Specifically, not all stack items pushed were being properly popped.
This PR fixes the stack by tracking the expression IDs associated with each stack value. The
popoperations then specify the expression IDs of the stack items they wish to pop. If any spurious values are above the stack item being popped, they are removed from the stack as part of thepop.This solves a bunch of problems and generally makes the stack much safer to use.
I have also improved the stack handling overall, which helps keep memory usage to a minimum. The only remaining case where I am certain that spurious stack items are left behind is the case where top-level variable lookup not being accounted for correctly.