summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zhu <peter@peterzhu.ca>2025-01-29 10:38:11 -0500
committerPeter Zhu <peter@peterzhu.ca>2025-01-29 13:22:04 -0500
commitde45755de803577f0a5593623c162384affa36f1 (patch)
tree017123ea52dac9141d8b518d56b4b412a8e57598
parent5e644e80e9155414188e337b0af48f8d661e593a (diff)
Use an identity hash instead of array for stress_to_class
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/12664
-rw-r--r--gc/default/default.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/gc/default/default.c b/gc/default/default.c
index f671f9702f..2f5cf79109 100644
--- a/gc/default/default.c
+++ b/gc/default/default.c
@@ -283,7 +283,7 @@ int ruby_rgengc_debug;
#endif
#ifndef GC_DEBUG_STRESS_TO_CLASS
-# define GC_DEBUG_STRESS_TO_CLASS RUBY_DEBUG
+# define GC_DEBUG_STRESS_TO_CLASS 1
#endif
typedef enum {
@@ -2517,9 +2517,8 @@ rb_gc_impl_new_obj(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags
(void)RB_DEBUG_COUNTER_INC_IF(obj_newobj_wb_unprotected, !wb_protected);
if (RB_UNLIKELY(stress_to_class)) {
- long cnt = RARRAY_LEN(stress_to_class);
- for (long i = 0; i < cnt; i++) {
- if (klass == RARRAY_AREF(stress_to_class, i)) rb_memerror();
+ if (RTEST(rb_hash_has_key(stress_to_class, klass))) {
+ rb_memerror();
}
}
@@ -9328,9 +9327,13 @@ rb_gcdebug_add_stress_to_class(int argc, VALUE *argv, VALUE self)
rb_objspace_t *objspace = rb_gc_get_objspace();
if (!stress_to_class) {
- set_stress_to_class(rb_ary_hidden_new(argc));
+ set_stress_to_class(rb_ident_hash_new_with_size(argc));
+ }
+
+ for (int i = 0; i < argc; i++) {
+ VALUE klass = argv[i];
+ rb_hash_aset(stress_to_class, klass, Qtrue);
}
- rb_ary_cat(stress_to_class, argv, argc);
return self;
}
@@ -9347,14 +9350,14 @@ static VALUE
rb_gcdebug_remove_stress_to_class(int argc, VALUE *argv, VALUE self)
{
rb_objspace_t *objspace = rb_gc_get_objspace();
- int i;
if (stress_to_class) {
- for (i = 0; i < argc; ++i) {
- rb_ary_delete_same(stress_to_class, argv[i]);
+ for (int i = 0; i < argc; ++i) {
+ rb_hash_delete(stress_to_class, argv[i]);
}
- if (RARRAY_LEN(stress_to_class) == 0) {
- set_stress_to_class(0);
+
+ if (rb_hash_size(stress_to_class) == 0) {
+ stress_to_class = 0;
}
}