[Guile-commits] 206/423: Fix unused API, outdated assertion

[Andy Wingo]

wingo pushed a commit to branch wip-whippet
in repository guile.

commit 9ce8ee2921ac8c093c66690835605fbe33f02828
Author: Andy Wingo <wi...@igalia.com>
AuthorDate: Tue Oct 17 21:45:06 2023 +0200

    Fix unused API, outdated assertion
---
 api/gc-api.h  | 6 ------
 src/whippet.c | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/api/gc-api.h b/api/gc-api.h
index f4d053c47..c66959321 100644
--- a/api/gc-api.h
+++ b/api/gc-api.h
@@ -179,12 +179,6 @@ static inline void* gc_allocate(struct gc_mutator *mut, 
size_t size) {
 // FIXME: remove :P
 GC_API_ void* gc_allocate_pointerless(struct gc_mutator *mut, size_t bytes);
 
-static inline void gc_small_write_barrier(struct gc_ref obj, struct gc_edge 
edge,
-                                          struct gc_ref new_val) 
GC_ALWAYS_INLINE;
-static inline void gc_small_write_barrier(struct gc_ref obj, struct gc_edge 
edge,
-                                          struct gc_ref new_val) {
-}
-
 GC_API_ void gc_write_barrier_extern(struct gc_ref obj, size_t obj_size,
                                      struct gc_edge edge, struct gc_ref 
new_val) GC_NEVER_INLINE;
 
diff --git a/src/whippet.c b/src/whippet.c
index 7b4b90f41..4146eb88e 100644
--- a/src/whippet.c
+++ b/src/whippet.c
@@ -2386,8 +2386,8 @@ int gc_init(const struct gc_options *options, struct 
gc_stack_addr *stack_base,
   GC_ASSERT_EQ(gc_allocator_alloc_table_begin_pattern(), METADATA_BYTE_YOUNG);
   GC_ASSERT_EQ(gc_allocator_alloc_table_end_pattern(), METADATA_BYTE_END);
   if (GC_GENERATIONAL) {
-    GC_ASSERT_EQ(gc_small_write_barrier_card_table_alignment(), SLAB_SIZE);
-    GC_ASSERT_EQ(gc_small_write_barrier_card_size(),
+    GC_ASSERT_EQ(gc_write_barrier_card_table_alignment(), SLAB_SIZE);
+    GC_ASSERT_EQ(gc_write_barrier_card_size(),
                  BLOCK_SIZE / REMSET_BYTES_PER_BLOCK);
   }