From 8efe878d11a136c8ea209eaf1448ee6a788c4814 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 10 Dec 2014 04:39:29 +0000 Subject: struct.c: use iseqval * struct.c (define_aref_method, define_aset_method): use iseq VALUE instead of rb_iseq_t to prevent from GC, as RB_GC_GUARD makes sense only for local variables. [Feature #10575] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48754 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- struct.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'struct.c') diff --git a/struct.c b/struct.c index 3a2ea47434..080c0f3f04 100644 --- a/struct.c +++ b/struct.c @@ -13,8 +13,8 @@ #include "vm_core.h" #include "method.h" -rb_iseq_t *rb_method_for_self_aref(VALUE name, VALUE arg); -rb_iseq_t *rb_method_for_self_aset(VALUE name, VALUE arg); +VALUE rb_method_for_self_aref(VALUE name, VALUE arg); +VALUE rb_method_for_self_aset(VALUE name, VALUE arg); VALUE rb_cStruct; static ID id_members; @@ -175,19 +175,21 @@ new_struct(VALUE name, VALUE super) static void define_aref_method(VALUE nstr, VALUE name, VALUE off) { - rb_iseq_t *iseq = rb_method_for_self_aref(name, off); + VALUE iseqval = rb_method_for_self_aref(name, off); + rb_iseq_t *iseq = DATA_PTR(iseqval); rb_add_method(nstr, SYM2ID(name), VM_METHOD_TYPE_ISEQ, iseq, NOEX_PUBLIC); - RB_GC_GUARD(iseq->self); + RB_GC_GUARD(iseqval); } static void define_aset_method(VALUE nstr, VALUE name, VALUE off) { - rb_iseq_t *iseq = rb_method_for_self_aset(name, off); + VALUE iseqval = rb_method_for_self_aset(name, off); + rb_iseq_t *iseq = DATA_PTR(iseqval); rb_add_method(nstr, SYM2ID(name), VM_METHOD_TYPE_ISEQ, iseq, NOEX_PUBLIC); - RB_GC_GUARD(iseq->self); + RB_GC_GUARD(iseqval); } static VALUE -- cgit v1.2.3