Check if a block is a lambda before marking it orphan; ref #3640

mruby · Jun 3, 2017 · 935649b · 935649b
1 parent c041206
commit 935649b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/vm.c b/src/vm.c
@@ -1335,7 +1335,7 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
           if (mrb_type(blk) == MRB_TT_PROC) {
             struct RProc *p = mrb_proc_ptr(blk);
 
-            if (p && p->env == ci[-1].env) {
+            if (p && !MRB_PROC_STRICT_P(p) && p->env == ci[-1].env) {
               p->flags |= MRB_PROC_ORPHAN;
             }
           }
@@ -1775,7 +1775,8 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
         if (mrb_type(blk) == MRB_TT_PROC) {
           struct RProc *p = mrb_proc_ptr(blk);
 
-          if (ci > mrb->c->cibase && p->env == ci[-1].env) {
+          if (!MRB_PROC_STRICT_P(proc) &&
+              ci > mrb->c->cibase && p->env == ci[-1].env) {
             p->flags |= MRB_PROC_ORPHAN;
           }
         }