kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Unflag a splatted flagged hash if the method doesn't use ruby2_keywords

Browse source 
For a method such as:

  def foo(*callee_args) end

If this method is called with a flagged hash (created by a method
flagged with ruby2_keywords), this previously passed the hash
through without modification.  With this change, it acts as if the
last hash was passed as keywords, so a call to:

  foo(*caller_args)

where the last element of caller_args is a flagged hash, will be
treated as:

  foo(*caller_args[0...-1], **caller_args[-1])

As a result, inside foo, callee_args[-1] is an unflagged duplicate
of caller_args[-1] (all other elements of callee_args match
caller_args).

Fixes [Bug #18625]
This commit is contained in:
Jeremy Evans 2022-03-11 13:49:36 -08:00 committed by Benoit Daloze
parent 5e7ebc7e6e
commit 752c3dad98
Notes: git 2022-04-05 18:42:23 +09:00 
Merged: https://github.com/ruby/ruby/pull/5684
2 changed files with 61 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
test/ruby/test_keyword.rb
View file

@ -190,6 +190,54 @@ class TestKeywordArguments < Test::Unit::TestCase
assert_equal(["bar", 111111], f[str: "bar", num: 111111])
end
def test_unset_hash_flag
bug18625 = "[ruby-core: 107847]"
singleton_class.class_eval do
ruby2_keywords def foo(*args)
args
end
def single(arg)
arg
end
def splat(*args)
args.last
end
def kwargs(**kw)
kw
end
end
h = { a: 1 }
args = foo(**h)
marked = args.last
assert_equal(true, Hash.ruby2_keywords_hash?(marked))
method_args = [args]
after_usage = single(*args)
assert_equal(h, after_usage)
assert_same(marked, args.last)
assert_not_same(marked, after_usage)
assert_equal(false, Hash.ruby2_keywords_hash?(after_usage))
after_usage = splat(*args)
assert_equal(h, after_usage)
assert_same(marked, args.last)
assert_not_same(marked, after_usage, bug18625)
assert_equal(false, Hash.ruby2_keywords_hash?(after_usage), bug18625)
after_usage = kwargs(*args)
assert_equal(h, after_usage)
assert_same(marked, args.last)
assert_not_same(marked, after_usage, bug18625)
assert_not_same(marked, after_usage)
assert_equal(false, Hash.ruby2_keywords_hash?(after_usage))
assert_equal(true, Hash.ruby2_keywords_hash?(marked))
end
def test_keyword_splat_new
kw = {}
h = {a: 1}

14
vm_args.c
View file

@ -468,7 +468,9 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
VALUE * const orig_sp = ec->cfp->sp;
unsigned int i;
VALUE flag_keyword_hash = 0;
VALUE splat_flagged_keyword_hash = 0;
VALUE converted_keyword_hash = 0;
VALUE rest_last = 0;
vm_check_canary(ec, orig_sp);
/*
@ -519,7 +521,6 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
}
if (vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) {
VALUE rest_last = 0;
int len;
args->rest = locals[--args->argc];
args->rest_index = 0;
@ -530,6 +531,7 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
if (!kw_flag && len > 0) {
if (RB_TYPE_P(rest_last, T_HASH) &&
(((struct RHash *)rest_last)->basic.flags & RHASH_PASS_AS_KEYWORDS)) {
splat_flagged_keyword_hash = rest_last;
rest_last = rb_hash_dup(rest_last);
kw_flag |= VM_CALL_KW_SPLAT | VM_CALL_KW_SPLAT_MUT;
}
@ -658,6 +660,16 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
if (ISEQ_BODY(iseq)->param.flags.has_rest) {
args_setup_rest_parameter(args, locals + ISEQ_BODY(iseq)->param.rest_start);
VALUE ary = *(locals + ISEQ_BODY(iseq)->param.rest_start);
VALUE index = RARRAY_LEN(ary) - 1;
if (splat_flagged_keyword_hash &&
!ISEQ_BODY(iseq)->param.flags.ruby2_keywords &&
!ISEQ_BODY(iseq)->param.flags.has_kw &&
!ISEQ_BODY(iseq)->param.flags.has_kwrest &&
RARRAY_AREF(ary, index) == splat_flagged_keyword_hash) {
((struct RHash *)rest_last)->basic.flags &= ~RHASH_PASS_AS_KEYWORDS;
RARRAY_ASET(ary, index, rest_last);
}
}
if (ISEQ_BODY(iseq)->param.flags.has_kw) {