merge revision(s) 56363,56365: [Backport #12811]

	* load.c (rb_require_safe): SyntaxError created by the parser just
	  has the mesage and needs to set up the backtrace.
	  [ruby-core:77491] [Bug #12811]
	  has the message and needs to set up the backtrace.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 0 deletions

diff --git a/load.c b/load.c
index 4558e2c6fd..70c734595e 100644
--- a/load.c
+++ b/load.c
@@ -1043,6 +1043,7 @@ rb_require_safe(VALUE fname, int safe)
     int result = rb_require_internal(fname, safe);
 
     if (result > TAG_RETURN) {
+	if (result == TAG_RAISE) rb_exc_raise(rb_errinfo());
 	JUMP_TAG(result);
     }
     if (result < 0) {