diff options
author | nagachika <nagachika@ruby-lang.org> | 2022-03-13 15:16:29 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2022-03-13 15:16:29 +0900 |
commit | 0bd3e436e27c048933133bc19f863c954ed3e3a6 (patch) | |
tree | 17536144433b3ab682b38a768ca937e37def0268 /load.c | |
parent | f4f0c793f6eb427b0a85445bff49fdc6b73447ae (diff) |
merge revision(s) c79d2e54748f52c5023b0a1ee441561df9826c17: [Backport #18562]
Fix TAG_THROW through require [Bug #18562]
Previously this was being incorrectly swapped with TAG_RAISE in the next
line. This would end up checking the T_IMEMO throw_data to the exception
handling (which calls Module#===). This happened to not break existing
tests because Module#=== returned false when klass is NULL.
This commit handles throw from require correctly by jumping to the tag
retaining the TAG_THROW state.
---
load.c | 2 +-
test/ruby/test_exception.rb | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
Diffstat (limited to 'load.c')
-rw-r--r-- | load.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1131,7 +1131,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception) if (ftptr) load_unlock(RSTRING_PTR(path), !state); if (state) { - if (state == TAG_FATAL) { + if (state == TAG_FATAL || state == TAG_THROW) { EC_JUMP_TAG(ec, state); } else if (exception) { |