archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 21:49:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Refactor rewrite_cref

Browse source
This commit is contained in:
John Hawthorn 2025-06-07 20:59:04 -07:00
parent 7c3bbfcddb
commit 443ed45a4e
3 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
class.c
View file

@ -877,8 +877,7 @@ static void
clone_method(VALUE old_klass, VALUE new_klass, ID mid, const rb_method_entry_t *me) clone_method(VALUE old_klass, VALUE new_klass, ID mid, const rb_method_entry_t *me)
{ {
if (me->def->type == VM_METHOD_TYPE_ISEQ) { if (me->def->type == VM_METHOD_TYPE_ISEQ) {
rb_cref_t *new_cref; rb_cref_t *new_cref = rb_vm_rewrite_cref(me->def->body.iseq.cref, old_klass, new_klass);
rb_vm_rewrite_cref(me->def->body.iseq.cref, old_klass, new_klass, &new_cref);
rb_add_method_iseq(new_klass, mid, me->def->body.iseq.iseqptr, new_cref, METHOD_ENTRY_VISI(me)); rb_add_method_iseq(new_klass, mid, me->def->body.iseq.iseqptr, new_cref, METHOD_ENTRY_VISI(me));
} }
else { else {

2
vm_core.h
View file

@ -1922,7 +1922,7 @@ void rb_vm_register_special_exception_str(enum ruby_special_exceptions sp, VALUE
void rb_gc_mark_machine_context(const rb_execution_context_t *ec); void rb_gc_mark_machine_context(const rb_execution_context_t *ec);
void rb_vm_rewrite_cref(rb_cref_t *node, VALUE old_klass, VALUE new_klass, rb_cref_t **new_cref_ptr); rb_cref_t *rb_vm_rewrite_cref(rb_cref_t *node, VALUE old_klass, VALUE new_klass);
const rb_callable_method_entry_t *rb_vm_frame_method_entry(const rb_control_frame_t *cfp); const rb_callable_method_entry_t *rb_vm_frame_method_entry(const rb_control_frame_t *cfp);

29
vm_insnhelper.c
View file

@ -967,23 +967,36 @@ vm_get_const_key_cref(const VALUE *ep)
return NULL; return NULL;
} }
void rb_cref_t *
rb_vm_rewrite_cref(rb_cref_t *cref, VALUE old_klass, VALUE new_klass, rb_cref_t **new_cref_ptr) rb_vm_rewrite_cref(rb_cref_t *cref, VALUE old_klass, VALUE new_klass)
{ {
rb_cref_t *new_cref; rb_cref_t *new_cref_head = NULL;
rb_cref_t *new_cref_tail = NULL;
#define ADD_NEW_CREF(new_cref) \
if (new_cref_tail) { \
new_cref_tail->next = new_cref; \
} else { \
new_cref_head = new_cref; \
} \
new_cref_tail = new_cref;
while (cref) { while (cref) {
rb_cref_t *new_cref;
if (CREF_CLASS(cref) == old_klass) { if (CREF_CLASS(cref) == old_klass) {
new_cref = vm_cref_new_use_prev(new_klass, METHOD_VISI_UNDEF, FALSE, cref, FALSE); new_cref = vm_cref_new_use_prev(new_klass, METHOD_VISI_UNDEF, FALSE, cref, FALSE);
*new_cref_ptr = new_cref; ADD_NEW_CREF(new_cref);
return; return new_cref_head;
} }
new_cref = vm_cref_new_use_prev(CREF_CLASS(cref), METHOD_VISI_UNDEF, FALSE, cref, FALSE); new_cref = vm_cref_new_use_prev(CREF_CLASS(cref), METHOD_VISI_UNDEF, FALSE, cref, FALSE);
cref = CREF_NEXT(cref); cref = CREF_NEXT(cref);
*new_cref_ptr = new_cref; ADD_NEW_CREF(new_cref);
new_cref_ptr = &new_cref->next;
} }
*new_cref_ptr = NULL;
#undef ADD_NEW_CREF
// Could we just reuse the original cref?
return new_cref_head;
} }
static rb_cref_t * static rb_cref_t *