summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-28 07:06:06 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-28 07:06:06 +0000
commit1f4efb9aedfb8f537630f7c13e431bb230bebd31 (patch)
treed7216e0981d100da40540800bdd38d6ac7e73a50
parent715666cc28d441862778000c56a807c9b4c28d00 (diff)
rest parameter optimization [Feature #15010]
* vm_args.c: rb_ary_dup(args->rest) to be used at most once during parameter setup. [Feature #15010] A patch by chopraanmol1 (Anmol Chopra) <chopraanmol1@gmail.com>. * array.c (rb_ary_behead): added to remove first n elements. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--array.c13
-rw-r--r--internal.h1
-rw-r--r--vm_args.c31
3 files changed, 36 insertions, 9 deletions
diff --git a/array.c b/array.c
index c9bf765..3c84a7b 100644
--- a/array.c
+++ b/array.c
@@ -1076,6 +1076,17 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
rb_ary_modify_check(ary);
result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
n = RARRAY_LEN(result);
+ rb_ary_behead(ary,n);
+
+ return result;
+}
+
+MJIT_FUNC_EXPORTED VALUE
+rb_ary_behead(VALUE ary, long n)
+{
+ if(n<=0) return ary;
+
+ rb_ary_modify_check(ary);
if (ARY_SHARED_P(ary)) {
if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) {
setup_occupied_shared:
@@ -1096,7 +1107,7 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
}
ARY_INCREASE_LEN(ary, -n);
- return result;
+ return ary;
}
static VALUE
diff --git a/internal.h b/internal.h
index de62de1..ea1b926 100644
--- a/internal.h
+++ b/internal.h
@@ -1087,6 +1087,7 @@ size_t rb_ary_memsize(VALUE);
VALUE rb_to_array_type(VALUE obj);
VALUE rb_check_to_array(VALUE ary);
VALUE rb_ary_tmp_new_from_values(VALUE, long, const VALUE *);
+VALUE rb_ary_behead(VALUE, long);
#if defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO)
#define rb_ary_new_from_args(n, ...) \
__extension__ ({ \
diff --git a/vm_args.c b/vm_args.c
index 12e6e70..4e98957 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -22,6 +22,7 @@ struct args_info {
/* additional args info */
int rest_index;
+ int rest_dupped;
const struct rb_call_info_kw_arg *kw_arg;
VALUE *kw_argv;
VALUE rest;
@@ -32,6 +33,15 @@ enum arg_setup_type {
arg_setup_block
};
+static inline void
+arg_rest_dup(struct args_info *args)
+{
+ if(!args->rest_dupped) {
+ args->rest = rb_ary_dup(args->rest);
+ args->rest_dupped = TRUE;
+ }
+}
+
static inline int
args_argc(struct args_info *args)
{
@@ -49,7 +59,7 @@ args_extend(struct args_info *args, const int min_argc)
int i;
if (args->rest) {
- args->rest = rb_ary_dup(args->rest);
+ arg_rest_dup(args);
VM_ASSERT(args->rest_index == 0);
for (i=args->argc + RARRAY_LENINT(args->rest); i<min_argc; i++) {
rb_ary_push(args->rest, Qnil);
@@ -69,7 +79,7 @@ args_reduce(struct args_info *args, int over_argc)
const long len = RARRAY_LEN(args->rest);
if (len > over_argc) {
- args->rest = rb_ary_dup(args->rest);
+ arg_rest_dup(args);
rb_ary_resize(args->rest, len - over_argc);
return;
}
@@ -114,7 +124,7 @@ args_copy(struct args_info *args)
if (args->rest != Qfalse) {
int argc = args->argc;
args->argc = 0;
- args->rest = rb_ary_dup(args->rest); /* make dup */
+ arg_rest_dup(args);
/*
* argv: [m0, m1, m2, m3]
@@ -146,6 +156,7 @@ args_copy(struct args_info *args)
else if (args->argc > 0) {
args->rest = rb_ary_new_from_values(args->argc, args->argv);
args->rest_index = 0;
+ args->rest_dupped = TRUE;
args->argc = 0;
}
}
@@ -162,7 +173,8 @@ args_rest_array(struct args_info *args)
VALUE ary;
if (args->rest) {
- ary = rb_ary_subseq(args->rest, args->rest_index, RARRAY_LEN(args->rest) - args->rest_index);
+ ary = rb_ary_behead(args->rest, args->rest_index);
+ args->rest_index = 0;
args->rest = 0;
}
else {
@@ -219,7 +231,7 @@ args_pop_keyword_hash(struct args_info *args, VALUE *kw_hash_ptr)
RARRAY_ASET(args->rest, len - 1, rest_hash);
}
else {
- args->rest = rb_ary_dup(args->rest);
+ arg_rest_dup(args);
rb_ary_pop(args->rest);
return TRUE;
}
@@ -269,7 +281,7 @@ args_stored_kw_argv_to_hash(struct args_info *args)
args->kw_argv = NULL;
if (args->rest) {
- args->rest = rb_ary_dup(args->rest);
+ arg_rest_dup(args);
rb_ary_push(args->rest, h);
}
else {
@@ -301,7 +313,6 @@ static inline void
args_setup_post_parameters(struct args_info *args, int argc, VALUE *locals)
{
long len;
- args_copy(args);
len = RARRAY_LEN(args->rest);
MEMCPY(locals, RARRAY_CONST_PTR(args->rest) + len - argc, VALUE, argc);
rb_ary_resize(args->rest, len - argc);
@@ -343,7 +354,6 @@ args_setup_opt_parameters(struct args_info *args, int opt_max, VALUE *locals)
static inline void
args_setup_rest_parameter(struct args_info *args, VALUE *locals)
{
- args_copy(args);
*locals = args_rest_array(args);
}
@@ -538,6 +548,7 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
args = &args_body;
given_argc = args->argc = calling->argc;
args->argv = locals;
+ args->rest_dupped = FALSE;
if (ci->flag & VM_CALL_KWARG) {
args->kw_arg = ((struct rb_call_info_with_kwarg *)ci)->kw_arg;
@@ -628,6 +639,10 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
args_setup_lead_parameters(args, iseq->body->param.lead_num, locals + 0);
}
+ if (iseq->body->param.flags.has_rest || iseq->body->param.flags.has_post){
+ args_copy(args);
+ }
+
if (iseq->body->param.flags.has_post) {
args_setup_post_parameters(args, iseq->body->param.post_num, locals + iseq->body->param.post_start);
}