ruby-changes:37992
From: ko1 <ko1@a...>
Date: Tue, 24 Mar 2015 19:12:43 +0900 (JST)
Subject: [ruby-changes:37992] ko1:r50073 (trunk): * gc.c (gc_writebarrier_generational): fix messages for rb_bug().
ko1 2015-03-24 19:12:24 +0900 (Tue, 24 Mar 2015) New Revision: 50073 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50073 Log: * gc.c (gc_writebarrier_generational): fix messages for rb_bug(). Remove `rb_' prefix. * gc.c (gc_writebarrier_incremental): ditto. Modified files: trunk/ChangeLog trunk/gc.c Index: ChangeLog =================================================================== --- ChangeLog (revision 50072) +++ ChangeLog (revision 50073) @@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Tue Mar 24 19:10:24 2015 Koichi Sasada <ko1@a...> + + * gc.c (gc_writebarrier_generational): fix messages for rb_bug(). + Remove `rb_' prefix. + + * gc.c (gc_writebarrier_incremental): ditto. + Tue Mar 24 17:34:01 2015 Shugo Maeda <shugo@r...> * README.ja.md: should be chunibyo. Index: gc.c =================================================================== --- gc.c (revision 50072) +++ gc.c (revision 50073) @@ -5536,14 +5536,14 @@ gc_writebarrier_generational(rb_objspace https://github.com/ruby/ruby/blob/trunk/gc.c#L5536 if (RGENGC_CHECK_MODE) { if (!RVALUE_OLD_P(a)) rb_bug("gc_writebarrier_generational: %s is not an old object.", obj_info(a)); if ( RVALUE_OLD_P(b)) rb_bug("gc_writebarrier_generational: %s is an old object.", obj_info(b)); - if (is_incremental_marking(objspace)) rb_bug("rb_gc_writebarrier_generational: called while incremental marking: %s -> %s", obj_info(a), obj_info(b)); + if (is_incremental_marking(objspace)) rb_bug("gc_writebarrier_generational: called while incremental marking: %s -> %s", obj_info(a), obj_info(b)); } #if 1 /* mark `a' and remember (default behaviour) */ if (!rgengc_remembered(objspace, a)) { rgengc_remember(objspace, a); - gc_report(1, objspace, "rb_gc_writebarrier_generational: %s (remembered) -> %s\n", obj_info(a), obj_info(b)); + gc_report(1, objspace, "gc_writebarrier_generational: %s (remembered) -> %s\n", obj_info(a), obj_info(b)); } #else /* mark `b' and remember */ @@ -5579,18 +5579,18 @@ NOINLINE(static void gc_writebarrier_inc https://github.com/ruby/ruby/blob/trunk/gc.c#L5579 static void gc_writebarrier_incremental(rb_objspace_t *objspace, VALUE a, VALUE b) { - gc_report(2, objspace, "rb_gc_writebarrier_incremental: [LG] %s -> %s\n", obj_info(a), obj_info(b)); + gc_report(2, objspace, "gc_writebarrier_incremental: [LG] %s -> %s\n", obj_info(a), obj_info(b)); if (RVALUE_BLACK_P(a)) { if (RVALUE_WHITE_P(b)) { if (!RVALUE_WB_UNPROTECTED(a)) { - gc_report(2, objspace, "rb_gc_writebarrier_incremental: [IN] %s -> %s\n", obj_info(a), obj_info(b)); + gc_report(2, objspace, "gc_writebarrier_incremental: [IN] %s -> %s\n", obj_info(a), obj_info(b)); gc_mark_from(objspace, b, a); } } else if (RVALUE_OLD_P(a) && !RVALUE_OLD_P(b)) { if (!RVALUE_WB_UNPROTECTED(b)) { - gc_report(1, objspace, "rb_gc_writebarrier_incremental: [GN] %s -> %s\n", obj_info(a), obj_info(b)); + gc_report(1, objspace, "gc_writebarrier_incremental: [GN] %s -> %s\n", obj_info(a), obj_info(b)); RVALUE_AGE_SET_OLD(objspace, b); if (RVALUE_BLACK_P(b)) { @@ -5598,7 +5598,7 @@ gc_writebarrier_incremental(rb_objspace_ https://github.com/ruby/ruby/blob/trunk/gc.c#L5598 } } else { - gc_report(1, objspace, "rb_gc_writebarrier_incremental: [LL] %s -> %s\n", obj_info(a), obj_info(b)); + gc_report(1, objspace, "gc_writebarrier_incremental: [LL] %s -> %s\n", obj_info(a), obj_info(b)); gc_remember_unprotected(objspace, b); } } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/