From ce3c9a34379015473ad6559e75c59e93159894e5 Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Wed, 18 Nov 2020 18:04:09 +0000 Subject: Fix USE_TRANSIENT_HEAP macro usage in hash.c Additionally fix some typos in transient heap. --- hash.c | 2 +- transient_heap.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hash.c b/hash.c index e0f8773b64..f951d59e96 100644 --- a/hash.c +++ b/hash.c @@ -532,7 +532,7 @@ hash_verify_(VALUE hash, const char *file, int line) HASH_ASSERT(RHASH_AR_TABLE_BOUND_RAW(hash) == 0); } -#if USE_TRANSIENT_HEP +#if USE_TRANSIENT_HEAP if (RHASH_TRANSIENT_P(hash)) { volatile st_data_t MAYBE_UNUSED(key) = RHASH_AR_TABLE_REF(hash, 0)->key; /* read */ HASH_ASSERT(RHASH_AR_TABLE(hash) != NULL); diff --git a/transient_heap.c b/transient_heap.c index 9441aa8d7f..501876d704 100644 --- a/transient_heap.c +++ b/transient_heap.c @@ -154,7 +154,7 @@ transient_heap_dump(struct transient_heap* theap) transient_heap_blocks_dump(theap, theap->free_blocks, "free_blocks"); } -/* Debug: dump all tarnsient_heap blocks */ +/* Debug: dump all transient_heap blocks */ void rb_transient_heap_dump(void) { @@ -718,7 +718,7 @@ transient_heap_block_evacuate(struct transient_heap* theap, struct transient_hea asan_unpoison_memory_region(header, sizeof *header, true); VALUE obj = header->obj; TH_ASSERT(header->magic == TRANSIENT_HEAP_ALLOC_MAGIC); - if (header->magic != TRANSIENT_HEAP_ALLOC_MAGIC) rb_bug("rb_transient_heap_mark: wrong header %s\n", rb_obj_info(obj)); + if (header->magic != TRANSIENT_HEAP_ALLOC_MAGIC) rb_bug("transient_heap_block_evacuate: wrong header %p %s\n", (void *)header, rb_obj_info(obj)); if (TRANSIENT_HEAP_DEBUG >= 3) fprintf(stderr, " * transient_heap_block_evacuate %p %s\n", (void *)header, rb_obj_info(obj)); @@ -739,7 +739,7 @@ transient_heap_block_evacuate(struct transient_heap* theap, struct transient_hea rb_hash_transient_heap_evacuate(obj, !TRANSIENT_HEAP_DEBUG_DONT_PROMOTE); break; default: - rb_bug("unsupporeted: %s\n", rb_obj_info(obj)); + rb_bug("unsupported: %s\n", rb_obj_info(obj)); } header->obj = Qundef; /* for debug */ } @@ -912,7 +912,7 @@ rb_transient_heap_start_marking(int full_marking) struct transient_heap* theap = transient_heap_get(); - if (TRANSIENT_HEAP_DEBUG >= 1) fprintf(stderr, "!! rb_transient_heap_start_marking objects:%d blocks:%d promtoed:%d full_marking:%d\n", + if (TRANSIENT_HEAP_DEBUG >= 1) fprintf(stderr, "!! rb_transient_heap_start_marking objects:%d blocks:%d promoted:%d full_marking:%d\n", theap->total_objects, theap->total_blocks, theap->promoted_objects_index, full_marking); if (TRANSIENT_HEAP_DEBUG >= 2) transient_heap_dump(theap); -- cgit v1.2.3