diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-24 01:31:16 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-24 01:31:16 +0000 |
commit | 6cbbe85481f4bc9b73d3ac773ca64d6e029c64bb (patch) | |
tree | c3775efd5a274dc1d62a0f057fdb79d3a7cff032 /class.c | |
parent | 9afc6729e0d2e1aa279abf2036a02b8686379fde (diff) |
merge revision(s) 49685,49687: [Backport #10885]
* vm_insnhelper.c (rb_vm_rewrite_cref_stack): copy nd_refinements
of orignal crefs. It fixes segmentation fault when calling
refined method in duplicate module. [ruby-dev:48878] [Bug #10885]
* vm_core.h, class.c: change accordingly.
* test/ruby/test_refinement.rb: add a test for above.
of original crefs. It fixes segmentation fault when calling
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49708 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'class.c')
-rw-r--r-- | class.c | 21 |
1 files changed, 1 insertions, 20 deletions
@@ -229,25 +229,6 @@ rb_class_new(VALUE super) } static void -rewrite_cref_stack(NODE *node, VALUE old_klass, VALUE new_klass, NODE **new_cref_ptr) -{ - NODE *new_node; - while (node) { - if (node->nd_clss == old_klass) { - new_node = NEW_CREF(new_klass); - RB_OBJ_WRITE(new_node, &new_node->nd_next, node->nd_next); - *new_cref_ptr = new_node; - return; - } - new_node = NEW_CREF(node->nd_clss); - node = node->nd_next; - *new_cref_ptr = new_node; - new_cref_ptr = &new_node->nd_next; - } - *new_cref_ptr = NULL; -} - -static void clone_method(VALUE klass, ID mid, const rb_method_entry_t *me) { VALUE newiseqval; @@ -256,7 +237,7 @@ clone_method(VALUE klass, ID mid, const rb_method_entry_t *me) NODE *new_cref; newiseqval = rb_iseq_clone(me->def->body.iseq->self, klass); GetISeqPtr(newiseqval, iseq); - rewrite_cref_stack(me->def->body.iseq->cref_stack, me->klass, klass, &new_cref); + rb_vm_rewrite_cref_stack(me->def->body.iseq->cref_stack, me->klass, klass, &new_cref); RB_OBJ_WRITE(iseq->self, &iseq->cref_stack, new_cref); rb_add_method(klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag); RB_GC_GUARD(newiseqval); |