From 9869b65573d5bbaf5af4f20a577b41f95d73b846 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 25 Mar 2018 05:35:17 +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_4@62916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_core.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'vm_core.h') diff --git a/vm_core.h b/vm_core.h index 8e2b93d8e9..bca31694e3 100644 --- a/vm_core.h +++ b/vm_core.h @@ -1477,8 +1477,6 @@ void rb_vm_register_special_exception(enum ruby_special_exceptions sp, VALUE exc void rb_gc_mark_machine_stack(rb_thread_t *th); -int rb_autoloading_value(VALUE mod, ID id, VALUE* value); - void rb_vm_rewrite_cref(rb_cref_t *node, VALUE old_klass, VALUE new_klass, rb_cref_t **new_cref_ptr); const rb_callable_method_entry_t *rb_vm_frame_method_entry(const rb_control_frame_t *cfp); -- cgit v1.2.3