merges r20748 from trunk into ruby_1_9_1.

* vm_insnhelper.c (vm_callee_setup_arg_complex): uses cfp from
  blockptr instead of the current cfp.  [ruby-core:20544]

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

1 files changed, 18 insertions, 0 deletions

diff --git a/bootstraptest/test_block.rb b/bootstraptest/test_block.rb
index 2db149063e..ce7f00b033 100644
--- a/bootstraptest/test_block.rb
+++ b/bootstraptest/test_block.rb
@@ -487,6 +487,24 @@ assert_equal 'ok', %q{
 }, '[ruby-talk:266422]'
 
 assert_equal 'ok', %q{
+  class C
+    define_method(:xyz) do |o, k, &block|
+      block.call(o, k)
+    end
+  end
+  C.new.xyz("o","k") {|o, k| o+k}
+}, '[ruby-core:20544]'
+
+assert_equal 'ok', %q{
+  class C
+    define_method(:xyz) do |*args, &block|
+      block.call(*args)
+    end
+  end
+  C.new.xyz("o","k") {|*args| args.join("")}
+}, '[ruby-core:20544]'
+
+assert_equal 'ok', %q{
   STDERR.reopen(STDOUT)
   class C
     define_method(:foo) do |&block|