summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-09 14:57:15 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-09 14:57:15 +0000
commit9eecfd5c2f051088c1d6267deb1dfac172458a7f (patch)
tree162217273a1a1e420769bbcf1d51477705c1f265 /gc.c
parent514878d15c2be3590a73b458515037f8fe32f8c8 (diff)
merge revision(s) 43092: [Backport #8969]
* gc.c (rb_gc_disable): do rest_sweep() before disable GC. This fix may solve a failure of TestTracepointObj#test_tracks_objspace_events [test/-ext-/tracepoint/test_tracepoint.rb:43]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gc.c b/gc.c
index 88ce849bdf..4a2864ee70 100644
--- a/gc.c
+++ b/gc.c
@@ -3285,6 +3285,8 @@ rb_gc_disable(void)
rb_objspace_t *objspace = &rb_objspace;
int old = dont_gc;
+ rest_sweep(objspace);
+
dont_gc = TRUE;
return old ? Qtrue : Qfalse;
}