summaryrefslogtreecommitdiffhomepage
path: root/src/vm.c
diff options
context:
space:
mode:
authorDaniel Bovensiepen <[email protected]>2013-08-01 15:17:34 +0800
committerDaniel Bovensiepen <[email protected]>2013-08-01 15:17:34 +0800
commit16a162ec45c8ad7827e4c771c35782a9bf9a320c (patch)
treeb37ecec53147d4bee632dfbad369650f6818e18d /src/vm.c
parent6f95cd36bbec2b5b6ed9439178c27b8196a21e4e (diff)
parentd16edc11ca9b4754a79f0fb4f481c3bd46077bac (diff)
downloadmruby-16a162ec45c8ad7827e4c771c35782a9bf9a320c.tar.gz
mruby-16a162ec45c8ad7827e4c771c35782a9bf9a320c.zip
Merge remote-tracking branch 'upstream/master' into lang-doc
Diffstat (limited to 'src/vm.c')
-rw-r--r--src/vm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm.c b/src/vm.c
index 3cdf57551..4d99ad413 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -386,9 +386,9 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr
if (MRB_PROC_CFUNC_P(p)) {
int ai = mrb_gc_arena_save(mrb);
val = p->body.func(mrb, self);
- mrb_gc_arena_restore(mrb, ai);
mrb->c->stack = mrb->c->stbase + mrb->c->ci->stackidx;
cipop(mrb);
+ mrb_gc_arena_restore(mrb, ai);
}
else {
val = mrb_run(mrb, p, self);