Extract out usages of Ruby IDs #2175
Open
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
amomchilov
changed the title
amomchilov
force-pushed
the
ruby-based-constant-pool
branch
2 times, most recently
from
4ee0431 to
fa6470f
Compare
amomchilov
commented
Dec 18, 2024
| @@ -221,9 +239,9 @@ static VALUE rbs_new_location_from_loc_range(VALUE buffer, rbs_loc_range rg) { | |||
| static VALUE location_aref(VALUE self, VALUE name) { | |||
| rbs_loc *loc = rbs_check_location(self); | |||
|
|
|||
| ID id = SYM2ID(name); | |||
There was a problem hiding this comment.
I think this used to leak memory, since SYM2ID would allocate a static symbol.
| @@ -1023,8 +1031,13 @@ static VALUE parse_simple(parserstate *state) { | |||
| return parse_symbol(state); | |||
| } | |||
| case tUIDENT: { | |||
| ID name = INTERN_TOKEN(state, state->current_token); | |||
There was a problem hiding this comment.
This INTERN_TOKEN macro was calling rb_intern3(), which was slowly leaking memory by creating static ("immortal") symbols.
The replacement rbs_constant_pool_find() function uses rb_check_id_cstr() instead, which checks for a match without intern a new symbol if there wasn't one.
|
|
||
| /** The overall constant pool, which stores constants found while parsing. */ | ||
| typedef struct { | ||
| void *dummy; // Workaround for structs not being allowed to be empty. |
There was a problem hiding this comment.
Eventually, this will be replaced with the real storage that will store the constant pool, instead of the one built into the Ruby VM.
amomchilov
force-pushed
the
ruby-based-constant-pool
branch
from
fa6470f to
0b4f69e
Compare
amomchilov
force-pushed
the
ruby-based-constant-pool
branch
from
0b4f69e to
3ae33c6
Compare
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 PR extracts out an
rbs_constant_poolinterface, which mimics thepm_constant_poolfrom Prism.I use it to wrap all usages of
IDas location child keys, instead of directly depending Ruby APIs likerb_intern(),ID2SYM,SYM2ID, etc. This includes the keys used to identify the children in arb_loc, and the keys used in the parser's typevar tables.For now, this is just a dummy implementation which delegates to those same Ruby APIs, but will eventually be replaced with Prism's real logic, which doesn't depend on
ruby.hat all.For easier reviewing, have a look at each commit separately.