diff --git a/ext/-test-/load/protect/extconf.rb b/ext/-test-/load/protect/extconf.rb new file mode 100644 index 0000000000..83c080de9c --- /dev/null +++ b/ext/-test-/load/protect/extconf.rb @@ -0,0 +1 @@ +create_makefile('-test-/load/protect') diff --git a/ext/-test-/load/protect/protect.c b/ext/-test-/load/protect/protect.c new file mode 100644 index 0000000000..ccfbbb9ea0 --- /dev/null +++ b/ext/-test-/load/protect/protect.c @@ -0,0 +1,19 @@ +#include + +static VALUE +load_protect(int argc, VALUE *argv, VALUE self) +{ + int state; + VALUE path, wrap; + rb_scan_args(argc, argv, "11", &path, &wrap); + rb_load_protect(path, RTEST(wrap), &state); + if (state) rb_jump_tag(state); + return Qnil; +} + +void +Init_protect(void) +{ + VALUE mod = rb_define_module("Bug"); + rb_define_singleton_method(mod, "load_protect", load_protect, -1); +} diff --git a/load.c b/load.c index 1d3ff23d55..eec5e98947 100644 --- a/load.c +++ b/load.c @@ -677,7 +677,7 @@ rb_load_protect(VALUE fname, int wrap, int *pstate) } POP_TAG(); - if (state != TAG_NONE) state = rb_load_internal0(GET_THREAD(), path, wrap); + if (state == TAG_NONE) state = rb_load_internal0(GET_THREAD(), path, wrap); if (state != TAG_NONE) *pstate = state; } diff --git a/test/-ext-/load/script.rb b/test/-ext-/load/script.rb new file mode 100644 index 0000000000..4bc2480587 --- /dev/null +++ b/test/-ext-/load/script.rb @@ -0,0 +1,2 @@ +# frozen_string_literal: true +raise "foo" diff --git a/test/-ext-/load/test_protect.rb b/test/-ext-/load/test_protect.rb new file mode 100644 index 0000000000..83b179b34c --- /dev/null +++ b/test/-ext-/load/test_protect.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true +require 'test/unit' +require '-test-/load/protect' + +class Test_Load_Protect < Test::Unit::TestCase + def test_load_protect + assert_raise(LoadError) { + Bug.load_protect(__dir__+"/nonexistent.rb") + } + assert_raise_with_message(RuntimeError, "foo") { + Bug.load_protect(__dir__+"/script.rb") + } + end +end