summaryrefslogtreecommitdiff
path: root/load.c
diff options
context:
space:
mode:
authorJean byroot Boussier <jean.boussier+github@shopify.com>2023-02-06 23:30:00 +0100
committerJean Boussier <jean.boussier@gmail.com>2023-02-06 23:30:35 +0100
commitc19defd02665492de7147572714ebe692260c849 (patch)
treeabc68e28c4bc4c09e289ca85e09db8124b4ac8b7 /load.c
parentc30602e64ce437be86180590eee27b0b6ed83a16 (diff)
downloadruby-c19defd02665492de7147572714ebe692260c849.tar.gz
Revert "Only emit circular dependency warning for owned thread shields"
This reverts commit fa49651e05a06512e18ccb2f54a7198c9ff579de.
Diffstat (limited to 'load.c')
-rw-r--r--load.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/load.c b/load.c
index 0f8d63a37f..ce52e5ef60 100644
--- a/load.c
+++ b/load.c
@@ -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);