nagachika	2017-02-08 02:39:54 +0900 (Wed, 08 Feb 2017)

  New Revision: 57572

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57572

  Log:
    merge revision(s) 57368: [Backport #12613]
    
    compile.c: check err_info
    
    * compile.c (iseq_setup): bail out if any errors found.
      [ruby-core:76531] [Bug #12613]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/compile.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 57571)
+++ ruby_2_3/version.h	(revision 57572)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.3"
 #define RUBY_RELEASE_DATE "2017-02-08"
-#define RUBY_PATCHLEVEL 244
+#define RUBY_PATCHLEVEL 245
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_3/compile.c
===================================================================
--- ruby_2_3/compile.c	(revision 57571)
+++ ruby_2_3/compile.c	(revision 57572)
@@ -544,9 +544,6 @@ validate_labels(rb_iseq_t *iseq, st_tabl https://github.com/ruby/ruby/blob/trunk/ruby_2_3/compile.c#L544
 {
     st_foreach(labels_table, validate_label, (st_data_t)iseq);
     st_free_table(labels_table);
-    if (!NIL_P(ISEQ_COMPILE_DATA(iseq)->err_info)) {
-	rb_exc_raise(ISEQ_COMPILE_DATA(iseq)->err_info);
-    }
 }
 
 VALUE
@@ -1108,6 +1105,9 @@ new_child_iseq(rb_iseq_t *iseq, NODE *no https://github.com/ruby/ruby/blob/trunk/ruby_2_3/compile.c#L1105
 static int
 iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 {
+    if (RTEST(ISEQ_COMPILE_DATA(iseq)->err_info))
+	return COMPILE_NG;
+
     /* debugs("[compile step 2] (iseq_array_to_linkedlist)\n"); */
 
     if (compile_debug > 5)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57368


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/