merges r28123 from trunk into ruby_1_9_2.

--
* compile.c (iseq_compile_each): should consider block on stack,
  if block argument is passed.  [ruby-core:30534]

* parse.c (arg_concat_gen): should append to nd_head, not to
  nd_iter for NODE_BLOCK_PASS.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 0 deletions

diff --git a/insns.def b/insns.def
index f75007dca2..34cbaa4d35 100644
--- a/insns.def
+++ b/insns.def
@@ -498,6 +498,7 @@ concatarray
 (VALUE ary1, VALUE ary2st)
 (VALUE ary)
 {
+    const VALUE *sp = GET_SP();
     const VALUE ary2 = ary2st;
     VALUE tmp1 = rb_check_convert_type(ary1, T_ARRAY, "Array", "to_a");
     VALUE tmp2 = rb_check_convert_type(ary2, T_ARRAY, "Array", "to_a");