* compile.c (iseq_set_arguments), insnhelper.ci

  (vm_callee_setup_arg, vm_yield_setup_args): fix
  block parameter problems. [ruby-dev:31437], [ruby-dev:31440]
* bootstraptest/test_block.rb: add a test of [ruby-dev:31440].



git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 5 deletions

diff --git a/compile.c b/compile.c
index 52fae34d5..6f655c3bd 100644
--- a/compile.c
+++ b/compile.c
@@ -881,7 +881,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 	    /* set arg_size: size of arguments */
 	    if (iseq->arg_block != -1) {
 		iseq->arg_size = iseq->arg_block + 1;
-	}
+	    }
 	    else if (iseq->arg_post_len) {
 		iseq->arg_size = iseq->arg_post_start + iseq->arg_post_len;
 	    }
@@ -891,7 +891,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 	    else if (iseq->arg_opts) {
 		iseq->arg_size = iseq->argc + iseq->arg_opts - 1;
 	    }
-	else {
+	    else {
 		iseq->arg_size = iseq->argc;
 	    }
 	}
@@ -901,9 +901,11 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 	}
 
 	if (iseq->type == ISEQ_TYPE_BLOCK) {
-	    if (iseq->argc == 1 && iseq->arg_simple == 1 && last_comma == 0) {
-		/* {|a|} */
-		iseq->arg_simple = 2;
+	    if (iseq->arg_opts == 0 && iseq->arg_post_len == 0 && iseq->arg_rest == -1) {
+		if (iseq->argc == 1 && last_comma == 0) {
+		    /* {|a|} */
+		    iseq->arg_simple = 2;
+		}
 	    }
 	}
     }