diff options
| -rw-r--r-- | variable.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/variable.c b/variable.c index 98b9073a02..c69764f18d 100644 --- a/variable.c +++ b/variable.c @@ -2612,10 +2612,25 @@ rb_const_set(VALUE klass, ID id, VALUE val) * and avoid order-dependency on const_tbl */ if (rb_cObject && (RB_TYPE_P(val, T_MODULE) || RB_TYPE_P(val, T_CLASS))) { - if (!NIL_P(rb_class_path_cached(val))) { - rb_name_class(val, id); - if (rb_class_path_cached(klass)) { - rb_class_name(val); + if (NIL_P(rb_class_path_cached(val))) { + if (klass == rb_cObject) { + rb_ivar_set(val, classpath, rb_id2str(id)); + rb_name_class(val, id); + } + else { + VALUE path; + ID pathid; + st_data_t n; + st_table *ivtbl = RCLASS_IV_TBL(klass); + if (ivtbl && + (st_lookup(ivtbl, (st_data_t)(pathid = classpath), &n) || + st_lookup(ivtbl, (st_data_t)(pathid = tmp_classpath), &n))) { + path = rb_str_dup((VALUE)n); + rb_str_append(rb_str_cat2(path, "::"), rb_id2str(id)); + OBJ_FREEZE(path); + rb_ivar_set(val, pathid, path); + rb_name_class(val, id); + } } } } |