1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* gc.c (garbage_collect_body): use rb_bug() and explicit error message

Browse Source 
instead of using assert().
  [Bug #9222]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2013-12-13 03:02:03 +00:00
parent 3477670963
commit c700511888
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Dec 13 12:01:07 2013 Koichi Sasada <ko1@atdot.net>
* gc.c (garbage_collect_body): use rb_bug() and explicit error message
instead of using assert().
[Bug #9222]
Fri Dec 13 11:52:41 2013 Koichi Sasada <ko1@atdot.net>
* array.c: fix comment to remove the word "shady".

5
gc.c
View File

@ -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;