kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

variable.c: fix the condition to cache

Browse source 
* 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
This commit is contained in:
nobu 2017-01-11 04:12:56 +00:00
parent 9029464175
commit 1df80905a3
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
variable.c
View file

@ -2612,10 +2612,25 @@ rb_const_set(VALUE klass, ID id, VALUE val)
* and avoid order-dependency on const_tbl * and avoid order-dependency on const_tbl
*/ */
if (rb_cObject && (RB_TYPE_P(val, T_MODULE) || RB_TYPE_P(val, T_CLASS))) { if (rb_cObject && (RB_TYPE_P(val, T_MODULE) || RB_TYPE_P(val, T_CLASS))) {
if (!NIL_P(rb_class_path_cached(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); rb_name_class(val, id);
if (rb_class_path_cached(klass)) { }
rb_class_name(val); 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);
}
} }
} }
} }