1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor rb_class_ivar_set

Browse Source 
In every caller of `rb_class_ivar_set` it checks for the `RCLASS_IV_TBL`
and then creates it if it doesn't exist. Instead of repeating this in
every caller, this can be done once in `rb_class_ivar_set`.
This commit is contained in:
eileencodes 2021-03-10 10:24:28 -05:00 committed by Aaron Patterson
parent 9cdb5a5153
commit 23a48d8fe6
Notes: git 2021-03-11 02:39:37 +09:00 
Merged: https://github.com/ruby/ruby/pull/4254
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
class.c
View File

@ -529,9 +529,6 @@ void
rb_singleton_class_attached(VALUE klass, VALUE obj) rb_singleton_class_attached(VALUE klass, VALUE obj)
{ {
if (FL_TEST(klass, FL_SINGLETON)) { if (FL_TEST(klass, FL_SINGLETON)) {
if (!RCLASS_IV_TBL(klass)) {
RCLASS_IV_TBL(klass) = st_init_numtable();
}
rb_class_ivar_set(klass, id_attached, obj); rb_class_ivar_set(klass, id_attached, obj);
} }
} }

11
variable.c
View File

@ -1480,7 +1480,6 @@ ivar_set(VALUE obj, ID id, VALUE val)
case T_CLASS: case T_CLASS:
case T_MODULE: case T_MODULE:
IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(id); IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(id);
if (!RCLASS_IV_TBL(obj)) RCLASS_IV_TBL(obj) = st_init_numtable();
rb_class_ivar_set(obj, id, val); rb_class_ivar_set(obj, id, val);
break; break;
default: default:
@ -2988,9 +2987,6 @@ set_namespace_path(VALUE named_namespace, VALUE namespace_path)
RB_VM_LOCK_ENTER(); RB_VM_LOCK_ENTER();
{ {
if (!RCLASS_IV_TBL(named_namespace)) {
RCLASS_IV_TBL(named_namespace) = st_init_numtable();
}
rb_class_ivar_set(named_namespace, classpath, namespace_path); rb_class_ivar_set(named_namespace, classpath, namespace_path);
if (const_table) { if (const_table) {
rb_id_table_foreach(const_table, set_namespace_path_i, &namespace_path); rb_id_table_foreach(const_table, set_namespace_path_i, &namespace_path);
@ -3360,9 +3356,6 @@ rb_cvar_set(VALUE klass, ID id, VALUE val)
target = RBASIC(target)->klass; target = RBASIC(target)->klass;
} }
check_before_mod_set(target, id, val, "class variable"); check_before_mod_set(target, id, val, "class variable");
if (!RCLASS_IV_TBL(target)) {
RCLASS_IV_TBL(target) = st_init_numtable();
}
rb_class_ivar_set(target, id, val); rb_class_ivar_set(target, id, val);
} }
@ -3588,6 +3581,10 @@ rb_iv_set(VALUE obj, const char *name, VALUE val)
int int
rb_class_ivar_set(VALUE obj, ID key, VALUE value) rb_class_ivar_set(VALUE obj, ID key, VALUE value)
{ {
if (!RCLASS_IV_TBL(obj)) {
RCLASS_IV_TBL(obj) = st_init_numtable();
}
st_table *tbl = RCLASS_IV_TBL(obj); st_table *tbl = RCLASS_IV_TBL(obj);
int result = st_insert(tbl, (st_data_t)key, (st_data_t)value); int result = st_insert(tbl, (st_data_t)key, (st_data_t)value);
RB_OBJ_WRITTEN(obj, Qundef, value); RB_OBJ_WRITTEN(obj, Qundef, value);