2 files changed, 42 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 9893d1e813..b2c2af8f28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 27 07:11:00 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c (iseq_calc_param_size): hoist out of iseq_set_arguments
+
 Wed Nov 26 22:28:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/ruby.h (rb_get_kwargs, rb_extract_keywords): export
diff --git a/compile.c b/compile.c
index 5f68113357..6b3f49ad2f 100644
--- a/compile.c
+++ b/compile.c
@@ -1120,6 +1120,43 @@ get_dyna_var_idx(rb_iseq_t *iseq, ID id, int *level, int *ls)
     return idx;
 }
 
+static void
+iseq_calc_param_size(rb_iseq_t *iseq)
+{
+    if (iseq->param.flags.has_opt ||
+	iseq->param.flags.has_post ||
+	iseq->param.flags.has_rest ||
+	iseq->param.flags.has_block ||
+	iseq->param.flags.has_kw ||
+	iseq->param.flags.has_kwrest) {
+
+	if (iseq->param.flags.has_block) {
+	    iseq->param.size = iseq->param.block_start + 1;
+	}
+	else if (iseq->param.flags.has_kwrest) {
+	    iseq->param.size = iseq->param.keyword->rest_start + 1;
+	}
+	else if (iseq->param.flags.has_kw) {
+	    iseq->param.size = iseq->param.keyword->bits_start + 1;
+	}
+	else if (iseq->param.flags.has_post) {
+	    iseq->param.size = iseq->param.post_start + iseq->param.post_num;
+	}
+	else if (iseq->param.flags.has_rest) {
+	    iseq->param.size = iseq->param.rest_start + 1;
+	}
+	else if (iseq->param.flags.has_opt) {
+	    iseq->param.size = iseq->param.lead_num + iseq->param.opt_num;
+	}
+	else {
+	    rb_bug("unreachable");
+	}
+    }
+    else {
+	iseq->param.size = iseq->param.lead_num;
+    }
+}
+
 static int
 iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 {
@@ -1267,38 +1304,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 	    iseq->param.flags.has_block = TRUE;
 	}
 
-	if (iseq->param.flags.has_opt ||
-	    iseq->param.flags.has_post ||
-	    iseq->param.flags.has_rest ||
-	    iseq->param.flags.has_block ||
-	    iseq->param.flags.has_kw ||
-	    iseq->param.flags.has_kwrest) {
-
-	    if (iseq->param.flags.has_block) {
-		iseq->param.size = iseq->param.block_start + 1;
-	    }
-	    else if (iseq->param.flags.has_kwrest) {
-		iseq->param.size = iseq->param.keyword->rest_start + 1;
-	    }
-	    else if (iseq->param.flags.has_kw) {
-		iseq->param.size = iseq->param.keyword->bits_start + 1;
-	    }
-	    else if (iseq->param.flags.has_post) {
-		iseq->param.size = iseq->param.post_start + iseq->param.post_num;
-	    }
-	    else if (iseq->param.flags.has_rest) {
-		iseq->param.size = iseq->param.rest_start + 1;
-	    }
-	    else if (iseq->param.flags.has_opt) {
-		iseq->param.size = iseq->param.lead_num + iseq->param.opt_num;
-	    }
-	    else {
-		rb_bug("unreachable");
-	    }
-	}
-	else {
-	    iseq->param.size = iseq->param.lead_num;
-	}
+	iseq_calc_param_size(iseq);
 
 	if (iseq->type == ISEQ_TYPE_BLOCK) {
 	    if (iseq->param.flags.has_opt    == FALSE &&