summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro Matz Matsumoto <[email protected]>2013-01-18 18:11:01 +0900
committerYukihiro Matz Matsumoto <[email protected]>2013-01-18 18:11:01 +0900
commit583983385b81c21f82704b116eab52d606a609f4 (patch)
treee8ea1fd2f22bb0e748d01d1442980d3004638c62 /src
parentc9c758d6ede1f99fa5c4bd20b26f4bce0b88c84e (diff)
parent24c57255622139669159122c9631815f57f2f2d6 (diff)
downloadmruby-583983385b81c21f82704b116eab52d606a609f4.tar.gz
mruby-583983385b81c21f82704b116eab52d606a609f4.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src')
-rw-r--r--src/gc.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gc.c b/src/gc.c
index 69e36640d..1833bf984 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -1143,13 +1143,8 @@ static void
change_gen_gc_mode(mrb_state *mrb, mrb_int enable)
{
if (is_generational(mrb) && !enable) {
- if (is_major_gc(mrb)) {
- advance_phase(mrb, GC_STATE_NONE);
- }
- else {
- clear_all_old(mrb);
- gc_assert(mrb->gc_state == GC_STATE_NONE);
- }
+ clear_all_old(mrb);
+ gc_assert(mrb->gc_state == GC_STATE_NONE);
mrb->gc_full = FALSE;
}
else if (!is_generational(mrb) && enable) {