From e4717eaa4c7511f09e906b6896f15faab8ccec86 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 16 Dec 2014 06:18:25 +0000 Subject: iseq.c: struct accessors * iseq.c (rb_method_for_self_aref, rb_method_for_self_aset): call accessor functions directly, not to be affected by [] and []= methods. [ruby-core:66846] [Bug #10601] * struct.c (define_aref_method, define_aset_method): ditto. * vm_insnhelper.c (rb_vm_opt_struct_aref, rb_vm_opt_struct_aset): direct accessors of Struct. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- struct.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'struct.c') diff --git a/struct.c b/struct.c index 080c0f3f04..c123318b81 100644 --- a/struct.c +++ b/struct.c @@ -13,8 +13,8 @@ #include "vm_core.h" #include "method.h" -VALUE rb_method_for_self_aref(VALUE name, VALUE arg); -VALUE rb_method_for_self_aset(VALUE name, VALUE arg); +VALUE rb_method_for_self_aref(VALUE name, VALUE arg, rb_insn_func_t func); +VALUE rb_method_for_self_aset(VALUE name, VALUE arg, rb_insn_func_t func); VALUE rb_cStruct; static ID id_members; @@ -175,7 +175,8 @@ new_struct(VALUE name, VALUE super) static void define_aref_method(VALUE nstr, VALUE name, VALUE off) { - VALUE iseqval = rb_method_for_self_aref(name, off); + rb_control_frame_t *FUNC_FASTCALL(rb_vm_opt_struct_aref)(rb_thread_t *, rb_control_frame_t *); + VALUE iseqval = rb_method_for_self_aref(name, off, rb_vm_opt_struct_aref); rb_iseq_t *iseq = DATA_PTR(iseqval); rb_add_method(nstr, SYM2ID(name), VM_METHOD_TYPE_ISEQ, iseq, NOEX_PUBLIC); @@ -185,7 +186,8 @@ define_aref_method(VALUE nstr, VALUE name, VALUE off) static void define_aset_method(VALUE nstr, VALUE name, VALUE off) { - VALUE iseqval = rb_method_for_self_aset(name, off); + rb_control_frame_t *FUNC_FASTCALL(rb_vm_opt_struct_aset)(rb_thread_t *, rb_control_frame_t *); + VALUE iseqval = rb_method_for_self_aset(name, off, rb_vm_opt_struct_aset); rb_iseq_t *iseq = DATA_PTR(iseqval); rb_add_method(nstr, SYM2ID(name), VM_METHOD_TYPE_ISEQ, iseq, NOEX_PUBLIC); -- cgit v1.2.3