From a38b2f84f468638bb910455fe618cae4c431d893 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 Sep 2016 08:35:31 +0000
Subject: [PATCH] iseq.c: syntax error in compile_file

* iseq.c (iseqw_s_compile_file): deal with syntax error as well as
  compile, and should not abort when rescued.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              |  5 +++++
 iseq.c                 |  6 ++++--
 test/ruby/test_iseq.rb | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1198afd85b..2b3035dd51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 27 17:35:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (iseqw_s_compile_file): deal with syntax error as well as
+	  compile, and should not abort when rescued.
+
 Tue Sep 27 12:07:17 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/cgi/cookie.rb (parse): don't allow , as a separator. [Bug #12791]
diff --git a/iseq.c b/iseq.c
index 4f8fc29154..07d8828e9b 100644
--- a/iseq.c
+++ b/iseq.c
@@ -823,8 +823,7 @@ static VALUE
 iseqw_s_compile_file(int argc, VALUE *argv, VALUE self)
 {
     VALUE file, line = INT2FIX(1), opt = Qnil;
-    VALUE parser;
-    VALUE f;
+    VALUE parser, f, exc = Qnil;
     NODE *node;
     rb_compile_option_t option;
     int i;
@@ -841,9 +840,12 @@ iseqw_s_compile_file(int argc, VALUE *argv, VALUE self)
     f = rb_file_open_str(file, "r");
 
     parser = rb_parser_new();
+    rb_parser_set_context(parser, NULL, FALSE);
     node = rb_parser_compile_file_path(parser, file, f, NUM2INT(line));
+    if (!node) exc = GET_THREAD()->errinfo;
 
     rb_io_close(f);
+    if (!node) rb_exc_raise(exc);
 
     make_compile_option(&option, opt);
 
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index 94aebe1f90..df71e1821e 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'tempfile'
 
 class TestISeq < Test::Unit::TestCase
   ISeq = RubyVM::InstructionSequence
@@ -243,6 +244,23 @@ class TestISeq < Test::Unit::TestCase
     assert_send([e2, :start_with?, __FILE__])
   end
 
+  def test_compile_file_error
+    Tempfile.create(%w"test_iseq .rb") do |f|
+      f.puts "end"
+      f.close
+      path = f.path
+      assert_in_out_err(%W[- #{path}], "#{<<-"begin;"}\n#{<<-"end;"}", /keyword_end/, [], success: true)
+      begin;
+        path = ARGV[0]
+        begin
+          RubyVM::InstructionSequence.compile_file(path)
+        rescue SyntaxError => e
+          puts e.message
+        end
+      end;
+    end
+  end
+
   def test_translate_by_object
     assert_separately([], <<-"end;")
       class Object