merge revision(s) 55705: [Backport #12345]

* variable.c (rb_local_constants_i): exclude private constants
	  when excluding inherited constants too.  [Bug #12345]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-08-16 05:56:26 +00:00
parent 0d09e1af49
commit caec808f74
4 changed files with 9 additions and 2 deletions

View file

@ -1999,7 +1999,7 @@ sv_i(st_data_t k, st_data_t v, st_data_t a)
static int
rb_local_constants_i(st_data_t const_name, st_data_t const_value, st_data_t ary)
{
if (rb_is_const_id(const_name)) {
if (rb_is_const_id(const_name) && !RB_CONST_PRIVATE_P((rb_const_entry_t *)const_value)) {
rb_ary_push((VALUE)ary, ID2SYM((ID)const_name));
}
return ST_CONTINUE;