ruby-changes:25207
From: ko1 <ko1@a...>
Date: Thu, 18 Oct 2012 18:42:07 +0900 (JST)
Subject: [ruby-changes:25207] ko1:r37259 (trunk): * insns.def (send): remove unused condition.
ko1 2012-10-18 18:41:55 +0900 (Thu, 18 Oct 2012) New Revision: 37259 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37259 Log: * insns.def (send): remove unused condition. This condition will be true after r37258. * vm_insnhelper.c (vm_caller_setup_args): remove `UNLIKELY' on checking blockiseq (it seems `LIKELY'). Modified files: trunk/ChangeLog trunk/insns.def trunk/vm_insnhelper.c Index: ChangeLog =================================================================== --- ChangeLog (revision 37258) +++ ChangeLog (revision 37259) @@ -1,3 +1,11 @@ +Thu Oct 18 18:29:25 2012 Koichi Sasada <ko1@a...> + + * insns.def (send): remove unused condition. + This condition will be true after r37258. + + * vm_insnhelper.c (vm_caller_setup_args): remove `UNLIKELY' on + checking blockiseq (it seems `LIKELY'). + Thu Oct 18 17:31:58 2012 Koichi Sasada <ko1@a...> * insns.def (opt_send_simple): introduce new instruction used Index: insns.def =================================================================== --- insns.def (revision 37258) +++ insns.def (revision 37259) @@ -963,10 +963,7 @@ { ci->argc = ci->orig_argc; ci->blockptr = 0; - - if (UNLIKELY(!(ci->flag & VM_CALL_ARGS_SKIP_SETUP))) { - vm_caller_setup_args(th, reg_cfp, ci); - } + vm_caller_setup_args(th, reg_cfp, ci); vm_search_method(ci, ci->recv = TOPN(ci->argc)); CALL_METHOD(ci); } Index: vm_insnhelper.c =================================================================== --- vm_insnhelper.c (revision 37258) +++ vm_insnhelper.c (revision 37259) @@ -1058,7 +1058,7 @@ RUBY_VM_GET_BLOCK_PTR_IN_CFP(cfp)->proc = proc; } } - else if (UNLIKELY(ci->blockiseq != 0)) { + else if (ci->blockiseq != 0) { /* likely */ ci->blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(cfp); ci->blockptr->iseq = ci->blockiseq; ci->blockptr->proc = 0; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/