Commit 2ef634ed authored by Kazuho Oku's avatar Kazuho Oku

do not destroy a page with an active TT_ENV (e.g. an env referred from TT_FIBER)

parent 7b968ca8
...@@ -741,11 +741,13 @@ obj_free(mrb_state *mrb, struct RBasic *obj) ...@@ -741,11 +741,13 @@ obj_free(mrb_state *mrb, struct RBasic *obj)
{ {
struct REnv *e = (struct REnv*)obj; struct REnv *e = (struct REnv*)obj;
if (!MRB_ENV_STACK_SHARED_P(e)) { if (MRB_ENV_STACK_SHARED_P(e)) {
/* cannot be freed */
return;
}
mrb_free(mrb, e->stack); mrb_free(mrb, e->stack);
e->stack = NULL; e->stack = NULL;
} }
}
break; break;
case MRB_TT_FIBER: case MRB_TT_FIBER:
...@@ -998,9 +1000,13 @@ incremental_sweep_phase(mrb_state *mrb, mrb_gc *gc, size_t limit) ...@@ -998,9 +1000,13 @@ incremental_sweep_phase(mrb_state *mrb, mrb_gc *gc, size_t limit)
if (is_dead(gc, &p->as.basic)) { if (is_dead(gc, &p->as.basic)) {
if (p->as.basic.tt != MRB_TT_FREE) { if (p->as.basic.tt != MRB_TT_FREE) {
obj_free(mrb, &p->as.basic); obj_free(mrb, &p->as.basic);
if (p->as.basic.tt == MRB_TT_FREE) {
p->as.free.next = page->freelist; p->as.free.next = page->freelist;
page->freelist = (struct RBasic*)p; page->freelist = (struct RBasic*)p;
freed++; freed++;
} else {
dead_slot = 0;
}
} }
} }
else { else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment