summaryrefslogtreecommitdiff
path: root/variable.c
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2021-03-10 10:24:28 -0500
committerAaron Patterson <aaron.patterson@gmail.com>2021-03-10 09:39:18 -0800
commit23a48d8fe683df289736e2d90c86006eb919b40d (patch)
treecf955554a13a3bf0564f57445302455a02dec59a /variable.c
parent9cdb5a51532c99230c2303912a13b9f752f1e775 (diff)
Refactor `rb_class_ivar_set`
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`.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/4254
Diffstat (limited to 'variable.c')
-rw-r--r--variable.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/variable.c b/variable.c
index 92d7d11eab..85ff35ba8c 100644
--- a/variable.c
+++ b/variable.c
@@ -1480,7 +1480,6 @@ ivar_set(VALUE obj, ID id, VALUE val)
case T_CLASS:
case T_MODULE:
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);
break;
default:
@@ -2988,9 +2987,6 @@ set_namespace_path(VALUE named_namespace, VALUE namespace_path)
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);
if (const_table) {
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;
}
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);
}
@@ -3588,6 +3581,10 @@ rb_iv_set(VALUE obj, const char *name, VALUE val)
int
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);
int result = st_insert(tbl, (st_data_t)key, (st_data_t)value);
RB_OBJ_WRITTEN(obj, Qundef, value);