1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fetch the last element only when not empty

Browse Source 
Also `flag_keyword_hash` sets to 0 or a hash object.
This commit is contained in:
Nobuyoshi Nakada 2023-08-04 13:50:07 +09:00
parent 0dc0c24cad
commit 48f0352280
Notes: git 2023-08-04 12:00:05 +00:00 
Merged: https://github.com/ruby/ruby/pull/8173
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vm_args.c
View File

@ -560,11 +560,10 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
args->rest = locals[--args->argc]; args->rest = locals[--args->argc];
int len = RARRAY_LENINT(args->rest); int len = RARRAY_LENINT(args->rest);
given_argc += len - 1; given_argc += len - 1;
rest_last = RARRAY_AREF(args->rest, len - 1);
if (!kw_flag && len > 0) { if (!kw_flag && len > 0) {
if (RB_TYPE_P(rest_last, T_HASH) && rest_last = RARRAY_AREF(args->rest, len - 1);
(((struct RHash *)rest_last)->basic.flags & RHASH_PASS_AS_KEYWORDS)) { if (RB_TYPE_P(rest_last, T_HASH) && FL_TEST_RAW(rest_last, RHASH_PASS_AS_KEYWORDS)) {
// def f(**kw); a = [..., kw]; g(*a) // def f(**kw); a = [..., kw]; g(*a)
splat_flagged_keyword_hash = rest_last; splat_flagged_keyword_hash = rest_last;
rest_last = rb_hash_dup(rest_last); rest_last = rb_hash_dup(rest_last);
@ -595,9 +594,6 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
} }
} }
} }
else {
rest_last = 0;
}
} }
else { else {
args->rest = Qfalse; args->rest = Qfalse;
@ -628,8 +624,8 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
} }
} }
if (flag_keyword_hash && RB_TYPE_P(flag_keyword_hash, T_HASH)) { if (flag_keyword_hash) {
((struct RHash *)flag_keyword_hash)->basic.flags |= RHASH_PASS_AS_KEYWORDS; FL_SET_RAW(flag_keyword_hash, RHASH_PASS_AS_KEYWORDS);
} }
if (kw_flag && ISEQ_BODY(iseq)->param.flags.accepts_no_kwarg) { if (kw_flag && ISEQ_BODY(iseq)->param.flags.accepts_no_kwarg) {