From ac835db6c8d5ed105ab3783c48a5b577fa0e05cf Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 28 Sep 2007 14:17:28 +0000 Subject: [PATCH] * insnhelper.ci (vm_call_method): allow send! to call protected methods as well. [ruby-core:12280] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ compile.c | 3 +++ insnhelper.ci | 3 ++- vm_core.h | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4c68daae41..b68432b4d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 28 23:15:31 2007 Yukihiro Matsumoto + + * insnhelper.ci (vm_call_method): allow send! to call protected + methods as well. [ruby-core:12280] + Fri Sep 28 22:33:47 2007 Koichi Sasada * benchmark/bm_so_fasta.rb: added. diff --git a/compile.c b/compile.c index 0174943968..a420589398 100644 --- a/compile.c +++ b/compile.c @@ -1487,6 +1487,9 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj) mid == id__send__ ) { OPERAND_AT(iobj, 3) |= INT2FIX(VM_CALL_SEND_BIT); } + if (mid == idSendBang || mid == id__send_bang) { + OPERAND_AT(iobj, 3) |= INT2FIX(VM_CALL_SEND_BANG_BIT); + } } return COMPILE_OK; } diff --git a/insnhelper.ci b/insnhelper.ci index afb0bd0e76..d067903ad8 100644 --- a/insnhelper.ci +++ b/insnhelper.ci @@ -537,7 +537,8 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, } val = vm_method_missing(th, id, recv, num, blockptr, stat); } - else if ((mn->nd_noex & NOEX_MASK) & NOEX_PROTECTED) { + else if (((mn->nd_noex & NOEX_MASK) & NOEX_PROTECTED) && + !(flag & VM_CALL_SEND_BANG_BIT)) { VALUE defined_class = mn->nd_clss; if (TYPE(defined_class) == T_ICLASS) { diff --git a/vm_core.h b/vm_core.h index 7e01bfb994..69e9e1cd06 100644 --- a/vm_core.h +++ b/vm_core.h @@ -539,6 +539,7 @@ typedef struct { #define VM_CALL_TAILRECURSION_BIT (0x01 << 6) #define VM_CALL_SUPER_BIT (0x01 << 7) #define VM_CALL_SEND_BIT (0x01 << 8) +#define VM_CALL_SEND_BANG_BIT (0x01 << 9) /* inline (method|const) cache */ #define NEW_INLINE_CACHE_ENTRY() NEW_WHILE(Qundef, 0, 0)