From c7005118880ceeff65b300479317ca8387ec1246 Mon Sep 17 00:00:00 2001 From: ko1 Date: Fri, 13 Dec 2013 03:02:03 +0000 Subject: * gc.c (garbage_collect_body): use rb_bug() and explicit error message instead of using assert(). [Bug #9222] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- gc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gc.c') diff --git a/gc.c b/gc.c index d74056bbb2..5eb60e1e96 100644 --- a/gc.c +++ b/gc.c @@ -4940,6 +4940,7 @@ garbage_collect_body(rb_objspace_t *objspace, int full_mark, int immediate_sweep objspace->profile.count++; objspace->profile.latest_gc_info = reason; + gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_START, 0 /* TODO: pass minor/immediate flag? */); objspace->profile.total_allocated_object_num_at_gc_start = objspace->profile.total_allocated_object_num; @@ -4948,7 +4949,9 @@ garbage_collect_body(rb_objspace_t *objspace, int full_mark, int immediate_sweep gc_prof_setup_new_record(objspace, reason); gc_prof_timer_start(objspace); { - assert(during_gc > 0); + if (during_gc == 0) { + rb_bug("during_gc should not be 0. RUBY_INTERNAL_EVENT_GC_START user should not cause GC in events."); + } gc_marks(objspace, full_mark); gc_sweep(objspace, immediate_sweep); during_gc = 0; -- cgit v1.2.3