From 6cbbe85481f4bc9b73d3ac773ca64d6e029c64bb Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 24 Feb 2015 01:31:16 +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_2@49708 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_core.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'vm_core.h') diff --git a/vm_core.h b/vm_core.h index 51be6992e1..3eb1b850ab 100644 --- a/vm_core.h +++ b/vm_core.h @@ -1003,6 +1003,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 RUBY_CONST_ASSERT(expr) (1/!!(expr)) /* expr must be a compile-time constant */ -- cgit v1.2.3