1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stabilize outer variable list

Browse Source 
Sort outer variables by names to make dumped binary data stable.
This commit is contained in:
Nobuyoshi Nakada 2023-11-11 15:44:35 +09:00
parent 1fe2bc4b22
commit 2a442121d1
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
1 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
compile.c
View File

@ -11997,15 +11997,36 @@ ibf_dump_ci_entries(struct ibf_dump *dump, const rb_iseq_t *iseq)
return offset; return offset;
} }
static enum rb_id_table_iterator_result struct outer_variable_pair {
dump_outer_variable(ID id, VALUE val, void *dump) ID id;
{ VALUE name;
ibf_dump_write_small_value(dump, ibf_dump_id(dump, id)); VALUE val;
ibf_dump_write_small_value(dump, val); };
struct outer_variable_list {
size_t num;
struct outer_variable_pair pairs[1];
};
static enum rb_id_table_iterator_result
store_outer_variable(ID id, VALUE val, void *dump)
{
struct outer_variable_list *ovlist = dump;
struct outer_variable_pair *pair = &ovlist->pairs[ovlist->num++];
pair->id = id;
pair->name = rb_id2str(id);
pair->val = val;
return ID_TABLE_CONTINUE; return ID_TABLE_CONTINUE;
} }
static int
outer_variable_cmp(const void *a, const void *b, void *arg)
{
const struct outer_variable_pair *ap = (const struct outer_variable_pair *)a;
const struct outer_variable_pair *bp = (const struct outer_variable_pair *)b;
return rb_str_cmp(ap->name, bp->name);
}
static ibf_offset_t static ibf_offset_t
ibf_dump_outer_variables(struct ibf_dump *dump, const rb_iseq_t *iseq) ibf_dump_outer_variables(struct ibf_dump *dump, const rb_iseq_t *iseq)
{ {
@ -12013,12 +12034,24 @@ ibf_dump_outer_variables(struct ibf_dump *dump, const rb_iseq_t *iseq)
ibf_offset_t offset = ibf_dump_pos(dump); ibf_offset_t offset = ibf_dump_pos(dump);
if (ovs) { size_t size = ovs ? rb_id_table_size(ovs) : 0;
ibf_dump_write_small_value(dump, (VALUE)rb_id_table_size(ovs)); ibf_dump_write_small_value(dump, (VALUE)size);
rb_id_table_foreach(ovs, dump_outer_variable, (void *)dump); if (size > 0) {
} VALUE buff;
else { size_t buffsize =
ibf_dump_write_small_value(dump, (VALUE)0); rb_size_mul_add_or_raise(sizeof(struct outer_variable_pair), size,
offsetof(struct outer_variable_list, pairs),
rb_eArgError);
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);
for (size_t i = 0; i < size; ++i) {
ID id = ovlist->pairs[i].id;
ID val = ovlist->pairs[i].val;
ibf_dump_write_small_value(dump, ibf_dump_id(dump, id));
ibf_dump_write_small_value(dump, val);
}
} }
return offset; return offset;