k0kubun	2018-10-23 21:01:34 +0900 (Tue, 23 Oct 2018)

  New Revision: 65318

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65318

  Log:
    _mjit_compile_send.erb: fix wrong cc usages

  Modified files:
    trunk/tool/ruby_vm/views/_mjit_compile_send.erb
Index: tool/ruby_vm/views/_mjit_compile_send.erb
===================================================================
--- tool/ruby_vm/views/_mjit_compile_send.erb	(revision 65317)
+++ tool/ruby_vm/views/_mjit_compile_send.erb	(revision 65318)
@@ -16,14 +16,14 @@ https://github.com/ruby/ruby/blob/trunk/tool/ruby_vm/views/_mjit_compile_send.erb#L16
 % # compiler: Use copied cc to avoid race condition
     CALL_CACHE cc_copy = status->cc_entries + (cc - body->cc_entries);
 %
-    if (has_valid_method_type(cc)) {
+    if (has_valid_method_type(cc_copy)) {
         const rb_iseq_t *iseq;
         unsigned int argc = ci->orig_argc; /* unlike `ci->orig_argc`, `argc` may include blockarg */
 % if insn.name == 'send'
         argc += ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0);
 % end
 
-        if (cc_copy->me->def->type == VM_METHOD_TYPE_ISEQ && inlinable_iseq_p(ci, cc, iseq = rb_iseq_check(cc_copy->me->def->body.iseq.iseqptr))) { /* CC_SET_FASTPATH in vm_callee_setup_arg */
+        if (cc_copy->me->def->type == VM_METHOD_TYPE_ISEQ && inlinable_iseq_p(ci, cc_copy, iseq = rb_iseq_check(cc_copy->me->def->body.iseq.iseqptr))) { /* CC_SET_FASTPATH in vm_callee_setup_arg */
             int param_size = iseq->body->param.size; /* TODO: check calling->argc for argument_arity_error */
 
             fprintf(f, "{\n");

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/