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

Add the loaded feature after no exception raised

Browse Source 
Retrying after rescued `require` should try to load the same
library again.  [Bug #16607]
This commit is contained in:
Nobuyoshi Nakada 2020-02-04 15:21:49 +09:00
parent 9cdc964d07
commit 7d6903dc47
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
Notes: git 2020-02-04 17:09:58 +09:00 
Merged: https://github.com/ruby/ruby/pull/2879
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
load.c
View File

@ -1014,7 +1014,6 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception)
result = 0; result = 0;
} }
else if (!*ftptr) { else if (!*ftptr) {
rb_provide_feature(path);
result = TAG_RETURN; result = TAG_RETURN;
} }
else { else {
@ -1029,7 +1028,6 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception)
rb_ary_push(ruby_dln_librefs, LONG2NUM(handle)); rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
break; break;
} }
rb_provide_feature(path);
result = TAG_RETURN; result = TAG_RETURN;
} }
} }
@ -1063,6 +1061,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception)
rb_exc_raise(ec->errinfo); rb_exc_raise(ec->errinfo);
} }
if (result == TAG_RETURN) rb_provide_feature(path);
ec->errinfo = errinfo; ec->errinfo = errinfo;
RUBY_DTRACE_HOOK(REQUIRE_RETURN, RSTRING_PTR(fname)); RUBY_DTRACE_HOOK(REQUIRE_RETURN, RSTRING_PTR(fname));

7
test/ruby/test_require.rb
View File

@ -216,6 +216,13 @@ class TestRequire < Test::Unit::TestCase
assert_syntax_error_backtrace {|req| require req} assert_syntax_error_backtrace {|req| require req}
end end
def test_require_syntax_error_rescued
assert_syntax_error_backtrace do |req|
assert_raise_with_message(SyntaxError, /unexpected/) {require req}
require req
end
end
def test_load_syntax_error def test_load_syntax_error
assert_syntax_error_backtrace {|req| load req} assert_syntax_error_backtrace {|req| load req}
end end