fix: storage slot allocation bug #2391
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 #2391 +/- ##
==========================================
- Coverage 85.84% 85.75% -0.10%
==========================================
Files 91 91
Lines 9022 9028 +6
Branches 2152 2155 +3
==========================================
- Hits 7745 7742 -3
- Misses 785 790 +5
- Partials 492 496 +4
Continue to review full report at Codecov.
|
Reentrancy key was in the wrong location This also refactors the nonreentrant key allocation so the functionality happens in the same place as global variable allocation.
charles-cooper
force-pushed
the
fix/storage_slots
branch
from
debf544
to
a09cddd
Compare
charles-cooper
requested review from
iamdefinitelyahuman and
fubuloubu
and removed request for
iamdefinitelyahuman
fubuloubu
reviewed
Jul 22, 2021
vyper/old_codegen/global_context.py
Outdated
| @@ -224,6 +224,7 @@ def add_globals_and_events(self, item): | |||
| def parse_type(self, ast_node, location): | |||
| return parse_type(ast_node, location, sigs=self._contracts, custom_structs=self._structs,) | |||
|
|
|||
| # TODO this is dead code | |||
| def get_nonrentrant_counter(self, key): | |||
There was a problem hiding this comment.
Can we remove this dead code?
There was a problem hiding this comment.
I don't want to now just in case it's a larger project
There was a problem hiding this comment.
just remove it and push, if it causes CI failures then take it out.
There was a problem hiding this comment.
just remove it and push, if it causes CI failures then take it out.
done, see latest commit
The last storage variable was not being tested which is why this slipped by. The reason there was a collision in the last storage variable is because there are holes in the storage allocator left by HashMaps (which is why the slots in global_context and set_data_positions were not matching up).
charles-cooper
force-pushed
the
fix/storage_slots
branch
from
8c7f7e8
to
a894a33
Compare
Added, rather I fixed the existing test |
charles-cooper
force-pushed
the
fix/storage_slots
branch
from
ed19124
to
5bcadcf
Compare
fubuloubu
approved these changes
Jul 23, 2021
iamdefinitelyahuman
approved these changes
Jul 23, 2021
iamdefinitelyahuman
approved these changes
Jul 23, 2021
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 also refactors the nonreentrant key allocation so the functionality
happens in the same place as global variable allocation.
How to verify it
Apply a894a33 to master, see that tests don't pass but they do on this branch
Description for the changelog
Cute Animal Picture