diff options
author | Jean byroot Boussier <jean.boussier+github@shopify.com> | 2023-02-06 23:30:00 +0100 |
---|---|---|
committer | Jean Boussier <jean.boussier@gmail.com> | 2023-02-06 23:30:35 +0100 |
commit | c19defd02665492de7147572714ebe692260c849 (patch) | |
tree | abc68e28c4bc4c09e289ca85e09db8124b4ac8b7 /load.c | |
parent | c30602e64ce437be86180590eee27b0b6ed83a16 (diff) |
Revert "Only emit circular dependency warning for owned thread shields"
This reverts commit fa49651e05a06512e18ccb2f54a7198c9ff579de.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/7256
Diffstat (limited to 'load.c')
-rw-r--r-- | load.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -850,8 +850,7 @@ load_lock(rb_vm_t *vm, const char *ftptr, bool warn) st_insert(loading_tbl, (st_data_t)ftptr, data); return (char *)ftptr; } - - if (warn && rb_thread_shield_owned((VALUE)data)) { + if (warn) { VALUE warning = rb_warning_string("loading in progress, circular require considered harmful - %s", ftptr); rb_backtrace_each(rb_str_append, warning); rb_warning("%"PRIsVALUE, warning); |