diff options
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 2396 |
1 files changed, 1499 insertions, 897 deletions
diff --git a/variable.c b/variable.c index b1080d44ab..74d5b699b8 100644 --- a/variable.c +++ b/variable.c @@ -11,29 +11,47 @@ **********************************************************************/ -#include "internal.h" -#include "ruby/st.h" -#include "ruby/util.h" -#include "id_table.h" +#include "ruby/internal/config.h" +#include <stddef.h> +#include "ruby/internal/stdbool.h" +#include "ccan/list/list.h" #include "constant.h" +#include "debug_counter.h" #include "id.h" -#include "ccan/list/list.h" #include "id_table.h" +#include "internal.h" +#include "internal/class.h" +#include "internal/compilers.h" +#include "internal/error.h" +#include "internal/eval.h" +#include "internal/hash.h" +#include "internal/object.h" +#include "internal/re.h" +#include "internal/symbol.h" +#include "internal/thread.h" +#include "internal/variable.h" +#include "ruby/encoding.h" +#include "ruby/st.h" +#include "ruby/util.h" +#include "transient_heap.h" +#include "variable.h" +#include "vm_core.h" +#include "ractor_core.h" +#include "vm_sync.h" + +RUBY_EXTERN rb_serial_t ruby_vm_global_cvar_state; +#define GET_GLOBAL_CVAR_STATE() (ruby_vm_global_cvar_state) -struct rb_id_table *rb_global_tbl; -static ID autoload, classpath, tmp_classpath, classid; +typedef void rb_gvar_compact_t(void *var); + +static struct rb_id_table *rb_global_tbl; +static ID autoload, classpath, tmp_classpath; +static VALUE autoload_featuremap; /* feature => autoload_i */ static void check_before_mod_set(VALUE, ID, VALUE, const char *); static void setup_const_entry(rb_const_entry_t *, VALUE, VALUE, rb_const_flag_t); static VALUE rb_const_search(VALUE klass, ID id, int exclude, int recurse, int visibility); -static st_table *generic_iv_tbl; -static st_table *generic_iv_tbl_compat; - -/* per-object */ -struct gen_ivtbl { - uint32_t numiv; - VALUE ivptr[1]; /* flexible array */ -}; +static st_table *generic_iv_tbl_; struct ivar_update { union { @@ -48,173 +66,48 @@ void Init_var_tables(void) { rb_global_tbl = rb_id_table_create(0); - generic_iv_tbl = st_init_numtable(); + generic_iv_tbl_ = st_init_numtable(); autoload = rb_intern_const("__autoload__"); /* __classpath__: fully qualified class path */ classpath = rb_intern_const("__classpath__"); /* __tmp_classpath__: temporary class path which contains anonymous names */ tmp_classpath = rb_intern_const("__tmp_classpath__"); - /* __classid__: name given to class/module under an anonymous namespace */ - classid = rb_intern_const("__classid__"); } -struct fc_result { - ID name, preferred; - VALUE klass; - VALUE path; - VALUE track; - struct fc_result *prev; -}; - -static VALUE -fc_path(struct fc_result *fc, ID name) -{ - VALUE path, tmp; - - path = rb_id2str(name); - while (fc) { - st_data_t n; - if (fc->track == rb_cObject) break; - if (RCLASS_IV_TBL(fc->track) && - st_lookup(RCLASS_IV_TBL(fc->track), (st_data_t)classpath, &n)) { - tmp = rb_str_dup((VALUE)n); - rb_str_cat2(tmp, "::"); - rb_str_append(tmp, path); - path = tmp; - break; - } - tmp = rb_str_dup(rb_id2str(fc->name)); - rb_str_cat2(tmp, "::"); - rb_str_append(tmp, path); - path = tmp; - fc = fc->prev; - } - OBJ_FREEZE(path); - return path; -} - -static enum rb_id_table_iterator_result -fc_i(ID key, VALUE v, void *a) +static inline bool +rb_namespace_p(VALUE obj) { - rb_const_entry_t *ce = (rb_const_entry_t *)v; - struct fc_result *res = a; - VALUE value = ce->value; - if (!rb_is_const_id(key)) return ID_TABLE_CONTINUE; - - if (value == res->klass && (!res->preferred || key == res->preferred)) { - res->path = fc_path(res, key); - return ID_TABLE_STOP; + if (RB_SPECIAL_CONST_P(obj)) return false; + switch (RB_BUILTIN_TYPE(obj)) { + case T_MODULE: case T_CLASS: return true; + default: break; } - if (RB_TYPE_P(value, T_MODULE) || RB_TYPE_P(value, T_CLASS)) { - if (!RCLASS_CONST_TBL(value)) return ID_TABLE_CONTINUE; - else { - struct fc_result arg; - struct fc_result *list; - - list = res; - while (list) { - if (list->track == value) return ID_TABLE_CONTINUE; - list = list->prev; - } - - arg.name = key; - arg.preferred = res->preferred; - arg.path = 0; - arg.klass = res->klass; - arg.track = value; - arg.prev = res; - rb_id_table_foreach(RCLASS_CONST_TBL(value), fc_i, &arg); - if (arg.path) { - res->path = arg.path; - return ID_TABLE_STOP; - } - } - } - return ID_TABLE_CONTINUE; -} - -/** - * Traverse constant namespace and find +classpath+ for _klass_. If - * _preferred_ is not 0, choice the path whose base name is set to it. - * If +classpath+ is found, the hidden instance variable __classpath__ - * is set to the found path, and __tmp_classpath__ is removed. - * The path is frozen. - */ -static VALUE -find_class_path(VALUE klass, ID preferred) -{ - struct fc_result arg; - - arg.preferred = preferred; - arg.name = 0; - arg.path = 0; - arg.klass = klass; - arg.track = rb_cObject; - arg.prev = 0; - if (RCLASS_CONST_TBL(rb_cObject)) { - rb_id_table_foreach(RCLASS_CONST_TBL(rb_cObject), fc_i, &arg); - } - if (arg.path) { - st_data_t tmp = tmp_classpath; - if (!RCLASS_IV_TBL(klass)) { - RCLASS_IV_TBL(klass) = st_init_numtable(); - } - rb_class_ivar_set(klass, classpath, arg.path); - - st_delete(RCLASS_IV_TBL(klass), &tmp, 0); - return arg.path; - } - return Qnil; + return false; } /** * Returns +classpath+ of _klass_, if it is named, or +nil+ for - * anonymous +class+/+module+. The last part of named +classpath+ is - * never anonymous, but anonymous +class+/+module+ names may be - * contained. If the path is "permanent", that means it has no - * anonymous names, <code>*permanent</code> is set to 1. + * anonymous +class+/+module+. A named +classpath+ may contain + * an anonymous component, but the last component is guaranteed + * to not be anonymous. <code>*permanent</code> is set to 1 + * if +classpath+ has no anonymous components. There is no builtin + * Ruby level APIs that can change a permanent +classpath+. */ static VALUE classname(VALUE klass, int *permanent) { - VALUE path = Qnil; + st_table *ivtbl; st_data_t n; - if (!klass) klass = rb_cObject; - *permanent = 1; - if (RCLASS_IV_TBL(klass)) { - if (!st_lookup(RCLASS_IV_TBL(klass), (st_data_t)classpath, &n)) { - ID cid = 0; - if (st_lookup(RCLASS_IV_TBL(klass), (st_data_t)classid, &n)) { - VALUE cname = (VALUE)n; - cid = rb_check_id(&cname); - if (cid) path = find_class_path(klass, cid); - } - if (NIL_P(path)) { - path = find_class_path(klass, (ID)0); - } - if (NIL_P(path)) { - if (!cid) { - return Qnil; - } - if (!st_lookup(RCLASS_IV_TBL(klass), (st_data_t)tmp_classpath, &n)) { - path = rb_id2str(cid); - return path; - } - *permanent = 0; - path = (VALUE)n; - return path; - } - } - else { - path = (VALUE)n; - } - if (!RB_TYPE_P(path, T_STRING)) { - rb_bug("class path is not set properly"); - } - return path; + *permanent = 0; + if (!RCLASS_EXT(klass)) return Qnil; + if (!(ivtbl = RCLASS_IV_TBL(klass))) return Qnil; + if (st_lookup(ivtbl, (st_data_t)classpath, &n)) { + *permanent = 1; + return (VALUE)n; } - return find_class_path(klass, (ID)0); + if (st_lookup(ivtbl, (st_data_t)tmp_classpath, &n)) return (VALUE)n; + return Qnil; } /* @@ -228,10 +121,7 @@ VALUE rb_mod_name(VALUE mod) { int permanent; - VALUE path = classname(mod, &permanent); - - if (!NIL_P(path)) return rb_str_dup(path); - return path; + return classname(mod, &permanent); } static VALUE @@ -253,22 +143,16 @@ make_temporary_path(VALUE obj, VALUE klass) return path; } -typedef VALUE (*path_cache_func)(VALUE obj, VALUE name); +typedef VALUE (*fallback_func)(VALUE obj, VALUE name); static VALUE -rb_tmp_class_path(VALUE klass, int *permanent, path_cache_func cache_path) +rb_tmp_class_path(VALUE klass, int *permanent, fallback_func fallback) { VALUE path = classname(klass, permanent); - st_data_t n = (st_data_t)path; if (!NIL_P(path)) { return path; } - if (RCLASS_IV_TBL(klass) && st_lookup(RCLASS_IV_TBL(klass), - (st_data_t)tmp_classpath, &n)) { - *permanent = 0; - return (VALUE)n; - } else { if (RB_TYPE_P(klass, T_MODULE)) { if (rb_obj_class(klass) == rb_cModule) { @@ -276,68 +160,55 @@ rb_tmp_class_path(VALUE klass, int *permanent, path_cache_func cache_path) } else { int perm; - path = rb_tmp_class_path(RBASIC(klass)->klass, &perm, cache_path); + path = rb_tmp_class_path(RBASIC(klass)->klass, &perm, fallback); } } *permanent = 0; - return cache_path(klass, path); + return fallback(klass, path); } } -static VALUE -ivar_cache(VALUE obj, VALUE name) -{ - return rb_ivar_set(obj, tmp_classpath, make_temporary_path(obj, name)); -} - VALUE rb_class_path(VALUE klass) { int permanent; - VALUE path = rb_tmp_class_path(klass, &permanent, ivar_cache); + VALUE path = rb_tmp_class_path(klass, &permanent, make_temporary_path); if (!NIL_P(path)) path = rb_str_dup(path); return path; } -static VALUE -null_cache(VALUE obj, VALUE name) +VALUE +rb_class_path_cached(VALUE klass) { - return make_temporary_path(obj, name); + return rb_mod_name(klass); } -VALUE -rb_class_path_no_cache(VALUE klass) +static VALUE +no_fallback(VALUE obj, VALUE name) { - int permanent; - VALUE path = rb_tmp_class_path(klass, &permanent, null_cache); - if (!NIL_P(path)) path = rb_str_dup(path); - return path; + return name; } VALUE -rb_class_path_cached(VALUE klass) +rb_search_class_path(VALUE klass) { - st_table *ivtbl; - st_data_t n; - - if (!RCLASS_EXT(klass)) return Qnil; - if (!(ivtbl = RCLASS_IV_TBL(klass))) return Qnil; - if (st_lookup(ivtbl, (st_data_t)classpath, &n)) return (VALUE)n; - if (st_lookup(ivtbl, (st_data_t)tmp_classpath, &n)) return (VALUE)n; - return Qnil; + int permanent; + return rb_tmp_class_path(klass, &permanent, no_fallback); } static VALUE -never_cache(VALUE obj, VALUE name) +build_const_pathname(VALUE head, VALUE tail) { - return name; + VALUE path = rb_str_dup(head); + rb_str_cat2(path, "::"); + rb_str_append(path, tail); + return rb_fstring(path); } -VALUE -rb_search_class_path(VALUE klass) +static VALUE +build_const_path(VALUE head, ID tail) { - int permanent; - return rb_tmp_class_path(klass, &permanent, never_cache); + return build_const_pathname(head, rb_id2str(tail)); } void @@ -351,13 +222,10 @@ rb_set_class_path_string(VALUE klass, VALUE under, VALUE name) } else { int permanent; - str = rb_str_dup(rb_tmp_class_path(under, &permanent, ivar_cache)); - rb_str_cat2(str, "::"); - rb_str_append(str, name); - OBJ_FREEZE(str); + str = rb_tmp_class_path(under, &permanent, make_temporary_path); + str = build_const_pathname(str, name); if (!permanent) { pathid = tmp_classpath; - rb_ivar_set(klass, classid, rb_str_intern(name)); } } rb_ivar_set(klass, pathid, str); @@ -366,24 +234,9 @@ rb_set_class_path_string(VALUE klass, VALUE under, VALUE name) void rb_set_class_path(VALUE klass, VALUE under, const char *name) { - VALUE str; - ID pathid = classpath; - - if (under == rb_cObject) { - str = rb_str_new2(name); - } - else { - int permanent; - str = rb_str_dup(rb_tmp_class_path(under, &permanent, ivar_cache)); - rb_str_cat2(str, "::"); - rb_str_cat2(str, name); - if (!permanent) { - pathid = tmp_classpath; - rb_ivar_set(klass, classid, rb_str_intern(rb_str_new_cstr(name))); - } - } + VALUE str = rb_str_new2(name); OBJ_FREEZE(str); - rb_ivar_set(klass, pathid, str); + rb_set_class_path_string(klass, under, str); } VALUE @@ -412,13 +265,11 @@ rb_path_to_class(VALUE pathname) pbeg = p; } if (!id) { - undefined_class: - rb_raise(rb_eArgError, "undefined class/module % "PRIsVALUE, - rb_str_subseq(pathname, 0, p-path)); + goto undefined_class; } c = rb_const_search(c, id, TRUE, FALSE, FALSE); if (c == Qundef) goto undefined_class; - if (!RB_TYPE_P(c, T_MODULE) && !RB_TYPE_P(c, T_CLASS)) { + if (!rb_namespace_p(c)) { rb_raise(rb_eTypeError, "%"PRIsVALUE" does not refer to class/module", pathname); } @@ -426,6 +277,11 @@ rb_path_to_class(VALUE pathname) RB_GC_GUARD(pathname); return c; + + undefined_class: + rb_raise(rb_eArgError, "undefined class/module % "PRIsVALUE, + rb_str_subseq(pathname, 0, p-path)); + UNREACHABLE_RETURN(Qundef); } VALUE @@ -434,12 +290,6 @@ rb_path2class(const char *path) return rb_path_to_class(rb_str_new_cstr(path)); } -void -rb_name_class(VALUE klass, ID id) -{ - rb_ivar_set(klass, classid, ID2SYM(id)); -} - VALUE rb_class_name(VALUE klass) { @@ -450,7 +300,7 @@ const char * rb_class2name(VALUE klass) { int permanent; - VALUE path = rb_tmp_class_path(rb_class_real(klass), &permanent, ivar_cache); + VALUE path = rb_tmp_class_path(rb_class_real(klass), &permanent, make_temporary_path); if (NIL_P(path)) return NULL; return RSTRING_PTR(path); } @@ -471,55 +321,109 @@ struct trace_var { struct rb_global_variable { int counter; int block_trace; - void *data; + VALUE *data; rb_gvar_getter_t *getter; rb_gvar_setter_t *setter; rb_gvar_marker_t *marker; + rb_gvar_compact_t *compactor; struct trace_var *trace; }; -struct rb_global_entry* -rb_global_entry(ID id) +struct rb_global_entry { + struct rb_global_variable *var; + ID id; + bool ractor_local; +}; + +static struct rb_global_entry* +rb_find_global_entry(ID id) { struct rb_global_entry *entry; VALUE data; if (!rb_id_table_lookup(rb_global_tbl, id, &data)) { + entry = NULL; + } + else { + entry = (struct rb_global_entry *)data; + RUBY_ASSERT(entry != NULL); + } + + if (UNLIKELY(!rb_ractor_main_p()) && (!entry || !entry->ractor_local)) { + rb_raise(rb_eRactorIsolationError, "can not access global variables %s from non-main Ractors", rb_id2name(id)); + } + + return entry; +} + +void +rb_gvar_ractor_local(const char *name) +{ + struct rb_global_entry *entry = rb_find_global_entry(rb_intern(name)); + entry->ractor_local = true; +} + +static void +rb_gvar_undef_compactor(void *var) +{ +} + +static struct rb_global_entry* +rb_global_entry(ID id) +{ + struct rb_global_entry *entry = rb_find_global_entry(id); + if (!entry) { struct rb_global_variable *var; entry = ALLOC(struct rb_global_entry); var = ALLOC(struct rb_global_variable); entry->id = id; entry->var = var; + entry->ractor_local = false; var->counter = 1; var->data = 0; var->getter = rb_gvar_undef_getter; var->setter = rb_gvar_undef_setter; var->marker = rb_gvar_undef_marker; + var->compactor = rb_gvar_undef_compactor; var->block_trace = 0; var->trace = 0; rb_id_table_insert(rb_global_tbl, id, (VALUE)entry); } - else { - entry = (struct rb_global_entry *)data; - } return entry; } VALUE -rb_gvar_undef_getter(ID id, void *data, struct rb_global_variable *var) +rb_gvar_undef_getter(ID id, VALUE *_) { rb_warning("global variable `%"PRIsVALUE"' not initialized", QUOTE_ID(id)); return Qnil; } +static void +rb_gvar_val_compactor(void *_var) +{ + struct rb_global_variable *var = (struct rb_global_variable *)_var; + + VALUE obj = (VALUE)var->data; + + if (obj) { + VALUE new = rb_gc_location(obj); + if (new != obj) { + var->data = (void*)new; + } + } +} + void -rb_gvar_undef_setter(VALUE val, ID id, void *d, struct rb_global_variable *var) +rb_gvar_undef_setter(VALUE val, ID id, VALUE *_) { + struct rb_global_variable *var = rb_global_entry(id)->var; var->getter = rb_gvar_val_getter; var->setter = rb_gvar_val_setter; var->marker = rb_gvar_val_marker; + var->compactor = rb_gvar_val_compactor; var->data = (void*)val; } @@ -530,14 +434,15 @@ rb_gvar_undef_marker(VALUE *var) } VALUE -rb_gvar_val_getter(ID id, void *data, struct rb_global_variable *var) +rb_gvar_val_getter(ID id, VALUE *data) { return (VALUE)data; } void -rb_gvar_val_setter(VALUE val, ID id, void *data, struct rb_global_variable *var) +rb_gvar_val_setter(VALUE val, ID id, VALUE *_) { + struct rb_global_variable *var = rb_global_entry(id)->var; var->data = (void*)val; } @@ -545,21 +450,20 @@ void rb_gvar_val_marker(VALUE *var) { VALUE data = (VALUE)var; - if (data) rb_gc_mark_maybe(data); + if (data) rb_gc_mark_movable(data); } VALUE -rb_gvar_var_getter(ID id, void *data, struct rb_global_variable *gvar) +rb_gvar_var_getter(ID id, VALUE *var) { - VALUE *var = data; if (!var) return Qnil; return *var; } void -rb_gvar_var_setter(VALUE val, ID id, void *data, struct rb_global_variable *g) +rb_gvar_var_setter(VALUE val, ID id, VALUE *data) { - *(VALUE *)data = val; + *data = val; } void @@ -569,7 +473,7 @@ rb_gvar_var_marker(VALUE *var) } void -rb_gvar_readonly_setter(VALUE v, ID id, void *d, struct rb_global_variable *g) +rb_gvar_readonly_setter(VALUE v, ID id, VALUE *_) { rb_name_error(id, "%"PRIsVALUE" is a read-only variable", QUOTE_ID(id)); } @@ -593,8 +497,27 @@ mark_global_entry(VALUE v, void *ignored) void rb_gc_mark_global_tbl(void) { - if (rb_global_tbl) + if (rb_global_tbl) { rb_id_table_foreach_values(rb_global_tbl, mark_global_entry, 0); + } +} + +static enum rb_id_table_iterator_result +update_global_entry(VALUE v, void *ignored) +{ + struct rb_global_entry *entry = (struct rb_global_entry *)v; + struct rb_global_variable *var = entry->var; + + (*var->compactor)(var); + return ID_TABLE_CONTINUE; +} + +void +rb_gc_update_global_tbl(void) +{ + if (rb_global_tbl) { + rb_id_table_foreach_values(rb_global_tbl, update_global_entry, 0); + } } static ID @@ -605,20 +528,43 @@ global_id(const char *name) if (name[0] == '$') id = rb_intern(name); else { size_t len = strlen(name); - char *buf = ALLOCA_N(char, len+1); + VALUE vbuf = 0; + char *buf = ALLOCV_N(char, vbuf, len+1); buf[0] = '$'; memcpy(buf+1, name, len); id = rb_intern2(buf, len+1); + ALLOCV_END(vbuf); } return id; } +static ID +find_global_id(const char *name) +{ + ID id; + size_t len = strlen(name); + + if (name[0] == '$') { + id = rb_check_id_cstr(name, len, NULL); + } + else { + VALUE vbuf = 0; + char *buf = ALLOCV_N(char, vbuf, len+1); + buf[0] = '$'; + memcpy(buf+1, name, len); + id = rb_check_id_cstr(buf, len+1, NULL); + ALLOCV_END(vbuf); + } + + return id; +} + void rb_define_hooked_variable( const char *name, VALUE *var, - VALUE (*getter)(ANYARGS), - void (*setter)(ANYARGS)) + rb_gvar_getter_t *getter, + rb_gvar_setter_t *setter) { volatile VALUE tmp = var ? *var : Qnil; ID id = global_id(name); @@ -647,8 +593,8 @@ rb_define_readonly_variable(const char *name, const VALUE *var) void rb_define_virtual_variable( const char *name, - VALUE (*getter)(ANYARGS), - void (*setter)(ANYARGS)) + rb_gvar_getter_t *getter, + rb_gvar_setter_t *setter) { if (!getter) getter = rb_gvar_val_getter; if (!setter) setter = rb_gvar_readonly_setter; @@ -658,32 +604,9 @@ rb_define_virtual_variable( static void rb_trace_eval(VALUE cmd, VALUE val) { - rb_eval_cmd(cmd, rb_ary_new3(1, val), 0); + rb_eval_cmd_kw(cmd, rb_ary_new3(1, val), RB_NO_KEYWORDS); } -/* - * call-seq: - * trace_var(symbol, cmd ) -> nil - * trace_var(symbol) {|val| block } -> nil - * - * Controls tracing of assignments to global variables. The parameter - * +symbol+ identifies the variable (as either a string name or a - * symbol identifier). _cmd_ (which may be a string or a - * +Proc+ object) or block is executed whenever the variable - * is assigned. The block or +Proc+ object receives the - * variable's new value as a parameter. Also see - * <code>Kernel::untrace_var</code>. - * - * trace_var :$_, proc {|v| puts "$_ is now '#{v}'" } - * $_ = "hello" - * $_ = ' there' - * - * <em>produces:</em> - * - * $_ is now 'hello' - * $_ is now ' there' - */ - VALUE rb_f_trace_var(int argc, const VALUE *argv) { @@ -698,9 +621,6 @@ rb_f_trace_var(int argc, const VALUE *argv) return rb_f_untrace_var(argc, argv); } entry = rb_global_entry(rb_to_id(var)); - if (OBJ_TAINTED(cmd)) { - rb_raise(rb_eSecurityError, "Insecure: tainted variable trace"); - } trace = ALLOC(struct trace_var); trace->next = entry->var->trace; trace->func = rb_trace_eval; @@ -733,16 +653,6 @@ remove_trace(struct rb_global_variable *var) var->trace = t.next; } -/* - * call-seq: - * untrace_var(symbol [, cmd] ) -> array or nil - * - * Removes tracing for the specified command on the given global - * variable and returns +nil+. If no command is specified, - * removes all tracing for that variable and returns an array - * containing the commands actually removed. - */ - VALUE rb_f_untrace_var(int argc, const VALUE *argv) { @@ -750,18 +660,17 @@ rb_f_untrace_var(int argc, const VALUE *argv) ID id; struct rb_global_entry *entry; struct trace_var *trace; - VALUE data; rb_scan_args(argc, argv, "11", &var, &cmd); id = rb_check_id(&var); if (!id) { rb_name_error_str(var, "undefined global variable %"PRIsVALUE"", QUOTE(var)); } - if (!rb_id_table_lookup(rb_global_tbl, id, &data)) { + if ((entry = rb_find_global_entry(id)) == NULL) { rb_name_error(id, "undefined global variable %"PRIsVALUE"", QUOTE_ID(id)); } - trace = (entry = (struct rb_global_entry *)data)->var->trace; + trace = entry->var->trace; if (NIL_P(cmd)) { VALUE ary = rb_ary_new(); @@ -788,21 +697,15 @@ rb_f_untrace_var(int argc, const VALUE *argv) return Qnil; } -VALUE -rb_gvar_get(struct rb_global_entry *entry) -{ - struct rb_global_variable *var = entry->var; - return (*var->getter)(entry->id, var->data, var); -} - struct trace_data { struct trace_var *trace; VALUE val; }; static VALUE -trace_ev(struct trace_data *data) +trace_ev(VALUE v) { + struct trace_data *data = (void *)v; struct trace_var *trace = data->trace; while (trace) { @@ -814,20 +717,21 @@ trace_ev(struct trace_data *data) } static VALUE -trace_en(struct rb_global_variable *var) +trace_en(VALUE v) { + struct rb_global_variable *var = (void *)v; var->block_trace = 0; remove_trace(var); return Qnil; /* not reached */ } -VALUE -rb_gvar_set(struct rb_global_entry *entry, VALUE val) +static VALUE +rb_gvar_set_entry(struct rb_global_entry *entry, VALUE val) { struct trace_data trace; struct rb_global_variable *var = entry->var; - (*var->setter)(val, entry->id, var->data, var); + (*var->setter)(val, entry->id, var->data); if (var->trace && !var->block_trace) { var->block_trace = 1; @@ -839,28 +743,60 @@ rb_gvar_set(struct rb_global_entry *entry, VALUE val) } VALUE -rb_gv_set(const char *name, VALUE val) +rb_gvar_set(ID id, VALUE val) { struct rb_global_entry *entry; + entry = rb_global_entry(id); - entry = rb_global_entry(global_id(name)); - return rb_gvar_set(entry, val); + return rb_gvar_set_entry(entry, val); } VALUE -rb_gv_get(const char *name) +rb_gv_set(const char *name, VALUE val) { - struct rb_global_entry *entry; + return rb_gvar_set(global_id(name), val); +} - entry = rb_global_entry(global_id(name)); - return rb_gvar_get(entry); +VALUE +rb_gvar_get(ID id) +{ + struct rb_global_entry *entry = rb_global_entry(id); + struct rb_global_variable *var = entry->var; + return (*var->getter)(entry->id, var->data); } VALUE -rb_gvar_defined(struct rb_global_entry *entry) +rb_gv_get(const char *name) { - if (entry->var->getter == rb_gvar_undef_getter) return Qfalse; - return Qtrue; + ID id = find_global_id(name); + + if (!id) { + rb_warning("global variable `%s' not initialized", name); + return Qnil; + } + + return rb_gvar_get(id); +} + +MJIT_FUNC_EXPORTED VALUE +rb_gvar_defined(ID id) +{ + struct rb_global_entry *entry = rb_global_entry(id); + return RBOOL(entry->var->getter != rb_gvar_undef_getter); +} + +rb_gvar_getter_t * +rb_gvar_getter_function_of(ID id) +{ + const struct rb_global_entry *entry = rb_global_entry(id); + return entry->var->getter; +} + +rb_gvar_setter_t * +rb_gvar_setter_function_of(ID id) +{ + const struct rb_global_entry *entry = rb_global_entry(id); + return entry->var->setter; } static enum rb_id_table_iterator_result @@ -871,21 +807,16 @@ gvar_i(ID key, VALUE val, void *a) return ID_TABLE_CONTINUE; } -/* - * call-seq: - * global_variables -> array - * - * Returns an array of the names of global variables. - * - * global_variables.grep /std/ #=> [:$stdin, :$stdout, :$stderr] - */ - VALUE rb_f_global_variables(void) { VALUE ary = rb_ary_new(); VALUE sym, backref = rb_backref_get(); + if (!rb_ractor_main_p()) { + rb_raise(rb_eRactorIsolationError, "can not access global variables from non-main Ractors"); + } + rb_id_table_foreach(rb_global_tbl, gvar_i, (void *)ary); if (!NIL_P(backref)) { char buf[2]; @@ -913,12 +844,17 @@ rb_alias_variable(ID name1, ID name2) { struct rb_global_entry *entry1, *entry2; VALUE data1; + struct rb_id_table *gtbl = rb_global_tbl; + + if (!rb_ractor_main_p()) { + rb_raise(rb_eRactorIsolationError, "can not access global variables from non-main Ractors"); + } entry2 = rb_global_entry(name2); - if (!rb_id_table_lookup(rb_global_tbl, name1, &data1)) { + if (!rb_id_table_lookup(gtbl, name1, &data1)) { entry1 = ALLOC(struct rb_global_entry); entry1->id = name1; - rb_id_table_insert(rb_global_tbl, name1, (VALUE)entry1); + rb_id_table_insert(gtbl, name1, (VALUE)entry1); } else if ((entry1 = (struct rb_global_entry *)data1)->var != entry2->var) { struct rb_global_variable *var = entry1->var; @@ -943,67 +879,103 @@ rb_alias_variable(ID name1, ID name2) entry1->var = entry2->var; } -struct gen_ivar_compat_tbl { - struct gen_ivtbl *ivtbl; - st_table *tbl; -}; +static bool +iv_index_tbl_lookup(struct st_table *tbl, ID id, uint32_t *indexp) +{ + st_data_t ent_data; + int r; -static int -gen_ivar_compat_tbl_i(st_data_t id, st_data_t index, st_data_t arg) + if (tbl == NULL) return false; + + RB_VM_LOCK_ENTER(); + { + r = st_lookup(tbl, (st_data_t)id, &ent_data); + } + RB_VM_LOCK_LEAVE(); + + if (r) { + struct rb_iv_index_tbl_entry *ent = (void *)ent_data; + *indexp = ent->index; + return true; + } + else { + return false; + } +} + +static void +IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(ID id) { - struct gen_ivar_compat_tbl *a = (struct gen_ivar_compat_tbl *)arg; + if (UNLIKELY(!rb_ractor_main_p())) { + if (rb_is_instance_id(id)) { // check only normal ivars + rb_raise(rb_eRactorIsolationError, "can not set instance variables of classes/modules by non-main Ractors"); + } + } +} - if (index < a->ivtbl->numiv) { - VALUE val = a->ivtbl->ivptr[index]; - if (val != Qundef) { - st_add_direct(a->tbl, id, (st_data_t)val); - } +#define CVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR() \ + if (UNLIKELY(!rb_ractor_main_p())) { \ + rb_raise(rb_eRactorIsolationError, "can not access class variables from non-main Ractors"); \ + } + +static inline struct st_table * +generic_ivtbl(VALUE obj, ID id, bool force_check_ractor) +{ + ASSERT_vm_locking(); + + if ((force_check_ractor || LIKELY(rb_is_instance_id(id)) /* not internal ID */ ) && + !RB_OBJ_FROZEN_RAW(obj) && + UNLIKELY(!rb_ractor_main_p()) && + UNLIKELY(rb_ractor_shareable_p(obj))) { + + rb_raise(rb_eRactorIsolationError, "can not access instance variables of shareable objects from non-main Ractors"); } - return ST_CONTINUE; + return generic_iv_tbl_; +} + +static inline struct st_table * +generic_ivtbl_no_ractor_check(VALUE obj) +{ + return generic_ivtbl(obj, 0, false); } static int -gen_ivtbl_get(VALUE obj, struct gen_ivtbl **ivtbl) +gen_ivtbl_get(VALUE obj, ID id, struct gen_ivtbl **ivtbl) { st_data_t data; + int r = 0; - if (st_lookup(generic_iv_tbl, (st_data_t)obj, &data)) { - *ivtbl = (struct gen_ivtbl *)data; - return 1; + RB_VM_LOCK_ENTER(); + { + if (st_lookup(generic_ivtbl(obj, id, false), (st_data_t)obj, &data)) { + *ivtbl = (struct gen_ivtbl *)data; + r = 1; + } } - return 0; + RB_VM_LOCK_LEAVE(); + + return r; } -/* for backwards compatibility only */ -st_table* -rb_generic_ivar_table(VALUE obj) +MJIT_FUNC_EXPORTED int +rb_ivar_generic_ivtbl_lookup(VALUE obj, struct gen_ivtbl **ivtbl) { - st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(rb_obj_class(obj)); - struct gen_ivar_compat_tbl a; - st_data_t d; + return gen_ivtbl_get(obj, 0, ivtbl); +} - if (!iv_index_tbl) return 0; - if (!FL_TEST(obj, FL_EXIVAR)) return 0; - if (!gen_ivtbl_get(obj, &a.ivtbl)) return 0; +MJIT_FUNC_EXPORTED VALUE +rb_ivar_generic_lookup_with_index(VALUE obj, ID id, uint32_t index) +{ + struct gen_ivtbl *ivtbl; - a.tbl = 0; - if (!generic_iv_tbl_compat) { - generic_iv_tbl_compat = st_init_numtable(); - } - else { - if (st_lookup(generic_iv_tbl_compat, (st_data_t)obj, &d)) { - a.tbl = (st_table *)d; - st_clear(a.tbl); - } - } - if (!a.tbl) { - a.tbl = st_init_numtable(); - d = (st_data_t)a.tbl; - st_add_direct(generic_iv_tbl_compat, (st_data_t)obj, d); + if (gen_ivtbl_get(obj, id, &ivtbl)) { + if (LIKELY(index < ivtbl->numiv)) { + VALUE val = ivtbl->ivptr[index]; + return val; + } } - st_foreach_safe(iv_index_tbl, gen_ivar_compat_tbl_i, (st_data_t)&a); - return a.tbl; + return Qundef; } static VALUE @@ -1011,11 +983,11 @@ generic_ivar_delete(VALUE obj, ID id, VALUE undef) { struct gen_ivtbl *ivtbl; - if (gen_ivtbl_get(obj, &ivtbl)) { + if (gen_ivtbl_get(obj, id, &ivtbl)) { st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(rb_obj_class(obj)); - st_data_t index; + uint32_t index; - if (st_lookup(iv_index_tbl, (st_data_t)id, &index)) { + if (iv_index_tbl && iv_index_tbl_lookup(iv_index_tbl, id, &index)) { if (index < ivtbl->numiv) { VALUE ret = ivtbl->ivptr[index]; @@ -1032,11 +1004,11 @@ generic_ivar_get(VALUE obj, ID id, VALUE undef) { struct gen_ivtbl *ivtbl; - if (gen_ivtbl_get(obj, &ivtbl)) { + if (gen_ivtbl_get(obj, id, &ivtbl)) { st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(rb_obj_class(obj)); - st_data_t index; + uint32_t index; - if (st_lookup(iv_index_tbl, (st_data_t)id, &index)) { + if (iv_index_tbl && iv_index_tbl_lookup(iv_index_tbl, id, &index)) { if (index < ivtbl->numiv) { VALUE ret = ivtbl->ivptr[index]; @@ -1050,7 +1022,7 @@ generic_ivar_get(VALUE obj, ID id, VALUE undef) static size_t gen_ivtbl_bytes(size_t n) { - return sizeof(struct gen_ivtbl) + n * sizeof(VALUE) - sizeof(VALUE); + return offsetof(struct gen_ivtbl, ivptr) + n * sizeof(VALUE); } static struct gen_ivtbl * @@ -1083,42 +1055,36 @@ gen_ivtbl_dup(const struct gen_ivtbl *orig) static uint32_t iv_index_tbl_newsize(struct ivar_update *ivup) { - uint32_t index = (uint32_t)ivup->index; /* should not overflow */ - uint32_t newsize = (index+1) + (index+1)/4; /* (index+1)*1.25 */ - - if (!ivup->iv_extended && - ivup->u.iv_index_tbl->num_entries < (st_index_t)newsize) { - newsize = (uint32_t)ivup->u.iv_index_tbl->num_entries; + if (!ivup->iv_extended) { + return (uint32_t)ivup->u.iv_index_tbl->num_entries; + } + else { + uint32_t index = (uint32_t)ivup->index; /* should not overflow */ + return (index+1) + (index+1)/4; /* (index+1)*1.25 */ } - return newsize; } static int generic_ivar_update(st_data_t *k, st_data_t *v, st_data_t u, int existing) { - VALUE obj = (VALUE)*k; + ASSERT_vm_locking(); + struct ivar_update *ivup = (struct ivar_update *)u; - uint32_t newsize; - int ret = ST_CONTINUE; - struct gen_ivtbl *ivtbl; + struct gen_ivtbl *ivtbl = 0; if (existing) { ivtbl = (struct gen_ivtbl *)*v; - if (ivup->index >= ivtbl->numiv) { - goto resize; - } - ret = ST_STOP; - } - else { - FL_SET(obj, FL_EXIVAR); - ivtbl = 0; -resize: - newsize = iv_index_tbl_newsize(ivup); - ivtbl = gen_ivtbl_resize(ivtbl, newsize); - *v = (st_data_t)ivtbl; + if (ivup->index < ivtbl->numiv) { + ivup->u.ivtbl = ivtbl; + return ST_STOP; + } } + FL_SET((VALUE)*k, FL_EXIVAR); + uint32_t newsize = iv_index_tbl_newsize(ivup); + ivtbl = gen_ivtbl_resize(ivtbl, newsize); + *v = (st_data_t)ivtbl; ivup->u.ivtbl = ivtbl; - return ret; + return ST_CONTINUE; } static VALUE @@ -1126,29 +1092,24 @@ generic_ivar_defined(VALUE obj, ID id) { struct gen_ivtbl *ivtbl; st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(rb_obj_class(obj)); - st_data_t index; - - if (!iv_index_tbl) return Qfalse; - if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) return Qfalse; - if (!gen_ivtbl_get(obj, &ivtbl)) return Qfalse; + uint32_t index; - if ((index < ivtbl->numiv) && (ivtbl->ivptr[index] != Qundef)) - return Qtrue; + if (!iv_index_tbl_lookup(iv_index_tbl, id, &index)) return Qfalse; + if (!gen_ivtbl_get(obj, id, &ivtbl)) return Qfalse; - return Qfalse; + return RBOOL((index < ivtbl->numiv) && (ivtbl->ivptr[index] != Qundef)); } static int generic_ivar_remove(VALUE obj, ID id, VALUE *valp) { struct gen_ivtbl *ivtbl; - st_data_t key = (st_data_t)id; - st_data_t index; + uint32_t index; st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(rb_obj_class(obj)); if (!iv_index_tbl) return 0; - if (!st_lookup(iv_index_tbl, key, &index)) return 0; - if (!gen_ivtbl_get(obj, &ivtbl)) return 0; + if (!iv_index_tbl_lookup(iv_index_tbl, id, &index)) return 0; + if (!gen_ivtbl_get(obj, id, &ivtbl)) return 0; if (index < ivtbl->numiv) { if (ivtbl->ivptr[index] != Qundef) { @@ -1175,26 +1136,28 @@ rb_mark_generic_ivar(VALUE obj) { struct gen_ivtbl *ivtbl; - if (gen_ivtbl_get(obj, &ivtbl)) { + if (gen_ivtbl_get(obj, 0, &ivtbl)) { gen_ivtbl_mark(ivtbl); } } void -rb_free_generic_ivar(VALUE obj) +rb_mv_generic_ivar(VALUE rsrc, VALUE dst) { - st_data_t key = (st_data_t)obj; - struct gen_ivtbl *ivtbl; + st_data_t key = (st_data_t)rsrc; + st_data_t ivtbl; - if (st_delete(generic_iv_tbl, &key, (st_data_t *)&ivtbl)) - xfree(ivtbl); + if (st_delete(generic_ivtbl_no_ractor_check(rsrc), &key, &ivtbl)) + st_insert(generic_ivtbl_no_ractor_check(dst), (st_data_t)dst, ivtbl); +} - if (generic_iv_tbl_compat) { - st_table *tbl; +void +rb_free_generic_ivar(VALUE obj) +{ + st_data_t key = (st_data_t)obj, ivtbl; - if (st_delete(generic_iv_tbl_compat, &key, (st_data_t *)&tbl)) - st_free_table(tbl); - } + if (st_delete(generic_ivtbl_no_ractor_check(obj), &key, &ivtbl)) + xfree((struct gen_ivtbl *)ivtbl); } RUBY_FUNC_EXPORTED size_t @@ -1202,7 +1165,7 @@ rb_generic_ivar_memsize(VALUE obj) { struct gen_ivtbl *ivtbl; - if (gen_ivtbl_get(obj, &ivtbl)) + if (gen_ivtbl_get(obj, 0, &ivtbl)) return gen_ivtbl_bytes(ivtbl->numiv); return 0; } @@ -1222,33 +1185,94 @@ gen_ivtbl_count(const struct gen_ivtbl *ivtbl) return n; } +static int +lock_st_lookup(st_table *tab, st_data_t key, st_data_t *value) +{ + int r; + RB_VM_LOCK_ENTER(); + { + r = st_lookup(tab, key, value); + } + RB_VM_LOCK_LEAVE(); + return r; +} + +static int +lock_st_delete(st_table *tab, st_data_t *key, st_data_t *value) +{ + int r; + RB_VM_LOCK_ENTER(); + { + r = st_delete(tab, key, value); + } + RB_VM_LOCK_LEAVE(); + return r; +} + +static int +lock_st_is_member(st_table *tab, st_data_t key) +{ + int r; + RB_VM_LOCK_ENTER(); + { + r = st_is_member(tab, key); + } + RB_VM_LOCK_LEAVE(); + return r; +} + +static int +lock_st_insert(st_table *tab, st_data_t key, st_data_t value) +{ + int r; + RB_VM_LOCK_ENTER(); + { + r = st_insert(tab, key, value); + } + RB_VM_LOCK_LEAVE(); + return r; +} + VALUE rb_ivar_lookup(VALUE obj, ID id, VALUE undef) { - VALUE val, *ptr; - struct st_table *iv_index_tbl; - uint32_t len; - st_data_t index; - if (SPECIAL_CONST_P(obj)) return undef; switch (BUILTIN_TYPE(obj)) { case T_OBJECT: - len = ROBJECT_NUMIV(obj); - ptr = ROBJECT_IVPTR(obj); - iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); - if (!iv_index_tbl) break; - if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) break; - if (len <= index) break; - val = ptr[index]; - if (val != Qundef) - return val; - break; + { + uint32_t index; + uint32_t len = ROBJECT_NUMIV(obj); + VALUE *ptr = ROBJECT_IVPTR(obj); + VALUE val; + + if (iv_index_tbl_lookup(ROBJECT_IV_INDEX_TBL(obj), id, &index) && + index < len && + (val = ptr[index]) != Qundef) { + return val; + } + else { + break; + } + } case T_CLASS: case T_MODULE: - if (RCLASS_IV_TBL(obj) && - st_lookup(RCLASS_IV_TBL(obj), (st_data_t)id, &index)) - return (VALUE)index; - break; + { + st_data_t val; + + if (RCLASS_IV_TBL(obj) && + lock_st_lookup(RCLASS_IV_TBL(obj), (st_data_t)id, &val)) { + if (rb_is_instance_id(id) && + UNLIKELY(!rb_ractor_main_p()) && + !rb_ractor_shareable_p(val)) { + rb_raise(rb_eRactorIsolationError, + "can not get unshareable values from instance variables of classes/modules from non-main Ractors"); + } + return val; + } + else { + break; + } + } default: if (FL_TEST(obj, FL_EXIVAR)) return generic_ivar_get(obj, id, undef); @@ -1260,13 +1284,8 @@ rb_ivar_lookup(VALUE obj, ID id, VALUE undef) VALUE rb_ivar_get(VALUE obj, ID id) { - VALUE iv = rb_ivar_lookup(obj, id, Qundef); - - if (iv == Qundef) { - if (RTEST(ruby_verbose)) - rb_warning("instance variable %"PRIsVALUE" not initialized", QUOTE_ID(id)); - iv = Qnil; - } + VALUE iv = rb_ivar_lookup(obj, id, Qnil); + RB_DEBUG_COUNTER_INC(ivar_get_base); return iv; } @@ -1279,10 +1298,9 @@ rb_attr_get(VALUE obj, ID id) static VALUE rb_ivar_delete(VALUE obj, ID id, VALUE undef) { - VALUE val, *ptr; + VALUE *ptr; struct st_table *iv_index_tbl; - uint32_t len; - st_data_t index; + uint32_t len, index; rb_check_frozen(obj); switch (BUILTIN_TYPE(obj)) { @@ -1290,19 +1308,25 @@ rb_ivar_delete(VALUE obj, ID id, VALUE undef) len = ROBJECT_NUMIV(obj); ptr = ROBJECT_IVPTR(obj); iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); - if (!iv_index_tbl) break; - if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) break; - if (len <= index) break; - val = ptr[index]; - ptr[index] = Qundef; - if (val != Qundef) - return val; - break; + if (iv_index_tbl_lookup(iv_index_tbl, id, &index) && + index < len) { + VALUE val = ptr[index]; + ptr[index] = Qundef; + + if (val != Qundef) { + return val; + } + } + break; case T_CLASS: case T_MODULE: - if (RCLASS_IV_TBL(obj) && - st_delete(RCLASS_IV_TBL(obj), (st_data_t *)&id, &index)) - return (VALUE)index; + IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(id); + if (RCLASS_IV_TBL(obj)) { + st_data_t id_data = (st_data_t)id, val; + if (lock_st_delete(RCLASS_IV_TBL(obj), &id_data, &val)) { + return (VALUE)val; + } + } break; default: if (FL_TEST(obj, FL_EXIVAR)) @@ -1319,126 +1343,271 @@ rb_attr_delete(VALUE obj, ID id) } static st_table * -iv_index_tbl_make(VALUE obj) +iv_index_tbl_make(VALUE obj, VALUE klass) { - VALUE klass = rb_obj_class(obj); - st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(klass); + st_table *iv_index_tbl; + + if (UNLIKELY(!klass)) { + rb_raise(rb_eTypeError, "hidden object cannot have instance variables"); + } - if (!iv_index_tbl) { - iv_index_tbl = RCLASS_IV_INDEX_TBL(klass) = st_init_numtable(); + if ((iv_index_tbl = RCLASS_IV_INDEX_TBL(klass)) == NULL) { + RB_VM_LOCK_ENTER(); + if ((iv_index_tbl = RCLASS_IV_INDEX_TBL(klass)) == NULL) { + iv_index_tbl = RCLASS_IV_INDEX_TBL(klass) = st_init_numtable(); + } + RB_VM_LOCK_LEAVE(); } return iv_index_tbl; } static void -iv_index_tbl_extend(struct ivar_update *ivup, ID id) +iv_index_tbl_extend(struct ivar_update *ivup, ID id, VALUE klass) { - if (st_lookup(ivup->u.iv_index_tbl, (st_data_t)id, &ivup->index)) { + ASSERT_vm_locking(); + st_data_t ent_data; + struct rb_iv_index_tbl_entry *ent; + + if (st_lookup(ivup->u.iv_index_tbl, (st_data_t)id, &ent_data)) { + ent = (void *)ent_data; + ivup->index = ent->index; return; } if (ivup->u.iv_index_tbl->num_entries >= INT_MAX) { rb_raise(rb_eArgError, "too many instance variables"); } - ivup->index = (st_data_t)ivup->u.iv_index_tbl->num_entries; - st_add_direct(ivup->u.iv_index_tbl, (st_data_t)id, ivup->index); + ent = ALLOC(struct rb_iv_index_tbl_entry); + ent->index = ivup->index = (uint32_t)ivup->u.iv_index_tbl->num_entries; + ent->class_value = klass; + ent->class_serial = RCLASS_SERIAL(klass); + st_add_direct(ivup->u.iv_index_tbl, (st_data_t)id, (st_data_t)ent); ivup->iv_extended = 1; } static void generic_ivar_set(VALUE obj, ID id, VALUE val) { + VALUE klass = rb_obj_class(obj); struct ivar_update ivup; - ivup.iv_extended = 0; - ivup.u.iv_index_tbl = iv_index_tbl_make(obj); - iv_index_tbl_extend(&ivup, id); - st_update(generic_iv_tbl, (st_data_t)obj, generic_ivar_update, - (st_data_t)&ivup); + ivup.u.iv_index_tbl = iv_index_tbl_make(obj, klass); + + RB_VM_LOCK_ENTER(); + { + iv_index_tbl_extend(&ivup, id, klass); + st_update(generic_ivtbl(obj, id, false), (st_data_t)obj, generic_ivar_update, + (st_data_t)&ivup); + } + RB_VM_LOCK_LEAVE(); ivup.u.ivtbl->ivptr[ivup.index] = val; RB_OBJ_WRITTEN(obj, Qundef, val); } -VALUE -rb_ivar_set(VALUE obj, ID id, VALUE val) +static VALUE * +obj_ivar_heap_alloc(VALUE obj, size_t newsize) { + VALUE *newptr = rb_transient_heap_alloc(obj, sizeof(VALUE) * newsize); + + if (newptr != NULL) { + ROBJ_TRANSIENT_SET(obj); + } + else { + ROBJ_TRANSIENT_UNSET(obj); + newptr = ALLOC_N(VALUE, newsize); + } + return newptr; +} + +static VALUE * +obj_ivar_heap_realloc(VALUE obj, int32_t len, size_t newsize) +{ + VALUE *newptr; + int i; + + if (ROBJ_TRANSIENT_P(obj)) { + const VALUE *orig_ptr = ROBJECT(obj)->as.heap.ivptr; + newptr = obj_ivar_heap_alloc(obj, newsize); + + assert(newptr); + ROBJECT(obj)->as.heap.ivptr = newptr; + for (i=0; i<(int)len; i++) { + newptr[i] = orig_ptr[i]; + } + } + else { + REALLOC_N(ROBJECT(obj)->as.heap.ivptr, VALUE, newsize); + newptr = ROBJECT(obj)->as.heap.ivptr; + } + + return newptr; +} + +#if USE_TRANSIENT_HEAP +void +rb_obj_transient_heap_evacuate(VALUE obj, int promote) +{ + if (ROBJ_TRANSIENT_P(obj)) { + uint32_t len = ROBJECT_NUMIV(obj); + const VALUE *old_ptr = ROBJECT_IVPTR(obj); + VALUE *new_ptr; + + if (promote) { + new_ptr = ALLOC_N(VALUE, len); + ROBJ_TRANSIENT_UNSET(obj); + } + else { + new_ptr = obj_ivar_heap_alloc(obj, len); + } + MEMCPY(new_ptr, old_ptr, VALUE, len); + ROBJECT(obj)->as.heap.ivptr = new_ptr; + } +} +#endif + +static void +init_iv_list(VALUE obj, uint32_t len, uint32_t newsize, st_table *index_tbl) +{ + VALUE *ptr = ROBJECT_IVPTR(obj); + VALUE *newptr; + + if (RBASIC(obj)->flags & ROBJECT_EMBED) { + newptr = obj_ivar_heap_alloc(obj, newsize); + MEMCPY(newptr, ptr, VALUE, len); + RBASIC(obj)->flags &= ~ROBJECT_EMBED; + ROBJECT(obj)->as.heap.ivptr = newptr; + } + else { + newptr = obj_ivar_heap_realloc(obj, len, newsize); + } + + for (; len < newsize; len++) { + newptr[len] = Qundef; + } + ROBJECT(obj)->as.heap.numiv = newsize; + ROBJECT(obj)->as.heap.iv_index_tbl = index_tbl; +} + +void +rb_init_iv_list(VALUE obj) +{ + st_table *index_tbl = ROBJECT_IV_INDEX_TBL(obj); + uint32_t newsize = (uint32_t)index_tbl->num_entries; + uint32_t len = ROBJECT_NUMIV(obj); + init_iv_list(obj, len, newsize, index_tbl); +} + +// Retrieve or create the id-to-index mapping for a given object and an +// instance variable name. +static struct ivar_update +obj_ensure_iv_index_mapping(VALUE obj, ID id) +{ + VALUE klass = rb_obj_class(obj); struct ivar_update ivup; - uint32_t i, len; + ivup.iv_extended = 0; + ivup.u.iv_index_tbl = iv_index_tbl_make(obj, klass); - rb_check_frozen(obj); + RB_VM_LOCK_ENTER(); + { + iv_index_tbl_extend(&ivup, id, klass); + } + RB_VM_LOCK_LEAVE(); + + return ivup; +} + +// Return the instance variable index for a given name and T_OBJECT object. The +// mapping between name and index lives on `rb_obj_class(obj)` and is created +// if not already present. +// +// @note May raise when there are too many instance variables. +// @note YJIT uses this function at compile time to simplify the work needed to +// access the variable at runtime. +uint32_t +rb_obj_ensure_iv_index_mapping(VALUE obj, ID id) +{ + RUBY_ASSERT(RB_TYPE_P(obj, T_OBJECT)); + // This uint32_t cast shouldn't lose information as it's checked in + // iv_index_tbl_extend(). The index is stored as an uint32_t in + // struct rb_iv_index_tbl_entry. + return (uint32_t)obj_ensure_iv_index_mapping(obj, id).index; +} + +static VALUE +obj_ivar_set(VALUE obj, ID id, VALUE val) +{ + uint32_t len; + struct ivar_update ivup = obj_ensure_iv_index_mapping(obj, id); + + len = ROBJECT_NUMIV(obj); + if (len <= ivup.index) { + uint32_t newsize = iv_index_tbl_newsize(&ivup); + init_iv_list(obj, len, newsize, ivup.u.iv_index_tbl); + } + RB_OBJ_WRITE(obj, &ROBJECT_IVPTR(obj)[ivup.index], val); + + return val; +} + +static void +ivar_set(VALUE obj, ID id, VALUE val) +{ + RB_DEBUG_COUNTER_INC(ivar_set_base); switch (BUILTIN_TYPE(obj)) { case T_OBJECT: - ivup.iv_extended = 0; - ivup.u.iv_index_tbl = iv_index_tbl_make(obj); - iv_index_tbl_extend(&ivup, id); - len = ROBJECT_NUMIV(obj); - if (len <= ivup.index) { - VALUE *ptr = ROBJECT_IVPTR(obj); - if (ivup.index < ROBJECT_EMBED_LEN_MAX) { - RBASIC(obj)->flags |= ROBJECT_EMBED; - ptr = ROBJECT(obj)->as.ary; - for (i = 0; i < ROBJECT_EMBED_LEN_MAX; i++) { - ptr[i] = Qundef; - } - } - else { - VALUE *newptr; - uint32_t newsize = iv_index_tbl_newsize(&ivup); - - if (RBASIC(obj)->flags & ROBJECT_EMBED) { - newptr = ALLOC_N(VALUE, newsize); - MEMCPY(newptr, ptr, VALUE, len); - RBASIC(obj)->flags &= ~ROBJECT_EMBED; - ROBJECT(obj)->as.heap.ivptr = newptr; - } - else { - REALLOC_N(ROBJECT(obj)->as.heap.ivptr, VALUE, newsize); - newptr = ROBJECT(obj)->as.heap.ivptr; - } - for (; len < newsize; len++) - newptr[len] = Qundef; - ROBJECT(obj)->as.heap.numiv = newsize; - ROBJECT(obj)->as.heap.iv_index_tbl = ivup.u.iv_index_tbl; - } - } - RB_OBJ_WRITE(obj, &ROBJECT_IVPTR(obj)[ivup.index], val); - break; + obj_ivar_set(obj, id, val); + break; case T_CLASS: case T_MODULE: - if (!RCLASS_IV_TBL(obj)) RCLASS_IV_TBL(obj) = st_init_numtable(); - rb_class_ivar_set(obj, id, val); + IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(id); + rb_class_ivar_set(obj, id, val); break; default: - generic_ivar_set(obj, id, val); - break; + generic_ivar_set(obj, id, val); + break; } +} + +VALUE +rb_ivar_set(VALUE obj, ID id, VALUE val) +{ + rb_check_frozen(obj); + ivar_set(obj, id, val); return val; } +void +rb_ivar_set_internal(VALUE obj, ID id, VALUE val) +{ + // should be internal instance variable name (no @ prefix) + VM_ASSERT(!rb_is_instance_id(id)); + + ivar_set(obj, id, val); +} + VALUE rb_ivar_defined(VALUE obj, ID id) { VALUE val; struct st_table *iv_index_tbl; - st_data_t index; + uint32_t index; if (SPECIAL_CONST_P(obj)) return Qfalse; switch (BUILTIN_TYPE(obj)) { case T_OBJECT: iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); - if (!iv_index_tbl) break; - if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) break; - if (ROBJECT_NUMIV(obj) <= index) break; - val = ROBJECT_IVPTR(obj)[index]; - if (val != Qundef) + if (iv_index_tbl_lookup(iv_index_tbl, id, &index) && + index < ROBJECT_NUMIV(obj) && + (val = ROBJECT_IVPTR(obj)[index]) != Qundef) { return Qtrue; + } break; case T_CLASS: case T_MODULE: - if (RCLASS_IV_TBL(obj) && st_lookup(RCLASS_IV_TBL(obj), (st_data_t)id, 0)) + if (RCLASS_IV_TBL(obj) && lock_st_is_member(RCLASS_IV_TBL(obj), (st_data_t)id)) return Qtrue; break; default: @@ -1449,79 +1618,73 @@ rb_ivar_defined(VALUE obj, ID id) return Qfalse; } -struct obj_ivar_tag { - VALUE obj; - int (*func)(ID key, VALUE val, st_data_t arg); - st_data_t arg; -}; +typedef int rb_ivar_foreach_callback_func(ID key, VALUE val, st_data_t arg); +st_data_t rb_st_nth_key(st_table *tab, st_index_t index); -static int -obj_ivar_i(st_data_t key, st_data_t index, st_data_t arg) -{ - struct obj_ivar_tag *data = (struct obj_ivar_tag *)arg; - if (index < ROBJECT_NUMIV(data->obj)) { - VALUE val = ROBJECT_IVPTR(data->obj)[index]; - if (val != Qundef) { - return (data->func)((ID)key, val, data->arg); +static ID +iv_index_tbl_nth_id(st_table *iv_index_tbl, uint32_t index) +{ + st_data_t key; + RB_VM_LOCK_ENTER(); + { + key = rb_st_nth_key(iv_index_tbl, index); + } + RB_VM_LOCK_LEAVE(); + return (ID)key; +} + +static inline bool +ivar_each_i(st_table *iv_index_tbl, VALUE val, uint32_t i, rb_ivar_foreach_callback_func *func, st_data_t arg) +{ + if (val != Qundef) { + ID id = iv_index_tbl_nth_id(iv_index_tbl, i); + switch (func(id, val, arg)) { + case ST_CHECK: + case ST_CONTINUE: + break; + case ST_STOP: + return true; + default: + rb_bug("unreachable"); } } - return ST_CONTINUE; + return false; } static void -obj_ivar_each(VALUE obj, int (*func)(ANYARGS), st_data_t arg) -{ - st_table *tbl; - struct obj_ivar_tag data; - - tbl = ROBJECT_IV_INDEX_TBL(obj); - if (!tbl) - return; - - data.obj = obj; - data.func = (int (*)(ID key, VALUE val, st_data_t arg))func; - data.arg = arg; - - st_foreach_safe(tbl, obj_ivar_i, (st_data_t)&data); -} - -struct gen_ivar_tag { - struct gen_ivtbl *ivtbl; - int (*func)(ID key, VALUE val, st_data_t arg); - st_data_t arg; -}; - -static int -gen_ivar_each_i(st_data_t key, st_data_t index, st_data_t data) +obj_ivar_each(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg) { - struct gen_ivar_tag *arg = (struct gen_ivar_tag *)data; + st_table *iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); + if (!iv_index_tbl) return; + uint32_t i=0; - if (index < arg->ivtbl->numiv) { - VALUE val = arg->ivtbl->ivptr[index]; - if (val != Qundef) { - return (arg->func)((ID)key, val, arg->arg); + for (i=0; i < ROBJECT_NUMIV(obj); i++) { + VALUE val = ROBJECT_IVPTR(obj)[i]; + if (ivar_each_i(iv_index_tbl, val, i, func, arg)) { + return; } } - return ST_CONTINUE; } static void -gen_ivar_each(VALUE obj, int (*func)(ANYARGS), st_data_t arg) +gen_ivar_each(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg) { - struct gen_ivar_tag data; + struct gen_ivtbl *ivtbl; st_table *iv_index_tbl = RCLASS_IV_INDEX_TBL(rb_obj_class(obj)); - if (!iv_index_tbl) return; - if (!gen_ivtbl_get(obj, &data.ivtbl)) return; + if (!gen_ivtbl_get(obj, 0, &ivtbl)) return; - data.func = (int (*)(ID key, VALUE val, st_data_t arg))func; - data.arg = arg; - - st_foreach_safe(iv_index_tbl, gen_ivar_each_i, (st_data_t)&data); + for (uint32_t i=0; i<ivtbl->numiv; i++) { + VALUE val = ivtbl->ivptr[i]; + if (ivar_each_i(iv_index_tbl, val, i, func, arg)) { + return; + } + } } struct givar_copy { VALUE obj; + VALUE klass; st_table *iv_index_tbl; struct gen_ivtbl *ivtbl; }; @@ -1534,7 +1697,13 @@ gen_ivar_copy(ID id, VALUE val, st_data_t arg) ivup.iv_extended = 0; ivup.u.iv_index_tbl = c->iv_index_tbl; - iv_index_tbl_extend(&ivup, id); + + RB_VM_LOCK_ENTER(); + { + iv_index_tbl_extend(&ivup, id, c->klass); + } + RB_VM_LOCK_LEAVE(); + if (ivup.index >= c->ivtbl->numiv) { uint32_t newsize = iv_index_tbl_newsize(&ivup); c->ivtbl = gen_ivtbl_resize(c->ivtbl, newsize); @@ -1554,21 +1723,16 @@ rb_copy_generic_ivar(VALUE clone, VALUE obj) rb_check_frozen(clone); if (!FL_TEST(obj, FL_EXIVAR)) { - clear: - if (FL_TEST(clone, FL_EXIVAR)) { - rb_free_generic_ivar(clone); - FL_UNSET(clone, FL_EXIVAR); - } - return; + goto clear; } - if (gen_ivtbl_get(obj, &ivtbl)) { + if (gen_ivtbl_get(obj, 0, &ivtbl)) { struct givar_copy c; uint32_t i; if (gen_ivtbl_count(ivtbl) == 0) goto clear; - if (gen_ivtbl_get(clone, &c.ivtbl)) { + if (gen_ivtbl_get(clone, 0, &c.ivtbl)) { for (i = 0; i < c.ivtbl->numiv; i++) c.ivtbl->ivptr[i] = Qundef; } @@ -1577,19 +1741,54 @@ rb_copy_generic_ivar(VALUE clone, VALUE obj) FL_SET(clone, FL_EXIVAR); } - c.iv_index_tbl = iv_index_tbl_make(clone); - c.obj = clone; + VALUE klass = rb_obj_class(clone); + c.iv_index_tbl = iv_index_tbl_make(clone, klass); + c.obj = clone; + c.klass = klass; gen_ivar_each(obj, gen_ivar_copy, (st_data_t)&c); /* * c.ivtbl may change in gen_ivar_copy due to realloc, * no need to free */ - st_insert(generic_iv_tbl, (st_data_t)clone, (st_data_t)c.ivtbl); + RB_VM_LOCK_ENTER(); + { + generic_ivtbl_no_ractor_check(clone); + st_insert(generic_ivtbl_no_ractor_check(obj), (st_data_t)clone, (st_data_t)c.ivtbl); + } + RB_VM_LOCK_LEAVE(); + } + return; + + clear: + if (FL_TEST(clone, FL_EXIVAR)) { + rb_free_generic_ivar(clone); + FL_UNSET(clone, FL_EXIVAR); + } +} + +void +rb_replace_generic_ivar(VALUE clone, VALUE obj) +{ + RUBY_ASSERT(FL_TEST(obj, FL_EXIVAR)); + + RB_VM_LOCK_ENTER(); + { + st_data_t ivtbl, obj_data = (st_data_t)obj; + if (st_lookup(generic_iv_tbl_, (st_data_t)obj, &ivtbl)) { + st_insert(generic_iv_tbl_, (st_data_t)clone, ivtbl); + st_delete(generic_iv_tbl_, &obj_data, NULL); + } + else { + rb_bug("unreachable"); + } } + RB_VM_LOCK_LEAVE(); + + FL_SET(clone, FL_EXIVAR); } void -rb_ivar_foreach(VALUE obj, int (*func)(ANYARGS), st_data_t arg) +rb_ivar_foreach(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg) { if (SPECIAL_CONST_P(obj)) return; switch (BUILTIN_TYPE(obj)) { @@ -1598,8 +1797,13 @@ rb_ivar_foreach(VALUE obj, int (*func)(ANYARGS), st_data_t arg) break; case T_CLASS: case T_MODULE: + IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(0); if (RCLASS_IV_TBL(obj)) { - st_foreach_safe(RCLASS_IV_TBL(obj), func, arg); + RB_VM_LOCK_ENTER(); + { + st_foreach_safe(RCLASS_IV_TBL(obj), func, arg); + } + RB_VM_LOCK_LEAVE(); } break; default: @@ -1619,7 +1823,7 @@ rb_ivar_count(VALUE obj) switch (BUILTIN_TYPE(obj)) { case T_OBJECT: - if ((tbl = ROBJECT_IV_INDEX_TBL(obj)) != 0) { + if (ROBJECT_IV_INDEX_TBL(obj) != 0) { st_index_t i, count, num = ROBJECT_NUMIV(obj); const VALUE *const ivptr = ROBJECT_IVPTR(obj); for (i = count = 0; i < num; ++i) { @@ -1640,7 +1844,7 @@ rb_ivar_count(VALUE obj) if (FL_TEST(obj, FL_EXIVAR)) { struct gen_ivtbl *ivtbl; - if (gen_ivtbl_get(obj, &ivtbl)) { + if (gen_ivtbl_get(obj, 0, &ivtbl)) { return gen_ivtbl_count(ivtbl); } } @@ -1712,9 +1916,11 @@ check_id_type(VALUE obj, VALUE *pname, /* * call-seq: * obj.remove_instance_variable(symbol) -> obj + * obj.remove_instance_variable(string) -> obj * * Removes the named instance variable from <i>obj</i>, returning that * variable's value. + * String arguments are converted to symbols. * * class Dummy * attr_reader :var @@ -1738,7 +1944,7 @@ rb_obj_remove_instance_variable(VALUE obj, VALUE name) const ID id = id_for_var(obj, name, an, instance); st_data_t n, v; struct st_table *iv_index_tbl; - st_data_t index; + uint32_t index; rb_check_frozen(obj); if (!id) { @@ -1748,19 +1954,18 @@ rb_obj_remove_instance_variable(VALUE obj, VALUE name) switch (BUILTIN_TYPE(obj)) { case T_OBJECT: iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); - if (!iv_index_tbl) break; - if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) break; - if (ROBJECT_NUMIV(obj) <= index) break; - val = ROBJECT_IVPTR(obj)[index]; - if (val != Qundef) { + if (iv_index_tbl_lookup(iv_index_tbl, id, &index) && + index < ROBJECT_NUMIV(obj) && + (val = ROBJECT_IVPTR(obj)[index]) != Qundef) { ROBJECT_IVPTR(obj)[index] = Qundef; return val; } break; case T_CLASS: case T_MODULE: + IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(id); n = id; - if (RCLASS_IV_TBL(obj) && st_delete(RCLASS_IV_TBL(obj), &n, &v)) { + if (RCLASS_IV_TBL(obj) && lock_st_delete(RCLASS_IV_TBL(obj), &n, &v)) { return (VALUE)v; } break; @@ -1776,7 +1981,7 @@ rb_obj_remove_instance_variable(VALUE obj, VALUE name) not_defined: rb_name_err_raise("instance variable %1$s not defined", obj, name); - UNREACHABLE; + UNREACHABLE_RETURN(Qnil); } NORETURN(static void uninitialized_constant(VALUE, VALUE)); @@ -1794,7 +1999,7 @@ uninitialized_constant(VALUE klass, VALUE name) VALUE rb_const_missing(VALUE klass, VALUE name) { - VALUE value = rb_funcallv(klass, rb_intern("const_missing"), 1, &name); + VALUE value = rb_funcallv(klass, idConst_missing, 1, &name); rb_vm_inc_const_missing_count(); return value; } @@ -1839,16 +2044,21 @@ rb_const_missing(VALUE klass, VALUE name) VALUE rb_mod_const_missing(VALUE klass, VALUE name) { + VALUE ref = GET_EC()->private_const_reference; rb_vm_pop_cfunc_frame(); + if (ref) { + rb_name_err_raise("private constant %2$s::%1$s referenced", + ref, name); + } uninitialized_constant(klass, name); - UNREACHABLE; + UNREACHABLE_RETURN(Qnil); } static void autoload_mark(void *ptr) { - rb_mark_tbl((st_table *)ptr); + rb_mark_tbl_no_pin((st_table *)ptr); } static void @@ -1864,9 +2074,15 @@ autoload_memsize(const void *ptr) return st_memsize(tbl); } +static void +autoload_compact(void *ptr) +{ + rb_gc_update_tbl_refs((st_table *)ptr); +} + static const rb_data_type_t autoload_data_type = { "autoload", - {autoload_mark, autoload_free, autoload_memsize,}, + {autoload_mark, autoload_free, autoload_memsize, autoload_compact,}, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; @@ -1887,33 +2103,61 @@ autoload_data(VALUE mod, ID id) return (VALUE)val; } +struct autoload_const { + struct list_node cnode; /* <=> autoload_data_i.constants */ + VALUE mod; + VALUE ad; /* autoload_data_i */ + VALUE value; + VALUE file; + ID id; + rb_const_flag_t flag; + int line; +}; + /* always on stack, no need to mark */ struct autoload_state { - struct autoload_data_i *ele; - VALUE mod; + struct autoload_const *ac; VALUE result; - ID id; VALUE thread; - union { - struct list_node node; - struct list_head head; - } waitq; + struct list_head waitq; }; struct autoload_data_i { VALUE feature; - int safe_level; - rb_const_flag_t flag; - VALUE value; struct autoload_state *state; /* points to on-stack struct */ + rb_serial_t fork_gen; + struct list_head constants; /* <=> autoload_const.cnode */ }; static void +autoload_i_compact(void *ptr) +{ + struct autoload_data_i *p = ptr; + p->feature = rb_gc_location(p->feature); +} + +static void autoload_i_mark(void *ptr) { struct autoload_data_i *p = ptr; - rb_gc_mark(p->feature); - rb_gc_mark(p->value); + + rb_gc_mark_movable(p->feature); + + /* allow GC to free us if no modules refer to this via autoload_const.ad */ + if (list_empty(&p->constants)) { + rb_hash_delete(autoload_featuremap, p->feature); + } +} + +static void +autoload_i_free(void *ptr) +{ + struct autoload_data_i *p = ptr; + + /* we may leak some memory at VM shutdown time, no big deal */ + if (list_empty(&p->constants)) { + xfree(p); + } } static size_t @@ -1924,14 +2168,69 @@ autoload_i_memsize(const void *ptr) static const rb_data_type_t autoload_data_i_type = { "autoload_i", - {autoload_i_mark, RUBY_TYPED_DEFAULT_FREE, autoload_i_memsize,}, + {autoload_i_mark, autoload_i_free, autoload_i_memsize, autoload_i_compact}, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; -#define check_autoload_data(av) \ - (struct autoload_data_i *)rb_check_typeddata((av), &autoload_data_i_type) +static void +autoload_c_compact(void *ptr) +{ + struct autoload_const *ac = ptr; -void + ac->mod = rb_gc_location(ac->mod); + ac->ad = rb_gc_location(ac->ad); + ac->value = rb_gc_location(ac->value); + ac->file = rb_gc_location(ac->file); +} + +static void +autoload_c_mark(void *ptr) +{ + struct autoload_const *ac = ptr; + + rb_gc_mark_movable(ac->mod); + rb_gc_mark_movable(ac->ad); + rb_gc_mark_movable(ac->value); + rb_gc_mark_movable(ac->file); +} + +static void +autoload_c_free(void *ptr) +{ + struct autoload_const *ac = ptr; + list_del(&ac->cnode); + xfree(ac); +} + +static size_t +autoload_c_memsize(const void *ptr) +{ + return sizeof(struct autoload_const); +} + +static const rb_data_type_t autoload_const_type = { + "autoload_const", + {autoload_c_mark, autoload_c_free, autoload_c_memsize, autoload_c_compact,}, + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY +}; + +static struct autoload_data_i * +get_autoload_data(VALUE acv, struct autoload_const **acp) +{ + struct autoload_const *ac = rb_check_typeddata(acv, &autoload_const_type); + struct autoload_data_i *ele; + + ele = rb_check_typeddata(ac->ad, &autoload_data_i_type); + /* do not reach across stack for ->state after forking: */ + if (ele && ele->state && ele->fork_gen != GET_VM()->fork_gen) { + ele->state = 0; + ele->fork_gen = 0; + } + if (acp) *acp = ac; + return ele; +} + +RUBY_FUNC_EXPORTED void rb_autoload(VALUE mod, ID id, const char *file) { if (!file || !*file) { @@ -1977,17 +2276,37 @@ rb_autoload_str(VALUE mod, ID id, VALUE file) DATA_PTR(av) = tbl = st_init_numtable(); } - ad = TypedData_Make_Struct(0, struct autoload_data_i, &autoload_data_i_type, ele); - if (OBJ_TAINTED(file)) { - file = rb_str_dup(file); - FL_UNSET(file, FL_TAINT); + file = rb_fstring(file); + if (!autoload_featuremap) { + autoload_featuremap = rb_ident_hash_new(); + rb_obj_hide(autoload_featuremap); + rb_gc_register_mark_object(autoload_featuremap); + } + ad = rb_hash_aref(autoload_featuremap, file); + if (NIL_P(ad)) { + ad = TypedData_Make_Struct(0, struct autoload_data_i, + &autoload_data_i_type, ele); + ele->feature = file; + ele->state = 0; + list_head_init(&ele->constants); + rb_hash_aset(autoload_featuremap, file, ad); + } + else { + ele = rb_check_typeddata(ad, &autoload_data_i_type); + } + { + VALUE acv; + struct autoload_const *ac; + acv = TypedData_Make_Struct(0, struct autoload_const, + &autoload_const_type, ac); + ac->mod = mod; + ac->id = id; + ac->value = Qundef; + ac->flag = CONST_PUBLIC; + ac->ad = ad; + list_add_tail(&ele->constants, &ac->cnode); + st_insert(tbl, (st_data_t)id, (st_data_t)acv); } - ele->feature = rb_fstring(file); - ele->safe_level = rb_safe_level(); - ele->value = Qundef; - ele->state = 0; - ele->flag = CONST_PUBLIC; - st_insert(tbl, (st_data_t)id, (st_data_t)ad); } static void @@ -1997,39 +2316,42 @@ autoload_delete(VALUE mod, ID id) if (st_lookup(RCLASS_IV_TBL(mod), (st_data_t)autoload, &val)) { struct st_table *tbl = check_autoload_table((VALUE)val); + struct autoload_data_i *ele; + struct autoload_const *ac; st_delete(tbl, &n, &load); + /* Qfalse can indicate already deleted */ + if (load != Qfalse) { + ele = get_autoload_data((VALUE)load, &ac); + VM_ASSERT(ele); + if (ele) { + VM_ASSERT(!list_empty(&ele->constants)); + } - if (tbl->num_entries == 0) { - n = autoload; - st_delete(RCLASS_IV_TBL(mod), &n, &val); - } - } -} - -static VALUE -autoload_provided(VALUE arg) -{ - const char **p = (const char **)arg; - return rb_feature_provided(*p, p); -} + /* + * we must delete here to avoid "already initialized" warnings + * with parallel autoload. Using list_del_init here so list_del + * works in autoload_c_free + */ + list_del_init(&ac->cnode); -static VALUE -reset_safe(VALUE safe) -{ - rb_set_safe_level_force((int)safe); - return safe; + if (tbl->num_entries == 0) { + n = autoload; + st_delete(RCLASS_IV_TBL(mod), &n, &val); + } + } + } } static VALUE check_autoload_required(VALUE mod, ID id, const char **loadingpath) { - VALUE file, load; + VALUE file; + VALUE load = autoload_data(mod, id); struct autoload_data_i *ele; const char *loading; - int safe; - if (!(load = autoload_data(mod, id)) || !(ele = check_autoload_data(load))) { + if (!load || !(ele = get_autoload_data(load, 0))) { return 0; } file = ele->feature; @@ -2049,9 +2371,7 @@ check_autoload_required(VALUE mod, ID id, const char **loadingpath) } loading = RSTRING_PTR(file); - safe = rb_safe_level(); - rb_set_safe_level_force(0); - if (!rb_ensure(autoload_provided, (VALUE)&loading, reset_safe, (VALUE)safe)) { + if (!rb_feature_provided(loading, &loading)) { return load; } if (loadingpath && loading) { @@ -2061,24 +2381,37 @@ check_autoload_required(VALUE mod, ID id, const char **loadingpath) return 0; } -int +static struct autoload_const *autoloading_const_entry(VALUE mod, ID id); + +MJIT_FUNC_EXPORTED int rb_autoloading_value(VALUE mod, ID id, VALUE* value, rb_const_flag_t *flag) { - VALUE load; + 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); struct autoload_data_i *ele; + struct autoload_const *ac; - if (!(load = autoload_data(mod, id)) || !(ele = check_autoload_data(load))) { - return 0; + if (!load || !(ele = get_autoload_data(load, &ac))) { + return 0; } + if (ele->state && ele->state->thread == rb_thread_current()) { - if (ele->value != Qundef) { - if (value) { - *value = ele->value; - } - if (flag) { - *flag = ele->flag; - } - return 1; + if (ac->value != Qundef) { + return ac; } } return 0; @@ -2095,23 +2428,21 @@ autoload_defined_p(VALUE mod, ID id) return !rb_autoloading_value(mod, id, NULL, NULL); } -struct autoload_const_set_args { - VALUE mod; - ID id; - VALUE value; - rb_const_flag_t flag; -}; - -static void const_tbl_update(struct autoload_const_set_args *); +static void const_tbl_update(struct autoload_const *); static VALUE -autoload_const_set(VALUE arg) +autoload_const_set(struct autoload_const *ac) { - struct autoload_const_set_args* args = (struct autoload_const_set_args *)arg; - VALUE klass = args->mod; - ID id = args->id; - check_before_mod_set(klass, id, args->value, "constant"); - const_tbl_update(args); + VALUE klass = ac->mod; + ID id = ac->id; + check_before_mod_set(klass, id, ac->value, "constant"); + + RB_VM_LOCK_ENTER(); + { + const_tbl_update(ac); + } + RB_VM_LOCK_LEAVE(); + return 0; /* ignored */ } @@ -2119,10 +2450,13 @@ static VALUE autoload_require(VALUE arg) { struct autoload_state *state = (struct autoload_state *)arg; + struct autoload_const *ac = state->ac; + struct autoload_data_i *ele; + ele = rb_check_typeddata(ac->ad, &autoload_data_i_type); /* this may release GVL and switch threads: */ state->result = rb_funcall(rb_vm_top_self(), rb_intern("require"), 1, - state->ele->feature); + ele->feature); return state->result; } @@ -2132,36 +2466,36 @@ autoload_reset(VALUE arg) { struct autoload_state *state = (struct autoload_state *)arg; int need_wakeups = 0; + struct autoload_const *ac = state->ac; + struct autoload_data_i *ele; - if (state->ele->state == state) { - need_wakeups = 1; - state->ele->state = 0; + ele = rb_check_typeddata(ac->ad, &autoload_data_i_type); + if (ele->state == state) { + need_wakeups = 1; + ele->state = 0; + ele->fork_gen = 0; } /* At the last, move a value defined in autoload to constant table */ - if (RTEST(state->result) && state->ele->value != Qundef) { - int safe_backup; - struct autoload_const_set_args args; + if (RTEST(state->result)) { + struct autoload_const *next; - args.mod = state->mod; - args.id = state->id; - args.value = state->ele->value; - args.flag = state->ele->flag; - safe_backup = rb_safe_level(); - rb_set_safe_level_force(state->ele->safe_level); - rb_ensure(autoload_const_set, (VALUE)&args, - reset_safe, (VALUE)safe_backup); + list_for_each_safe(&ele->constants, ac, next, cnode) { + if (ac->value != Qundef) { + autoload_const_set(ac); + } + } } /* wakeup any waiters we had */ if (need_wakeups) { struct autoload_state *cur = 0, *nxt; - list_for_each_safe(&state->waitq.head, cur, nxt, waitq.node) { + list_for_each_safe(&state->waitq, cur, nxt, waitq.n) { VALUE th = cur->thread; cur->thread = Qfalse; - list_del_init(&cur->waitq.node); /* idempotent */ + list_del_init(&cur->waitq.n); /* idempotent */ /* * cur is stored on the stack of cur->waiting_th, @@ -2196,7 +2530,7 @@ autoload_sleep_done(VALUE arg) struct autoload_state *state = (struct autoload_state *)arg; if (state->thread != Qfalse && rb_thread_to_be_killed(state->thread)) { - list_del_init(&state->waitq.node); /* idempotent */ + list_del(&state->waitq.n); /* idempotent after list_del_init */ } return Qfalse; @@ -2208,7 +2542,10 @@ rb_autoload_load(VALUE mod, ID id) VALUE load, result; const char *loading = 0, *src; struct autoload_data_i *ele; + struct autoload_const *ac; struct autoload_state state; + int flag = -1; + rb_const_entry_t *ce; if (!autoload_defined_p(mod, id)) return Qfalse; load = check_autoload_required(mod, id, &loading); @@ -2216,38 +2553,51 @@ rb_autoload_load(VALUE mod, ID id) src = rb_sourcefile(); if (src && loading && strcmp(src, loading) == 0) return Qfalse; + if (UNLIKELY(!rb_ractor_main_p())) { + rb_raise(rb_eRactorUnsafeError, "require by autoload on non-main Ractor is not supported (%s)", rb_id2name(id)); + } + + if ((ce = rb_const_lookup(mod, id))) { + flag = ce->flag & (CONST_DEPRECATED | CONST_VISIBILITY_MASK); + } + /* set ele->state for a marker of autoloading thread */ - if (!(ele = check_autoload_data(load))) { + if (!(ele = get_autoload_data(load, &ac))) { return Qfalse; } - - state.ele = ele; - state.mod = mod; - state.id = id; + state.ac = ac; state.thread = rb_thread_current(); if (!ele->state) { ele->state = &state; + ele->fork_gen = GET_VM()->fork_gen; /* * autoload_reset will wake up any threads added to this - * iff the GVL is released during autoload_require + * if and only if the GVL is released during autoload_require */ - list_head_init(&state.waitq.head); + list_head_init(&state.waitq); } else if (state.thread == ele->state->thread) { return Qfalse; } else { - list_add_tail(&ele->state->waitq.head, &state.waitq.node); + list_add_tail(&ele->state->waitq, &state.waitq.n); rb_ensure(autoload_sleep, (VALUE)&state, autoload_sleep_done, (VALUE)&state); } /* autoload_data_i can be deleted by another thread while require */ + state.result = Qfalse; result = rb_ensure(autoload_require, (VALUE)&state, autoload_reset, (VALUE)&state); + if (!(ce = rb_const_lookup(mod, id)) || ce->value == Qundef) { + rb_const_remove(mod, id); + } + else if (flag > 0) { + ce->flag |= flag; + } RB_GC_GUARD(load); return result; } @@ -2255,27 +2605,35 @@ rb_autoload_load(VALUE mod, ID id) VALUE rb_autoload_p(VALUE mod, ID id) { + return rb_autoload_at_p(mod, id, TRUE); +} + +VALUE +rb_autoload_at_p(VALUE mod, ID id, int recur) +{ VALUE load; struct autoload_data_i *ele; while (!autoload_defined_p(mod, id)) { + if (!recur) return Qnil; mod = RCLASS_SUPER(mod); if (!mod) return Qnil; } load = check_autoload_required(mod, id, 0); if (!load) return Qnil; - return (ele = check_autoload_data(load)) ? ele->feature : Qnil; + return (ele = get_autoload_data(load, 0)) ? ele->feature : Qnil; } -void +MJIT_FUNC_EXPORTED void rb_const_warn_if_deprecated(const rb_const_entry_t *ce, VALUE klass, ID id) { - if (RB_CONST_DEPRECATED_P(ce)) { + if (RB_CONST_DEPRECATED_P(ce) && + rb_warning_category_enabled_p(RB_WARN_CATEGORY_DEPRECATED)) { if (klass == rb_cObject) { - rb_warn("constant ::%"PRIsVALUE" is deprecated", QUOTE_ID(id)); + rb_category_warn(RB_WARN_CATEGORY_DEPRECATED, "constant ::%"PRIsVALUE" is deprecated", QUOTE_ID(id)); } else { - rb_warn("constant %"PRIsVALUE"::%"PRIsVALUE" is deprecated", + rb_category_warn(RB_WARN_CATEGORY_DEPRECATED, "constant %"PRIsVALUE"::%"PRIsVALUE" is deprecated", rb_class_name(klass), QUOTE_ID(id)); } } @@ -2285,55 +2643,86 @@ static VALUE rb_const_get_0(VALUE klass, ID id, int exclude, int recurse, int visibility) { VALUE c = rb_const_search(klass, id, exclude, recurse, visibility); - if (c != Qundef) return c; + if (c != Qundef) { + if (UNLIKELY(!rb_ractor_main_p())) { + if (!rb_ractor_shareable_p(c)) { + rb_raise(rb_eRactorIsolationError, "can not access non-shareable objects in constant %"PRIsVALUE"::%s by non-main Ractor.", rb_class_path(klass), rb_id2name(id)); + } + } + return c; + } return rb_const_missing(klass, ID2SYM(id)); } static VALUE -rb_const_search(VALUE klass, ID id, int exclude, int recurse, int visibility) +rb_const_search_from(VALUE klass, ID id, int exclude, int recurse, int visibility) { - VALUE value, tmp, av; - rb_const_flag_t flag; - int mod_retry = 0; + VALUE value, current; + bool first_iteration = true; - tmp = klass; - retry: - while (RTEST(tmp)) { + for (current = klass; + RTEST(current); + current = RCLASS_SUPER(current), first_iteration = false) { + VALUE tmp; VALUE am = 0; rb_const_entry_t *ce; + if (!first_iteration && RCLASS_ORIGIN(current) != current) { + // This item in the super chain has an origin iclass + // that comes later in the chain. Skip this item so + // prepended modules take precedence. + continue; + } + + // Do lookup in original class or module in case we are at an origin + // iclass in the chain. + tmp = current; + if (BUILTIN_TYPE(tmp) == T_ICLASS) tmp = RBASIC(tmp)->klass; + + // Do the lookup. Loop in case of autoload. while ((ce = rb_const_lookup(tmp, id))) { if (visibility && RB_CONST_PRIVATE_P(ce)) { - rb_name_err_raise("private constant %2$s::%1$s referenced", - tmp, ID2SYM(id)); + GET_EC()->private_const_reference = tmp; + return Qundef; } rb_const_warn_if_deprecated(ce, tmp, id); value = ce->value; if (value == Qundef) { + struct autoload_const *ac; if (am == tmp) break; 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); continue; } - if (exclude && tmp == rb_cObject && klass != rb_cObject) { - rb_warn("toplevel constant %"PRIsVALUE" referenced by %"PRIsVALUE"::%"PRIsVALUE"", - QUOTE_ID(id), rb_class_name(klass), QUOTE_ID(id)); + if (exclude && tmp == rb_cObject) { + goto not_found; } return value; } if (!recurse) break; - tmp = RCLASS_SUPER(tmp); - } - if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) { - mod_retry = 1; - tmp = rb_cObject; - goto retry; } + not_found: + GET_EC()->private_const_reference = 0; return Qundef; } +static VALUE +rb_const_search(VALUE klass, ID id, int exclude, int recurse, int visibility) +{ + VALUE value; + + if (klass == rb_cObject) exclude = FALSE; + value = rb_const_search_from(klass, id, exclude, recurse, visibility); + if (value != Qundef) return value; + if (exclude) return value; + if (BUILTIN_TYPE(klass) != T_MODULE) return value; + /* search global const too, if klass is a module */ + return rb_const_search_from(rb_cObject, id, FALSE, recurse, visibility); +} + VALUE rb_const_get_from(VALUE klass, ID id) { @@ -2352,22 +2741,74 @@ rb_const_get_at(VALUE klass, ID id) return rb_const_get_0(klass, id, TRUE, FALSE, FALSE); } -VALUE +MJIT_FUNC_EXPORTED VALUE rb_public_const_get_from(VALUE klass, ID id) { return rb_const_get_0(klass, id, TRUE, TRUE, TRUE); } -VALUE -rb_public_const_get(VALUE klass, ID id) +MJIT_FUNC_EXPORTED VALUE +rb_public_const_get_at(VALUE klass, ID id) +{ + return rb_const_get_0(klass, id, TRUE, FALSE, TRUE); +} + +NORETURN(static void undefined_constant(VALUE mod, VALUE name)); +static void +undefined_constant(VALUE mod, VALUE name) +{ + rb_name_err_raise("constant %2$s::%1$s not defined", + mod, name); +} + +static VALUE +rb_const_location_from(VALUE klass, ID id, int exclude, int recurse, int visibility) +{ + while (RTEST(klass)) { + rb_const_entry_t *ce; + + while ((ce = rb_const_lookup(klass, id))) { + if (visibility && RB_CONST_PRIVATE_P(ce)) { + return Qnil; + } + if (exclude && klass == rb_cObject) { + goto not_found; + } + if (NIL_P(ce->file)) return rb_ary_new(); + return rb_assoc_new(ce->file, INT2NUM(ce->line)); + } + if (!recurse) break; + klass = RCLASS_SUPER(klass); + } + + not_found: + return Qnil; +} + +static VALUE +rb_const_location(VALUE klass, ID id, int exclude, int recurse, int visibility) { - return rb_const_get_0(klass, id, FALSE, TRUE, TRUE); + VALUE loc; + + if (klass == rb_cObject) exclude = FALSE; + loc = rb_const_location_from(klass, id, exclude, recurse, visibility); + if (!NIL_P(loc)) return loc; + if (exclude) return loc; + if (BUILTIN_TYPE(klass) != T_MODULE) return loc; + /* search global const too, if klass is a module */ + return rb_const_location_from(rb_cObject, id, FALSE, recurse, visibility); } VALUE -rb_public_const_get_at(VALUE klass, ID id) +rb_const_source_location(VALUE klass, ID id) { - return rb_const_get_0(klass, id, TRUE, FALSE, TRUE); + return rb_const_location(klass, id, FALSE, TRUE, FALSE); +} + +MJIT_FUNC_EXPORTED VALUE +rb_const_source_location_at(VALUE klass, ID id) +{ + return rb_const_location(klass, id, TRUE, FALSE, FALSE); } /* @@ -2386,8 +2827,7 @@ rb_mod_remove_const(VALUE mod, VALUE name) const ID id = id_for_var(mod, name, a, constant); if (!id) { - rb_name_err_raise("constant %2$s::%1$s not defined", - mod, name); + undefined_constant(mod, name); } return rb_const_remove(mod, id); } @@ -2405,8 +2845,7 @@ rb_const_remove(VALUE mod, ID id) rb_name_err_raise("cannot remove %2$s::%1$s", mod, ID2SYM(id)); } - rb_name_err_raise("constant %2$s::%1$s not defined", - mod, ID2SYM(id)); + undefined_constant(mod, ID2SYM(id)); } rb_clear_constant_cache(); @@ -2457,8 +2896,13 @@ rb_local_constants(VALUE mod) if (!tbl) return rb_ary_new2(0); - ary = rb_ary_new2(rb_id_table_size(tbl)); - rb_id_table_foreach(tbl, rb_local_constants_i, (void *)ary); + RB_VM_LOCK_ENTER(); + { + ary = rb_ary_new2(rb_id_table_size(tbl)); + rb_id_table_foreach(tbl, rb_local_constants_i, (void *)ary); + } + RB_VM_LOCK_LEAVE(); + return ary; } @@ -2470,7 +2914,11 @@ rb_mod_const_at(VALUE mod, void *data) tbl = st_init_numtable(); } if (RCLASS_CONST_TBL(mod)) { - rb_id_table_foreach(RCLASS_CONST_TBL(mod), sv_i, tbl); + RB_VM_LOCK_ENTER(); + { + rb_id_table_foreach(RCLASS_CONST_TBL(mod), sv_i, tbl); + } + RB_VM_LOCK_LEAVE(); } return tbl; } @@ -2526,22 +2974,17 @@ rb_const_list(void *data) * IO.constants.include?(:SYNC) #=> true * IO.constants(false).include?(:SYNC) #=> false * - * Also see <code>Module::const_defined?</code>. + * Also see Module#const_defined?. */ VALUE rb_mod_constants(int argc, const VALUE *argv, VALUE mod) { - VALUE inherit; + bool inherit = true; - if (argc == 0) { - inherit = Qtrue; - } - else { - rb_scan_args(argc, argv, "01", &inherit); - } + if (rb_check_arity(argc, 0, 1)) inherit = RTEST(argv[0]); - if (RTEST(inherit)) { + if (inherit) { return rb_const_list(rb_mod_const_of(mod, 0)); } else { @@ -2566,6 +3009,11 @@ rb_const_defined_0(VALUE klass, ID id, int exclude, int recurse, int visibility) if (ce->value == Qundef && !check_autoload_required(tmp, id, 0) && !rb_autoloading_value(tmp, id, NULL, NULL)) return (int)Qfalse; + + if (exclude && tmp == rb_cObject && klass != rb_cObject) { + return (int)Qfalse; + } + return (int)Qtrue; } if (!recurse) break; @@ -2597,93 +3045,136 @@ rb_const_defined_at(VALUE klass, ID id) return rb_const_defined_0(klass, id, TRUE, FALSE, FALSE); } -int +MJIT_FUNC_EXPORTED int rb_public_const_defined_from(VALUE klass, ID id) { return rb_const_defined_0(klass, id, TRUE, TRUE, TRUE); } -int -rb_public_const_defined(VALUE klass, ID id) +static void +check_before_mod_set(VALUE klass, ID id, VALUE val, const char *dest) { - return rb_const_defined_0(klass, id, FALSE, TRUE, TRUE); + rb_check_frozen(klass); } -int -rb_public_const_defined_at(VALUE klass, ID id) +static void set_namespace_path(VALUE named_namespace, VALUE name); + +static enum rb_id_table_iterator_result +set_namespace_path_i(ID id, VALUE v, void *payload) { - return rb_const_defined_0(klass, id, TRUE, FALSE, TRUE); + rb_const_entry_t *ce = (rb_const_entry_t *)v; + VALUE value = ce->value; + int has_permanent_classpath; + VALUE parental_path = *((VALUE *) payload); + if (!rb_is_const_id(id) || !rb_namespace_p(value)) { + return ID_TABLE_CONTINUE; + } + classname(value, &has_permanent_classpath); + if (has_permanent_classpath) { + return ID_TABLE_CONTINUE; + } + set_namespace_path(value, build_const_path(parental_path, id)); + if (RCLASS_IV_TBL(value)) { + st_data_t tmp = tmp_classpath; + st_delete(RCLASS_IV_TBL(value), &tmp, 0); + } + + return ID_TABLE_CONTINUE; } +/* + * Assign permanent classpaths to all namespaces that are directly or indirectly + * nested under +named_namespace+. +named_namespace+ must have a permanent + * classpath. + */ static void -check_before_mod_set(VALUE klass, ID id, VALUE val, const char *dest) +set_namespace_path(VALUE named_namespace, VALUE namespace_path) { - rb_check_frozen(klass); + struct rb_id_table *const_table = RCLASS_CONST_TBL(named_namespace); + + RB_VM_LOCK_ENTER(); + { + rb_class_ivar_set(named_namespace, classpath, namespace_path); + if (const_table) { + rb_id_table_foreach(const_table, set_namespace_path_i, &namespace_path); + } + } + RB_VM_LOCK_LEAVE(); } void rb_const_set(VALUE klass, ID id, VALUE val) { rb_const_entry_t *ce; - struct rb_id_table *tbl = RCLASS_CONST_TBL(klass); if (NIL_P(klass)) { rb_raise(rb_eTypeError, "no class/module to define constant %"PRIsVALUE"", QUOTE_ID(id)); } - check_before_mod_set(klass, id, val, "constant"); - if (!tbl) { - RCLASS_CONST_TBL(klass) = tbl = rb_id_table_create(0); - rb_clear_constant_cache(); - ce = ZALLOC(rb_const_entry_t); - rb_id_table_insert(tbl, id, (VALUE)ce); - setup_const_entry(ce, klass, val, CONST_PUBLIC); + if (!rb_ractor_main_p() && !rb_ractor_shareable_p(val)) { + rb_raise(rb_eRactorIsolationError, "can not set constants with non-shareable objects by non-main Ractors"); } - else { - struct autoload_const_set_args args; - args.mod = klass; - args.id = id; - args.value = val; - args.flag = CONST_PUBLIC; - const_tbl_update(&args); + + check_before_mod_set(klass, id, val, "constant"); + + RB_VM_LOCK_ENTER(); + { + struct rb_id_table *tbl = RCLASS_CONST_TBL(klass); + if (!tbl) { + RCLASS_CONST_TBL(klass) = tbl = rb_id_table_create(0); + rb_clear_constant_cache(); + ce = ZALLOC(rb_const_entry_t); + rb_id_table_insert(tbl, id, (VALUE)ce); + setup_const_entry(ce, klass, val, CONST_PUBLIC); + } + else { + struct autoload_const ac = { + .mod = klass, .id = id, + .value = val, .flag = CONST_PUBLIC, + /* fill the rest with 0 */ + }; + const_tbl_update(&ac); + } } + RB_VM_LOCK_LEAVE(); + /* * Resolve and cache class name immediately to resolve ambiguity * and avoid order-dependency on const_tbl */ - if (rb_cObject && (RB_TYPE_P(val, T_MODULE) || RB_TYPE_P(val, T_CLASS))) { - if (NIL_P(rb_class_path_cached(val))) { + if (rb_cObject && rb_namespace_p(val)) { + int val_path_permanent; + VALUE val_path = classname(val, &val_path_permanent); + if (NIL_P(val_path) || !val_path_permanent) { if (klass == rb_cObject) { - rb_ivar_set(val, classpath, rb_id2str(id)); - rb_name_class(val, id); + set_namespace_path(val, rb_id2str(id)); } else { - VALUE path; - ID pathid; - st_data_t n; - st_table *ivtbl = RCLASS_IV_TBL(klass); - if (ivtbl && - (st_lookup(ivtbl, (st_data_t)(pathid = classpath), &n) || - st_lookup(ivtbl, (st_data_t)(pathid = tmp_classpath), &n))) { - path = rb_str_dup((VALUE)n); - rb_str_append(rb_str_cat2(path, "::"), rb_id2str(id)); - OBJ_FREEZE(path); - rb_ivar_set(val, pathid, path); - rb_name_class(val, id); - } + int parental_path_permanent; + VALUE parental_path = classname(klass, &parental_path_permanent); + if (NIL_P(parental_path)) { + int throwaway; + parental_path = rb_tmp_class_path(klass, &throwaway, make_temporary_path); + } + if (parental_path_permanent && !val_path_permanent) { + set_namespace_path(val, build_const_path(parental_path, id)); + } + else if (!parental_path_permanent && NIL_P(val_path)) { + ivar_set(val, tmp_classpath, build_const_path(parental_path, id)); + } } } } } static struct autoload_data_i * -current_autoload_data(VALUE mod, ID id) +current_autoload_data(VALUE mod, ID id, struct autoload_const **acp) { struct autoload_data_i *ele; VALUE load = autoload_data(mod, id); if (!load) return 0; - ele = check_autoload_data(load); + ele = get_autoload_data(load, acp); if (!ele) return 0; /* for autoloading thread, keep the defined value to autoloading storage */ if (ele->state && (ele->state->thread == rb_thread_current())) { @@ -2693,29 +3184,36 @@ current_autoload_data(VALUE mod, ID id) } static void -const_tbl_update(struct autoload_const_set_args *args) +const_tbl_update(struct autoload_const *ac) { VALUE value; - VALUE klass = args->mod; - VALUE val = args->value; - ID id = args->id; + VALUE klass = ac->mod; + VALUE val = ac->value; + ID id = ac->id; struct rb_id_table *tbl = RCLASS_CONST_TBL(klass); - rb_const_flag_t visibility = args->flag; + rb_const_flag_t visibility = ac->flag; rb_const_entry_t *ce; if (rb_id_table_lookup(tbl, id, &value)) { ce = (rb_const_entry_t *)value; if (ce->value == Qundef) { - struct autoload_data_i *ele = current_autoload_data(klass, id); + struct autoload_data_i *ele = current_autoload_data(klass, id, &ac); if (ele) { rb_clear_constant_cache(); - ele->value = val; /* autoload_i is non-WB-protected */ - return; + ac->value = val; /* autoload_i is non-WB-protected */ + ac->file = rb_source_location(&ac->line); } - /* otherwise, allow to override */ - autoload_delete(klass, id); + else { + /* otherwise autoloaded constant, allow to override */ + autoload_delete(klass, id); + ce->flag = visibility; + RB_OBJ_WRITE(klass, &ce->value, val); + RB_OBJ_WRITE(klass, &ce->file, ac->file); + ce->line = ac->line; + } + return; } else { VALUE name = QUOTE_ID(id); @@ -2759,6 +3257,7 @@ rb_define_const(VALUE klass, const char *name, VALUE val) if (!rb_is_const_id(id)) { rb_warn("rb_define_const: invalid name `%s' for constant", name); } + rb_gc_register_mark_object(val); rb_const_set(klass, id, val); } @@ -2776,7 +3275,7 @@ set_const_visibility(VALUE mod, int argc, const VALUE *argv, rb_const_entry_t *ce; ID id; - rb_frozen_class_p(mod); + rb_class_modify_check(mod); if (argc == 0) { rb_warning("%"PRIsVALUE" with no argument is just ignored", QUOTE_ID(rb_frame_callee())); @@ -2784,6 +3283,7 @@ set_const_visibility(VALUE mod, int argc, const VALUE *argv, } for (i = 0; i < argc; i++) { + struct autoload_const *ac; VALUE val = argv[i]; id = rb_check_id(&val); if (!id) { @@ -2791,17 +3291,18 @@ set_const_visibility(VALUE mod, int argc, const VALUE *argv, rb_clear_constant_cache(); } - rb_name_err_raise("constant %2$s::%1$s not defined", - mod, val); + undefined_constant(mod, val); } if ((ce = rb_const_lookup(mod, id))) { ce->flag &= ~mask; ce->flag |= flag; if (ce->value == Qundef) { - struct autoload_data_i *ele = current_autoload_data(mod, id); + struct autoload_data_i *ele; + + ele = current_autoload_data(mod, id, &ac); if (ele) { - ele->flag &= ~mask; - ele->flag |= flag; + ac->flag &= ~mask; + ac->flag |= flag; } } } @@ -2809,8 +3310,7 @@ set_const_visibility(VALUE mod, int argc, const VALUE *argv, if (i > 0) { rb_clear_constant_cache(); } - rb_name_err_raise("constant %2$s::%1$s not defined", - mod, ID2SYM(id)); + undefined_constant(mod, ID2SYM(id)); } } rb_clear_constant_cache(); @@ -2823,11 +3323,12 @@ rb_deprecate_constant(VALUE mod, const char *name) ID id; long len = strlen(name); - rb_frozen_class_p(mod); - if (!(id = rb_check_id_cstr(name, len, NULL)) || - !(ce = rb_const_lookup(mod, id))) { - rb_name_err_raise("constant %2$s::%1$s not defined", - mod, rb_fstring_new(name, len)); + rb_class_modify_check(mod); + if (!(id = rb_check_id_cstr(name, len, NULL))) { + undefined_constant(mod, rb_fstring_new(name, len)); + } + if (!(ce = rb_const_lookup(mod, id))) { + undefined_constant(mod, ID2SYM(id)); } ce->flag |= CONST_DEPRECATED; } @@ -2864,7 +3365,19 @@ rb_mod_public_constant(int argc, const VALUE *argv, VALUE obj) * call-seq: * mod.deprecate_constant(symbol, ...) => mod * - * Makes a list of existing constants deprecated. + * Makes a list of existing constants deprecated. Attempt + * to refer to them will produce a warning. + * + * module HTTP + * NotFound = Exception.new + * NOT_FOUND = NotFound # previous version of the library used this name + * + * deprecate_constant :NOT_FOUND + * end + * + * HTTP::NOT_FOUND + * # warning: constant HTTP::NOT_FOUND is deprecated + * */ VALUE @@ -2894,13 +3407,55 @@ cvar_front_klass(VALUE klass) { if (FL_TEST(klass, FL_SINGLETON)) { VALUE obj = rb_ivar_get(klass, id__attached__); - if (RB_TYPE_P(obj, T_MODULE) || RB_TYPE_P(obj, T_CLASS)) { + if (rb_namespace_p(obj)) { return obj; } } return RCLASS_SUPER(klass); } +static void +cvar_overtaken(VALUE front, VALUE target, ID id) +{ + if (front && target != front) { + st_data_t did = (st_data_t)id; + + if (original_module(front) != original_module(target)) { + rb_raise(rb_eRuntimeError, + "class variable % "PRIsVALUE" of %"PRIsVALUE" is overtaken by %"PRIsVALUE"", + ID2SYM(id), rb_class_name(original_module(front)), + rb_class_name(original_module(target))); + } + if (BUILTIN_TYPE(front) == T_CLASS) { + st_delete(RCLASS_IV_TBL(front), &did, 0); + } + } +} + +static VALUE +find_cvar(VALUE klass, VALUE * front, VALUE * target, ID id) +{ + VALUE v = Qundef; + CVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(); + if (cvar_lookup_at(klass, id, (&v))) { + if (!*front) { + *front = klass; + } + *target = klass; + } + + for (klass = cvar_front_klass(klass); klass; klass = RCLASS_SUPER(klass)) { + if (cvar_lookup_at(klass, id, (&v))) { + if (!*front) { + *front = klass; + } + *target = klass; + } + } + + return v; +} + #define CVAR_FOREACH_ANCESTORS(klass, v, r) \ for (klass = cvar_front_klass(klass); klass; klass = RCLASS_SUPER(klass)) { \ if (cvar_lookup_at(klass, id, (v))) { \ @@ -2909,10 +3464,25 @@ cvar_front_klass(VALUE klass) } #define CVAR_LOOKUP(v,r) do {\ + CVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(); \ if (cvar_lookup_at(klass, id, (v))) {r;}\ CVAR_FOREACH_ANCESTORS(klass, v, r);\ } while(0) +static void +check_for_cvar_table(VALUE subclass, VALUE key) +{ + st_table *tbl = RCLASS_IV_TBL(subclass); + + if (tbl && st_lookup(tbl, key, NULL)) { + RB_DEBUG_COUNTER_INC(cvar_class_invalidate); + ruby_vm_global_cvar_state++; + return; + } + + rb_class_foreach_subclass(subclass, check_for_cvar_table, key); +} + void rb_cvar_set(VALUE klass, ID id, VALUE val) { @@ -2921,59 +3491,76 @@ rb_cvar_set(VALUE klass, ID id, VALUE val) tmp = klass; CVAR_LOOKUP(0, {if (!front) front = klass; target = klass;}); if (target) { - if (front && target != front) { - st_data_t did = id; - - if (RTEST(ruby_verbose)) { - rb_warning("class variable %"PRIsVALUE" of %"PRIsVALUE" is overtaken by %"PRIsVALUE"", - QUOTE_ID(id), rb_class_name(original_module(front)), - rb_class_name(original_module(target))); - } - if (BUILTIN_TYPE(front) == T_CLASS) { - st_delete(RCLASS_IV_TBL(front),&did,0); - } - } + cvar_overtaken(front, target, id); } else { target = tmp; } + if (RB_TYPE_P(target, T_ICLASS)) { + target = RBASIC(target)->klass; + } check_before_mod_set(target, id, val, "class variable"); - if (!RCLASS_IV_TBL(target)) { - RCLASS_IV_TBL(target) = st_init_numtable(); + + int result = rb_class_ivar_set(target, id, val); + + struct rb_id_table *rb_cvc_tbl = RCLASS_CVC_TBL(target); + + if (!rb_cvc_tbl) { + rb_cvc_tbl = RCLASS_CVC_TBL(target) = rb_id_table_create(2); } - rb_class_ivar_set(target, id, val); + struct rb_cvar_class_tbl_entry *ent; + VALUE ent_data; + + if (!rb_id_table_lookup(rb_cvc_tbl, id, &ent_data)) { + ent = ALLOC(struct rb_cvar_class_tbl_entry); + ent->class_value = target; + ent->global_cvar_state = GET_GLOBAL_CVAR_STATE(); + ent->cref = 0; + rb_id_table_insert(rb_cvc_tbl, id, (VALUE)ent); + RB_DEBUG_COUNTER_INC(cvar_inline_miss); + } + else { + ent = (void *)ent_data; + ent->global_cvar_state = GET_GLOBAL_CVAR_STATE(); + } + + // Break the cvar cache if this is a new class variable + // and target is a module or a subclass with the same + // cvar in this lookup. + if (result == 0) { + if (RB_TYPE_P(target, T_CLASS)) { + if (RCLASS_SUBCLASSES(target)) { + rb_class_foreach_subclass(target, check_for_cvar_table, id); + } + } + } } VALUE -rb_cvar_get(VALUE klass, ID id) +rb_cvar_find(VALUE klass, ID id, VALUE *front) { - VALUE tmp, front = 0, target = 0; - st_data_t value; + VALUE target = 0; + VALUE value; - tmp = klass; - CVAR_LOOKUP(&value, {if (!front) front = klass; target = klass;}); + value = find_cvar(klass, front, &target, id); if (!target) { rb_name_err_raise("uninitialized class variable %1$s in %2$s", - tmp, ID2SYM(id)); - } - if (front && target != front) { - st_data_t did = id; - - if (RTEST(ruby_verbose)) { - rb_warning("class variable %"PRIsVALUE" of %"PRIsVALUE" is overtaken by %"PRIsVALUE"", - QUOTE_ID(id), rb_class_name(original_module(front)), - rb_class_name(original_module(target))); - } - if (BUILTIN_TYPE(front) == T_CLASS) { - st_delete(RCLASS_IV_TBL(front),&did,0); - } + klass, ID2SYM(id)); } + cvar_overtaken(*front, target, id); return (VALUE)value; } VALUE +rb_cvar_get(VALUE klass, ID id) +{ + VALUE front = 0; + return rb_cvar_find(klass, id, &front); +} + +VALUE rb_cvar_defined(VALUE klass, ID id) { if (!klass) return Qfalse; @@ -3009,8 +3596,7 @@ rb_cv_get(VALUE klass, const char *name) void rb_define_class_variable(VALUE klass, const char *name, VALUE val) { - ID id = cv_intern(klass, name); - rb_cvar_set(klass, id, val); + rb_cv_set(klass, name, val); } static int @@ -3042,6 +3628,12 @@ static void* mod_cvar_of(VALUE mod, void *data) { VALUE tmp = mod; + if (FL_TEST(mod, FL_SINGLETON)) { + if (rb_namespace_p(rb_ivar_get(mod, id__attached__))) { + data = mod_cvar_at(tmp, data); + tmp = cvar_front_klass(tmp); + } + } for (;;) { data = mod_cvar_at(tmp, data); tmp = RCLASS_SUPER(tmp); @@ -3095,16 +3687,11 @@ cvar_list(void *data) VALUE rb_mod_class_variables(int argc, const VALUE *argv, VALUE mod) { - VALUE inherit; + bool inherit = true; st_table *tbl; - if (argc == 0) { - inherit = Qtrue; - } - else { - rb_scan_args(argc, argv, "01", &inherit); - } - if (RTEST(inherit)) { + if (rb_check_arity(argc, 0, 1)) inherit = RTEST(argv[0]); + if (inherit) { tbl = mod_cvar_of(mod, 0); } else { @@ -3117,13 +3704,12 @@ rb_mod_class_variables(int argc, const VALUE *argv, VALUE mod) * call-seq: * remove_class_variable(sym) -> obj * - * Removes the definition of the <i>sym</i>, returning that - * constant's value. + * Removes the named class variable from the receiver, returning that + * variable's value. * - * class Dummy + * class Example * @@var = 99 - * puts @@var - * remove_class_variable(:@@var) + * puts remove_class_variable(:@@var) * p(defined? @@var) * end * @@ -3140,9 +3726,7 @@ rb_mod_remove_cvar(VALUE mod, VALUE name) st_data_t val, n = id; if (!id) { - not_defined: - rb_name_err_raise("class variable %1$s not defined for %2$s", - mod, name); + goto not_defined; } rb_check_frozen(mod); if (RCLASS_IV_TBL(mod) && st_delete(RCLASS_IV_TBL(mod), &n, &val)) { @@ -3151,14 +3735,20 @@ rb_mod_remove_cvar(VALUE mod, VALUE name) if (rb_cvar_defined(mod, id)) { rb_name_err_raise("cannot remove %1$s for %2$s", mod, ID2SYM(id)); } - goto not_defined; + not_defined: + rb_name_err_raise("class variable %1$s not defined for %2$s", + mod, name); + UNREACHABLE_RETURN(Qundef); } VALUE rb_iv_get(VALUE obj, const char *name) { - ID id = rb_intern(name); + ID id = rb_check_id_cstr(name, strlen(name), rb_usascii_encoding()); + if (!id) { + return Qnil; + } return rb_ivar_get(obj, id); } @@ -3174,8 +3764,12 @@ rb_iv_set(VALUE obj, const char *name, VALUE val) int rb_class_ivar_set(VALUE obj, ID key, VALUE value) { + if (!RCLASS_IV_TBL(obj)) { + RCLASS_IV_TBL(obj) = st_init_numtable(); + } + st_table *tbl = RCLASS_IV_TBL(obj); - int result = st_insert(tbl, (st_data_t)key, (st_data_t)value); + int result = lock_st_insert(tbl, (st_data_t)key, (st_data_t)value); RB_OBJ_WRITTEN(obj, Qundef, value); return result; } @@ -3187,22 +3781,30 @@ tbl_copy_i(st_data_t key, st_data_t value, st_data_t data) return ST_CONTINUE; } -st_table * -rb_st_copy(VALUE obj, struct st_table *orig_tbl) +void +rb_iv_tbl_copy(VALUE dst, VALUE src) { + st_table *orig_tbl = RCLASS_IV_TBL(src); st_table *new_tbl = st_copy(orig_tbl); - st_foreach(new_tbl, tbl_copy_i, (st_data_t)obj); - return new_tbl; + st_foreach(new_tbl, tbl_copy_i, (st_data_t)dst); + RCLASS_IV_TBL(dst) = new_tbl; } -rb_const_entry_t * +MJIT_FUNC_EXPORTED rb_const_entry_t * rb_const_lookup(VALUE klass, ID id) { struct rb_id_table *tbl = RCLASS_CONST_TBL(klass); - VALUE val; - if (tbl && rb_id_table_lookup(tbl, id, &val)) { - return (rb_const_entry_t *)val; + if (tbl) { + VALUE val; + bool r; + RB_VM_LOCK_ENTER(); + { + r = rb_id_table_lookup(tbl, id, &val); + } + RB_VM_LOCK_LEAVE(); + + if (r) return (rb_const_entry_t *)val; } - return 0; + return NULL; } |