https://git.ruby-lang.org/ruby.git/commit/?id=e47b111627

From e47b111627d5c68b8900f57364fecd51cbcd0268 Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@j...>
Date: Wed, 18 Sep 2019 15:30:59 -0700
Subject: Call rb_vm_call_kw insted of rb_vm_call0 in a few cases

rb_vm_call_kw handles the tmp buffer for you.

Also, change method_missing so it also calls rb_vm_call_kw to
handle the kw_splat flag, instead of requiring callers to handle
kw_splat flag before calling method_missing.  This may fix other
cases where method_missing is currently called without the kw_splat
being handled.

diff --git a/vm_eval.c b/vm_eval.c
index 43c2042..4b3cb47 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -270,7 +270,7 @@ rb_vm_call(rb_execution_context_t *ec, VALUE recv, VALUE id, int argc, const VAL https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L270
     return rb_vm_call0(ec, recv, id, argc, argv, me, VM_NO_KEYWORDS);
 }
 
-VALUE
+MJIT_FUNC_EXPORTED VALUE
 rb_vm_call_kw(rb_execution_context_t *ec, VALUE recv, VALUE id, int argc, const VALUE *argv, const rb_callable_method_entry_t *me, int kw_splat)
 {
     VALUE v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat);
@@ -284,7 +284,6 @@ vm_call_super(rb_execution_context_t *ec, int argc, const VALUE *argv, int kw_sp https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L284
 {
     VALUE recv = ec->cfp->self;
     VALUE klass;
-    VALUE v, ret;
     ID id;
     rb_control_frame_t *cfp = ec->cfp;
     const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
@@ -298,15 +297,10 @@ vm_call_super(rb_execution_context_t *ec, int argc, const VALUE *argv, int kw_sp https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L297
     id = me->def->original_id;
     me = rb_callable_method_entry(klass, id);
 
-    v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat);
     if (!me) {
-        ret = method_missing(recv, id, argc, argv, MISSING_SUPER, kw_splat);
+        return method_missing(recv, id, argc, argv, MISSING_SUPER, kw_splat);
     }
-    else {
-        ret = rb_vm_call0(ec, recv, id, argc, argv, me, kw_splat);
-    }
-    rb_free_tmp_buffer(&v);
-    return ret;
+    return rb_vm_call_kw(ec, recv, id, argc, argv, me, kw_splat);
 }
 
 VALUE
@@ -404,7 +398,7 @@ rb_call0(rb_execution_context_t *ec, https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L398
         return method_missing(recv, mid, argc, argv, call_status, kw_splat);
     }
     stack_check(ec);
-    return rb_vm_call0(ec, recv, mid, argc, argv, me, kw_splat);
+    return rb_vm_call_kw(ec, recv, mid, argc, argv, me, kw_splat);
 }
 
 struct rescue_funcall_args {
@@ -524,7 +518,6 @@ VALUE https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L518
 rb_check_funcall_default_kw(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE def, int kw_splat)
 {
     VALUE klass = CLASS_OF(recv);
-    VALUE v, ret;
     const rb_callable_method_entry_t *me;
     rb_execution_context_t *ec = GET_EC();
     int respond = check_funcall_respond_to(ec, klass, recv, mid);
@@ -534,16 +527,13 @@ rb_check_funcall_default_kw(VALUE recv, ID mid, int argc, const VALUE *argv, VAL https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L527
 
     me = rb_search_method_entry(recv, mid);
     if (!check_funcall_callable(ec, me)) {
-        ret = check_funcall_missing(ec, klass, recv, mid, argc, argv,
-                                    respond, def, kw_splat);
+        VALUE ret = check_funcall_missing(ec, klass, recv, mid, argc, argv,
+                                          respond, def, kw_splat);
 	if (ret == Qundef) ret = def;
 	return ret;
     }
     stack_check(ec);
-    v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat);
-    ret = rb_vm_call0(ec, recv, mid, argc, argv, me, kw_splat);
-    rb_free_tmp_buffer(&v);
-    return ret;
+    return rb_vm_call_kw(ec, recv, mid, argc, argv, me, kw_splat);
 }
 
 VALUE
@@ -557,7 +547,6 @@ rb_check_funcall_with_hook_kw(VALUE recv, ID mid, int argc, const VALUE *argv, https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L547
                            rb_check_funcall_hook *hook, VALUE arg, int kw_splat)
 {
     VALUE klass = CLASS_OF(recv);
-    VALUE v, ret;
     const rb_callable_method_entry_t *me;
     rb_execution_context_t *ec = GET_EC();
     int respond = check_funcall_respond_to(ec, klass, recv, mid);
@@ -569,17 +558,14 @@ rb_check_funcall_with_hook_kw(VALUE recv, ID mid, int argc, const VALUE *argv, https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L558
 
     me = rb_search_method_entry(recv, mid);
     if (!check_funcall_callable(ec, me)) {
-        ret = check_funcall_missing(ec, klass, recv, mid, argc, argv,
-                                    respond, Qundef, kw_splat);
+        VALUE ret = check_funcall_missing(ec, klass, recv, mid, argc, argv,
+                                          respond, Qundef, kw_splat);
 	(*hook)(ret != Qundef, recv, mid, argc, argv, arg);
 	return ret;
     }
     stack_check(ec);
     (*hook)(TRUE, recv, mid, argc, argv, arg);
-    v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat);
-    ret = rb_vm_call0(ec, recv, mid, argc, argv, me, kw_splat);
-    rb_free_tmp_buffer(&v);
-    return ret;
+    return rb_vm_call_kw(ec, recv, mid, argc, argv, me, kw_splat);
 }
 
 VALUE
@@ -892,7 +878,7 @@ method_missing(VALUE obj, ID id, int argc, const VALUE *argv, enum method_missin https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L878
     me = rb_callable_method_entry(klass, idMethodMissing);
     if (!me || METHOD_ENTRY_BASIC(me)) goto missing;
     vm_passed_block_handler_set(ec, block_handler);
-    result = rb_vm_call0(ec, obj, idMethodMissing, argc, argv, me, kw_splat);
+    result = rb_vm_call_kw(ec, obj, idMethodMissing, argc, argv, me, kw_splat);
     if (work) ALLOCV_END(work);
     return result;
 }
diff --git a/vm_method.c b/vm_method.c
index 63dc73f..a3d56c8 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -1921,9 +1921,7 @@ call_method_entry(rb_execution_context_t *ec, VALUE defined_class, VALUE obj, ID https://github.com/ruby/ruby/blob/trunk/vm_method.c#L1921
     const rb_callable_method_entry_t *cme =
         prepare_callable_method_entry(defined_class, id, me);
     VALUE passed_block_handler = vm_passed_block_handler(ec);
-    VALUE v = rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat);
-    VALUE result = rb_vm_call0(ec, obj, id, argc, argv, cme, kw_splat);
-    rb_free_tmp_buffer(&v);
+    VALUE result = rb_vm_call_kw(ec, obj, id, argc, argv, cme, kw_splat);
     vm_passed_block_handler_set(ec, passed_block_handler);
     return result;
 }
-- 
cgit v0.10.2


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