From 1df80905a371ff30ae7082c0752479fa7df6cf3b Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 11 Jan 2017 04:12:56 +0000 Subject: variable.c: fix the condition to cache * variable.c (rb_const_set): fix the condition to cache the class path and cache permanent or temporary path corresponding to the outer klass. [ruby-core:79039] [Bug #13120] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- variable.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'variable.c') 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); + } } } } -- cgit v1.2.3