From d11ce2be2ed285d6959977d5d7ee2f0f110141d1 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 15 Mar 2018 07:35:54 +0000 Subject: merge revision(s) 62394,62395: [Backport #14469] vm_insnhelper.c: rb_autoloading_value flag * vm_insnhelper.c (vm_get_ev_const): add flag argument of `rb_autoloading_value`. * constant.h (rb_autoloading_value): moved the declaration from vm_core.h for `rb_const_flag_t`. [ruby-core:85516] [Bug #14469] variable.c: flags at autoloading * variable.c (const_tbl_update): flags by deprecate_constant / private_constant set during autoloading should be preserved after required. [ruby-core:85516] [Bug #14469] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62761 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vm_insnhelper.c') diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 6eb6180a25..d4f2c2a00c 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -837,7 +837,7 @@ vm_get_ev_const(rb_execution_context_t *ec, VALUE orig_klass, ID id, int is_defi if (am == klass) break; am = klass; if (is_defined) return 1; - if (rb_autoloading_value(klass, id, &av)) return av; + if (rb_autoloading_value(klass, id, &av, NULL)) return av; rb_autoload_load(klass, id); goto search_continue; } -- cgit v1.2.3