Update RB_GC_OBJECT_METADATA_ENTRY_COUNT
#13179
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ko1
approved these changes
Apr 25, 2025
Well, it's data about the data, so metadata. That's how I understand it at least. |
|
Counting by hand doesn't sound a nice idea. diff --git i/gc/default/default.c w/gc/default/default.c
index 038a330e9ed..0073f123e44 100644
--- i/gc/default/default.c
+++ w/gc/default/default.c
@@ -6191,7 +6191,11 @@ rb_gc_impl_writebarrier_remember(void *objspace_ptr, VALUE obj)
}
}
-#define RB_GC_OBJECT_METADATA_ENTRY_COUNT 9
+struct rb_gc_object_metadata_names {
+ ID ID_wb_protected, ID_age, ID_old, ID_uncollectible, ID_marking, ID_marked, ID_pinned, ID_object_id, ID_shareable;
+};
+
+#define RB_GC_OBJECT_METADATA_ENTRY_COUNT (sizeof(struct rb_gc_object_metadata_names) / sizeof(ID))
static struct rb_gc_object_metadata_entry object_metadata_entries[RB_GC_OBJECT_METADATA_ENTRY_COUNT + 1];
struct rb_gc_object_metadata_entry *
@@ -6199,10 +6203,10 @@ rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
{
rb_objspace_t *objspace = objspace_ptr;
size_t n = 0;
- static ID ID_wb_protected, ID_age, ID_old, ID_uncollectible, ID_marking, ID_marked, ID_pinned, ID_object_id, ID_shareable;
+ static struct rb_gc_object_metadata_names names;
- if (!ID_marked) {
-#define I(s) ID_##s = rb_intern(#s);
+ if (!names.ID_marked) {
+#define I(s) names.ID_##s = rb_intern(#s)
I(wb_protected);
I(age);
I(old);
@@ -6217,7 +6221,7 @@ rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
#define SET_ENTRY(na, v) do { \
GC_ASSERT(n <= RB_GC_OBJECT_METADATA_ENTRY_COUNT); \
- object_metadata_entries[n].name = ID_##na; \
+ object_metadata_entries[n].name = names.ID_##na; \
object_metadata_entries[n].val = v; \
n++; \
} while (0) |
You mean a bad idea? Feel free to make that change. I'm not as skilled as you in this sort of tricks :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref: http://ci.rvm.jp/results/trunk_asan@ruby-sp1/5731894
In cb1ea54 I added one more metadata flag, but didn't notice
RB_GC_OBJECT_METADATA_ENTRY_COUNThad to be incremented.This should fix ASAN builds.
Interestingly, bdb2595 already caused the count to be off by one, so I had to increment it by 2.
FYI: @ko1 @peterzhu2118