archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) fc33559c: [Backport #20570]

Browse source 
clear `kw_flag` if given hash is nil

	https://bugs.ruby-lang.org/issues/20570 is caused I missed to
	clear the `kw_flag` even if `keyword_hash` is nil.
This commit is contained in:
Takashi Kokubun 2024-07-08 16:08:42 -07:00
parent df8a08fb6a
commit 17e21d8155
3 changed files with 34 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/ruby/test_keyword.rb
View file

@ -4432,6 +4432,24 @@ class TestKeywordArgumentsSymProcRefinements < Test::Unit::TestCase
assert_equal({one: 1, two: 2}, f.call(one:, two:)) assert_equal({one: 1, two: 2}, f.call(one:, two:))
end end
def m_bug20570(*a, **nil)
a
end
def test_splat_arg_with_prohibited_keyword
assert_equal([], m_bug20570(*[]))
assert_equal([1], m_bug20570(*[1]))
assert_equal([1, 2], m_bug20570(*[1, 2]))
h = nil
assert_equal([], m_bug20570(*[], **h))
assert_equal([1], m_bug20570(*[1], **h))
assert_equal([1, 2], m_bug20570(*[1, 2], **h))
assert_equal([], m_bug20570(*[], **nil))
assert_equal([1], m_bug20570(*[1], **nil))
assert_equal([1, 2], m_bug20570(*[1, 2], **nil))
end
private def one private def one
1 1
end end

2
version.h
View file

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3 #define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 93 #define RUBY_PATCHLEVEL 94
#include "ruby/version.h" #include "ruby/version.h"
#include "ruby/internal/abi.h" #include "ruby/internal/abi.h"

19
vm_args.c
View file

@ -434,7 +434,10 @@ fill_keys_values(st_data_t key, st_data_t val, st_data_t ptr)
static inline int static inline int
ignore_keyword_hash_p(VALUE keyword_hash, const rb_iseq_t * const iseq, unsigned int * kw_flag, VALUE * converted_keyword_hash) ignore_keyword_hash_p(VALUE keyword_hash, const rb_iseq_t * const iseq, unsigned int * kw_flag, VALUE * converted_keyword_hash)
{ {
if (!RB_TYPE_P(keyword_hash, T_HASH)) { if (keyword_hash == Qnil) {
goto ignore;
}
else if (!RB_TYPE_P(keyword_hash, T_HASH)) {
keyword_hash = rb_to_hash_type(keyword_hash); keyword_hash = rb_to_hash_type(keyword_hash);
} }
@ -445,9 +448,17 @@ ignore_keyword_hash_p(VALUE keyword_hash, const rb_iseq_t * const iseq, unsigned
keyword_hash = rb_hash_dup(keyword_hash); keyword_hash = rb_hash_dup(keyword_hash);
} }
*converted_keyword_hash = keyword_hash; *converted_keyword_hash = keyword_hash;
return !(ISEQ_BODY(iseq)->param.flags.has_kw) &&
if (!(ISEQ_BODY(iseq)->param.flags.has_kw) &&
!(ISEQ_BODY(iseq)->param.flags.has_kwrest) && !(ISEQ_BODY(iseq)->param.flags.has_kwrest) &&
RHASH_EMPTY_P(keyword_hash); RHASH_EMPTY_P(keyword_hash)) {
ignore:
*kw_flag &= ~(VM_CALL_KW_SPLAT | VM_CALL_KW_SPLAT_MUT);
return 1;
}
else {
return 0;
}
} }
static VALUE static VALUE
@ -577,7 +588,6 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
arg_rest_dup(args); arg_rest_dup(args);
rb_ary_pop(args->rest); rb_ary_pop(args->rest);
given_argc--; given_argc--;
kw_flag &= ~(VM_CALL_KW_SPLAT | VM_CALL_KW_SPLAT_MUT);
} }
else { else {
if (rest_last != converted_keyword_hash) { if (rest_last != converted_keyword_hash) {
@ -608,7 +618,6 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
if (ignore_keyword_hash_p(last_arg, iseq, &kw_flag, &converted_keyword_hash)) { if (ignore_keyword_hash_p(last_arg, iseq, &kw_flag, &converted_keyword_hash)) {
args->argc--; args->argc--;
given_argc--; given_argc--;
kw_flag &= ~(VM_CALL_KW_SPLAT | VM_CALL_KW_SPLAT_MUT);
} }
else { else {
if (!(kw_flag & VM_CALL_KW_SPLAT_MUT)) { if (!(kw_flag & VM_CALL_KW_SPLAT_MUT)) {