summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-02-04 06:21:49 (GMT)
committerNARUSE, Yui <naruse@airemix.jp>2020-03-13 13:34:09 (GMT)
commitc7e0ce67430b5e312eb626a2c2f4b6a810b3b68b (patch)
treea0ad092c4501cfde64795ab3ef7dd01c7b452965
parent7518b4e945675df9aca223c30ca711e1d82341ec (diff)
Add the loaded feature after no exception raised
Retrying after rescued `require` should try to load the same library again. [Bug #16607] (cherry picked from commit 7d6903dc476f982e7b432adbeef3a3d9372a309f)
-rw-r--r--load.c3
-rw-r--r--test/ruby/test_require.rb7
2 files changed, 8 insertions, 2 deletions
diff --git a/load.c b/load.c
index fda100f..07acc9a 100644
--- a/load.c
+++ b/load.c
@@ -1007,7 +1007,6 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception)
result = 0;
}
else if (!*ftptr) {
- rb_provide_feature(path);
result = TAG_RETURN;
}
else {
@@ -1022,7 +1021,6 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception)
rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
break;
}
- rb_provide_feature(path);
result = TAG_RETURN;
}
}
@@ -1056,6 +1054,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception)
rb_exc_raise(ec->errinfo);
}
+ if (result == TAG_RETURN) rb_provide_feature(path);
ec->errinfo = errinfo;
RUBY_DTRACE_HOOK(REQUIRE_RETURN, RSTRING_PTR(fname));
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 05dc18c..a86ea35 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -214,6 +214,13 @@ class TestRequire < Test::Unit::TestCase
assert_syntax_error_backtrace {|req| require req}
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
assert_syntax_error_backtrace {|req| load req}
end