From c9f2b790adcff8df48e3192d18ee8afa02f5530c Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Wed, 18 Sep 2019 12:59:01 -0700
Subject: Handle keyword argument separation for Enumerator#size

When Object#to_enum is passed a block, the block is called to get
a size with the arguments given to to_enum.  This calls the block
with the same keyword flag as to_enum is called with.

This requires adding rb_check_funcall_kw and
rb_check_funcall_default_kw to handle keyword flags.
---
 vm_eval.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'vm_eval.c')

diff --git a/vm_eval.c b/vm_eval.c
index 3a0645d28d..43c2042db7 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -508,16 +508,23 @@ check_funcall_missing(rb_execution_context_t *ec, VALUE klass, VALUE recv, ID mi
     return ret;
 }
 
+VALUE
+rb_check_funcall_kw(VALUE recv, ID mid, int argc, const VALUE *argv, int kw_splat)
+{
+    return rb_check_funcall_default_kw(recv, mid, argc, argv, Qundef, kw_splat);
+}
+
 VALUE
 rb_check_funcall(VALUE recv, ID mid, int argc, const VALUE *argv)
 {
-    return rb_check_funcall_default(recv, mid, argc, argv, Qundef);
+    return rb_check_funcall_default_kw(recv, mid, argc, argv, Qundef, RB_NO_KEYWORDS);
 }
 
 VALUE
-rb_check_funcall_default(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE def)
+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);
@@ -527,13 +534,22 @@ rb_check_funcall_default(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE
 
     me = rb_search_method_entry(recv, mid);
     if (!check_funcall_callable(ec, me)) {
-	VALUE ret = check_funcall_missing(ec, klass, recv, mid, argc, argv,
-                                          respond, def, RB_NO_KEYWORDS);
+        ret = check_funcall_missing(ec, klass, recv, mid, argc, argv,
+                                    respond, def, kw_splat);
 	if (ret == Qundef) ret = def;
 	return ret;
     }
     stack_check(ec);
-    return rb_vm_call0(ec, recv, mid, argc, argv, me, RB_NO_KEYWORDS);
+    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;
+}
+
+VALUE
+rb_check_funcall_default(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE def)
+{
+    return rb_check_funcall_default_kw(recv, mid, argc, argv, def, RB_NO_KEYWORDS);
 }
 
 VALUE
@@ -554,7 +570,7 @@ rb_check_funcall_with_hook_kw(VALUE recv, ID mid, int argc, const VALUE *argv,
     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);
+                                    respond, Qundef, kw_splat);
 	(*hook)(ret != Qundef, recv, mid, argc, argv, arg);
 	return ret;
     }
-- 
cgit v1.2.3