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

merge revision(s) 57283,57284: [Backport #13113]

Browse source 
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
This commit is contained in:
naruse 2017-03-11 15:03:50 +00:00
parent 00d2e36831
commit d4f4ba6f03
4 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
benchmark/bm_vm2_module_ann_const_set.rb Normal file
View file

@ -0,0 +1,5 @@
i = 0
while i<6_000_000 # benchmark loop 2
i += 1
Module.new.const_set(:X, Module.new)
end

8
benchmark/bm_vm2_module_const_set.rb Normal file
View file

@ -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

8
variable.c
View file

@ -2608,8 +2608,13 @@ 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))) {
rb_name_class(val, id);
if (rb_class_path_cached(klass)) {
rb_class_name(val); rb_class_name(val);
} }
}
}
} }
static void static void
@ -2656,7 +2661,8 @@ const_tbl_update(struct autoload_const_set_args *args)
} }
rb_clear_constant_cache(); rb_clear_constant_cache();
setup_const_entry(ce, klass, val, visibility); setup_const_entry(ce, klass, val, visibility);
} else { }
else {
rb_clear_constant_cache(); rb_clear_constant_cache();
ce = ZALLOC(rb_const_entry_t); ce = ZALLOC(rb_const_entry_t);

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.4.0" #define RUBY_VERSION "2.4.0"
#define RUBY_RELEASE_DATE "2017-03-11" #define RUBY_RELEASE_DATE "2017-03-12"
#define RUBY_PATCHLEVEL 17 #define RUBY_PATCHLEVEL 18
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 11 #define RUBY_RELEASE_DAY 12
#include "ruby/version.h" #include "ruby/version.h"