compile.c: Handle anonymous variables in outer_variable_cmp
#13436
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
|
I think your patch seems alright. I was going to suggest the following: diff --git a/compile.c b/compile.c
index 7eb953203c..9bfff6961f 100644
--- a/compile.c
+++ b/compile.c
@@ -13366,6 +13366,9 @@ static enum rb_id_table_iterator_result
store_outer_variable(ID id, VALUE val, void *dump)
{
struct outer_variable_list *ovlist = dump;
+ if (id & ID_INTERNAL) {
+ return ID_TABLE_CONTINUE;
+ }
struct outer_variable_pair *pair = &ovlist->pairs[ovlist->num++];
pair->id = id;
pair->name = rb_id2str(id);
@@ -13399,7 +13402,7 @@ ibf_dump_outer_variables(struct ibf_dump *dump, const rb_iseq_t *iseq)
struct outer_variable_list *ovlist = RB_ALLOCV(buff, buffsize);
ovlist->num = 0;
rb_id_table_foreach(ovs, store_outer_variable, ovlist);
- ruby_qsort(ovlist->pairs, size, sizeof(struct outer_variable_pair), outer_variable_cmp, NULL);
+ ruby_qsort(ovlist->pairs, ovlist->num, sizeof(struct outer_variable_pair), outer_variable_cmp, NULL);
for (size_t i = 0; i < size; ++i) {
ID id = ovlist->pairs[i].id;
ID val = ovlist->pairs[i].val;But then maybe the iseqs wouldn't round-trip correctly. I assume we're sorting these ids by name because when you load the iseq in a different process the id will change and the "name" is the only real stable key we have. I'm not sure what impact that has on anonymous locals though. |
Very good point. Rather than assert I fixed the crash, I should assert the code is still functional once roundtriped. I'll dig a bit, surely that isn't the only internal id in ISeq that need to be roundtriped. |
I did this today with @etiennebarrie, seem to work fine. |
This was referenced Jul 14, 2025
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.
[Bug #21370]
No idea if this is the correct way to fix it. I assume
itis indeed meant to be anonymous, but perhaps it shouldn't?