From 852d56ff805dc0c266fb9643b24db4819898ad87 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 25 Feb 2015 06:26:48 +0000 Subject: 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_0_0@49739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ class.c | 20 ++------------------ version.h | 2 +- vm_core.h | 2 ++ vm_insnhelper.c | 20 ++++++++++++++++++++ 5 files changed, 35 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index a59ebd3a8e..36dcaae14f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Wed Feb 25 15:07:01 2015 Kazuki Tsujimoto + + * vm_insnhelper.c (rb_vm_rewrite_cref_stack): copy nd_refinements + of original 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. + Wed Feb 25 14:53:27 2015 Shugo Maeda * class.c (method_entry_i, class_instance_method_list, diff --git a/class.c b/class.c index 9da8fe76a3..60038fc5f4 100644 --- a/class.c +++ b/class.c @@ -121,32 +121,16 @@ rb_class_new(VALUE super) return rb_class_boot(super); } -static NODE* -rewrite_cref_stack(NODE *node, VALUE old_klass, VALUE new_klass) -{ - NODE *new_node; - if (!node) { - return NULL; - } - if (node->nd_clss == old_klass) { - new_node = NEW_CREF(new_klass); - new_node->nd_next = node->nd_next; - } else { - new_node = NEW_CREF(node->nd_clss); - new_node->nd_next = rewrite_cref_stack(node->nd_next, old_klass, new_klass); - } - return new_node; -} - static void clone_method(VALUE klass, ID mid, const rb_method_entry_t *me) { VALUE newiseqval; if (me->def && me->def->type == VM_METHOD_TYPE_ISEQ) { rb_iseq_t *iseq; + NODE *new_cref; newiseqval = rb_iseq_clone(me->def->body.iseq->self, klass); GetISeqPtr(newiseqval, iseq); - iseq->cref_stack = rewrite_cref_stack(me->def->body.iseq->cref_stack, me->klass, klass); + rb_vm_rewrite_cref_stack(me->def->body.iseq->cref_stack, me->klass, klass, &new_cref); rb_add_method(klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag); RB_GC_GUARD(newiseqval); } diff --git a/version.h b/version.h index d4b41b29f1..1b70859cc8 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2015-02-25" -#define RUBY_PATCHLEVEL 641 +#define RUBY_PATCHLEVEL 642 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2 diff --git a/vm_core.h b/vm_core.h index 0ae55cefac..03f6d816c3 100644 --- a/vm_core.h +++ b/vm_core.h @@ -863,6 +863,8 @@ void rb_gc_mark_machine_stack(rb_thread_t *th); int rb_autoloading_value(VALUE mod, ID id, VALUE* value); +void rb_vm_rewrite_cref_stack(NODE *node, VALUE old_klass, VALUE new_klass, NODE **new_cref_ptr); + #define sysstack_error GET_VM()->special_exceptions[ruby_error_sysstack] #define CHECK_VM_STACK_OVERFLOW(cfp, margin) do \ diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 9f3a641fbe..707739e98f 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -295,6 +295,26 @@ rb_vm_get_cref(const rb_iseq_t *iseq, const VALUE *ep) return cref; } +void +rb_vm_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); + COPY_CREF_OMOD(new_node, node); + *new_cref_ptr = new_node; + return; + } + new_node = NEW_CREF(node->nd_clss); + COPY_CREF_OMOD(new_node, node); + node = node->nd_next; + *new_cref_ptr = new_node; + new_cref_ptr = &new_node->nd_next; + } + *new_cref_ptr = NULL; +} + static NODE * vm_cref_push(rb_thread_t *th, VALUE klass, int noex, rb_block_t *blockptr) { -- cgit v1.2.3