summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/vm.c5
-rw-r--r--test/t/bs_block.rb8
2 files changed, 12 insertions, 1 deletions
diff --git a/src/vm.c b/src/vm.c
index 8ae28ef5e..696b566c8 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1121,6 +1121,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
}
else {
if (argv0 != argv) {
+ regs[len+1] = *blk; /* move block */
memmove(&regs[1], argv, sizeof(mrb_value)*(m1+o)); /* m1 + o */
}
if (r) { /* r */
@@ -1129,7 +1130,9 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
if (m2) {
memmove(&regs[m1+o+r+1], &argv[argc-m2], sizeof(mrb_value)*m2);
}
- regs[len+1] = *blk; /* move block */
+ if (argv0 == argv) {
+ regs[len+1] = *blk; /* move block */
+ }
pc += o + 1;
}
JUMP;
diff --git a/test/t/bs_block.rb b/test/t/bs_block.rb
index 4bfdc304a..10313908b 100644
--- a/test/t/bs_block.rb
+++ b/test/t/bs_block.rb
@@ -332,6 +332,14 @@ assert('BS Block [ruby-dev:31160]') do
m {|(v,(*))|} == nil
end
+assert('BS Block [issue #750]') do
+ def m(a, *b)
+ yield
+ end
+ args = [1, 2, 3]
+ m(*args){ 1 } == 1
+end
+
assert('BS Block 31') do
def m()
yield