diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 15:03:50 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 15:03:50 +0000 |
| commit | d4f4ba6f032f1de0db75cf1d1c4d794ef6d50c3f (patch) | |
| tree | 4fc2e9c65eb3f69efd0be306487014cc0615fdb2 /variable.c | |
| parent | 00d2e368313627b183902090849d870ec9c11ee4 (diff) | |
merge revision(s) 57283,57284: [Backport #13113]
benchmarks for [Bug #13113] [ci skip]
variable.c: resolve permanent name only
* variable.c (rb_const_set): resolve and cache class name
immediately only if the outer class/module has the name,
otherwise just set the ID. [ruby-core:79007] [Bug #13113]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/variable.c b/variable.c index 91482e9d0f..54e7928292 100644 --- a/variable.c +++ b/variable.c @@ -2608,7 +2608,12 @@ 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))) { - rb_class_name(val); + if (!NIL_P(rb_class_path_cached(val))) { + rb_name_class(val, id); + if (rb_class_path_cached(klass)) { + rb_class_name(val); + } + } } } @@ -2656,7 +2661,8 @@ const_tbl_update(struct autoload_const_set_args *args) } rb_clear_constant_cache(); setup_const_entry(ce, klass, val, visibility); - } else { + } + else { rb_clear_constant_cache(); ce = ZALLOC(rb_const_entry_t); |