1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hoisted out autoloading_const_entry

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2018-12-13 18:12:07 +09:00
parent c033dc3073
commit 151843b981
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
variable.c
View File

@ -2138,8 +2138,25 @@ check_autoload_required(VALUE mod, ID id, const char **loadingpath)
return 0; return 0;
} }
struct autoload_const *autoloading_const_entry(VALUE mod, ID id);
MJIT_FUNC_EXPORTED int MJIT_FUNC_EXPORTED int
rb_autoloading_value(VALUE mod, ID id, VALUE* value, rb_const_flag_t *flag) rb_autoloading_value(VALUE mod, ID id, VALUE* value, rb_const_flag_t *flag)
{
struct autoload_const *ac = autoloading_const_entry(mod, id);
if (!ac) return FALSE;
if (value) {
*value = ac->value;
}
if (flag) {
*flag = ac->flag;
}
return TRUE;
}
struct autoload_const *
autoloading_const_entry(VALUE mod, ID id)
{ {
VALUE load = autoload_data(mod, id); VALUE load = autoload_data(mod, id);
struct autoload_data_i *ele; struct autoload_data_i *ele;
@ -2151,13 +2168,7 @@ rb_autoloading_value(VALUE mod, ID id, VALUE* value, rb_const_flag_t *flag)
if (ele->state && ele->state->thread == rb_thread_current()) { if (ele->state && ele->state->thread == rb_thread_current()) {
if (ac->value != Qundef) { if (ac->value != Qundef) {
if (value) { return ac;
*value = ac->value;
}
if (flag) {
*flag = ac->flag;
}
return 1;
} }
} }
return 0; return 0;
@ -2395,9 +2406,11 @@ rb_const_search(VALUE klass, ID id, int exclude, int recurse, int visibility)
rb_const_warn_if_deprecated(ce, tmp, id); rb_const_warn_if_deprecated(ce, tmp, id);
value = ce->value; value = ce->value;
if (value == Qundef) { if (value == Qundef) {
struct autoload_const *ac;
if (am == tmp) break; if (am == tmp) break;
am = tmp; am = tmp;
if (rb_autoloading_value(tmp, id, &av, &flag)) return av; ac = autoloading_const_entry(tmp, id);
if (ac) return ac->value;
rb_autoload_load(tmp, id); rb_autoload_load(tmp, id);
continue; continue;
} }