diff options
| -rw-r--r-- | benchmark/bm_vm2_module_ann_const_set.rb | 5 | ||||
| -rw-r--r-- | benchmark/bm_vm2_module_const_set.rb | 8 | ||||
| -rw-r--r-- | variable.c | 10 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 24 insertions, 5 deletions
diff --git a/benchmark/bm_vm2_module_ann_const_set.rb b/benchmark/bm_vm2_module_ann_const_set.rb new file mode 100644 index 0000000000..12ccfd2ff3 --- /dev/null +++ b/benchmark/bm_vm2_module_ann_const_set.rb @@ -0,0 +1,5 @@ +i = 0 +while i<6_000_000 # benchmark loop 2 + i += 1 + Module.new.const_set(:X, Module.new) +end diff --git a/benchmark/bm_vm2_module_const_set.rb b/benchmark/bm_vm2_module_const_set.rb new file mode 100644 index 0000000000..f4d4c1b2e7 --- /dev/null +++ b/benchmark/bm_vm2_module_const_set.rb @@ -0,0 +1,8 @@ +i = 0 +module M +end +$VERBOSE = nil +while i<6_000_000 # benchmark loop 2 + i += 1 + M.const_set(:X, Module.new) +end 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); @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.4.0" -#define RUBY_RELEASE_DATE "2017-03-11" -#define RUBY_PATCHLEVEL 17 +#define RUBY_RELEASE_DATE "2017-03-12" +#define RUBY_PATCHLEVEL 18 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" |