Skip to content

Commit 4111c54

Browse files
peterzhu2118matzbot
authored andcommitted
[ruby/mmtk] Replace RUBY_ASSERT with MMTK_ASSERT
ruby/mmtk@e92baf15ef
1 parent b536c6a commit 4111c54

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

gc/mmtk/mmtk.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,8 @@ rb_mmtk_vm_live_bytes(void)
348348
static void
349349
make_final_job(struct objspace *objspace, VALUE obj, VALUE table)
350350
{
351-
RUBY_ASSERT(RB_FL_TEST(obj, RUBY_FL_FINALIZE));
352-
RUBY_ASSERT(mmtk_is_reachable((MMTk_ObjectReference)table));
353-
RUBY_ASSERT(RB_BUILTIN_TYPE(table) == T_ARRAY);
351+
MMTK_ASSERT(RB_FL_TEST(obj, RUBY_FL_FINALIZE));
352+
MMTK_ASSERT(RB_BUILTIN_TYPE(table) == T_ARRAY);
354353

355354
RB_FL_UNSET(obj, RUBY_FL_FINALIZE);
356355

@@ -365,9 +364,9 @@ make_final_job(struct objspace *objspace, VALUE obj, VALUE table)
365364
static int
366365
rb_mmtk_update_finalizer_table_i(st_data_t key, st_data_t value, st_data_t data, int error)
367366
{
368-
RUBY_ASSERT(RB_FL_TEST(key, RUBY_FL_FINALIZE));
369-
RUBY_ASSERT(mmtk_is_reachable((MMTk_ObjectReference)value));
370-
RUBY_ASSERT(RB_BUILTIN_TYPE(value) == T_ARRAY);
367+
MMTK_ASSERT(RB_FL_TEST(key, RUBY_FL_FINALIZE));
368+
MMTK_ASSERT(mmtk_is_reachable((MMTk_ObjectReference)value));
369+
MMTK_ASSERT(RB_BUILTIN_TYPE(value) == T_ARRAY);
371370

372371
struct objspace *objspace = (struct objspace *)data;
373372

@@ -445,7 +444,7 @@ rb_mmtk_update_global_tables_replace_i(VALUE *ptr, void *data)
445444
static void
446445
rb_mmtk_update_global_tables(int table)
447446
{
448-
RUBY_ASSERT(table < RB_GC_VM_WEAK_TABLE_COUNT);
447+
MMTK_ASSERT(table < RB_GC_VM_WEAK_TABLE_COUNT);
449448

450449
// TODO: set weak_only to true for non-moving GC
451450
rb_gc_vm_weak_table_foreach(
@@ -606,7 +605,7 @@ rb_gc_impl_ractor_cache_free(void *objspace_ptr, void *cache_ptr)
606605

607606
ccan_list_del(&cache->list_node);
608607

609-
RUBY_ASSERT(objspace->live_ractor_cache_count > 1);
608+
MMTK_ASSERT(objspace->live_ractor_cache_count > 1);
610609
objspace->live_ractor_cache_count--;
611610

612611
mmtk_destroy_mutator(cache->mutator);
@@ -1502,7 +1501,7 @@ rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
15021501
size_t n = 0;
15031502

15041503
#define SET_ENTRY(na, v) do { \
1505-
RUBY_ASSERT(n <= RB_GC_OBJECT_METADATA_ENTRY_COUNT); \
1504+
MMTK_ASSERT(n <= RB_GC_OBJECT_METADATA_ENTRY_COUNT); \
15061505
object_metadata_entries[n].name = ID_##na; \
15071506
object_metadata_entries[n].val = v; \
15081507
n++; \

0 commit comments

Comments
 (0)