admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vm.c (cipop): use mrb_object_dead_p() to detect reclaimed block; #5791

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-09-25 22:42:09 +09:00
parent 993c8c1053
commit 0c475708de
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+7 -6
View File
@@ -406,18 +406,19 @@ static inline mrb_callinfo*
cipop(mrb_state *mrb)
{
struct mrb_context *c = mrb->c;
struct REnv *env = CI_ENV(c->ci);
mrb_callinfo *ci = c->ci;
struct REnv *env = CI_ENV(ci);
mrb_vm_ci_env_set(c->ci, NULL); // make possible to free by GC if env is not needed
struct RProc *b = c->ci->blk;
if (b && b->tt == MRB_TT_PROC && !MRB_PROC_STRICT_P(b) && MRB_PROC_ENV(b) == CI_ENV(&c->ci[-1])) {
mrb_vm_ci_env_set(ci, NULL); // make possible to free by GC if env is not needed
struct RProc *b = ci->blk;
if (b && !mrb_object_dead_p(mrb, (struct RBasic*)b) && b->tt == MRB_TT_PROC &&
!MRB_PROC_STRICT_P(b) && MRB_PROC_ENV(b) == CI_ENV(&ci[-1])) {
b->flags |= MRB_PROC_ORPHAN;
}
c->ci--; // exceptions are handled at the method caller; see #3087
if (env && !mrb_env_unshare(mrb, env, TRUE)) {
c->ci--; // exceptions are handled at the method caller; see #3087
mrb_exc_raise(mrb, mrb_obj_value(mrb->nomem_err));
}
c->ci--;
return c->ci;
}