usa	2016-12-29 06:00:45 +0900 (Thu, 29 Dec 2016)

  New Revision: 57229

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

  Log:
    merge revision(s) 57137: [Backport #13043]
    
    eval.c: fix circular cause
    
    * eval.c (exc_setup_cause): always set cause of cause to get rid
      of circular references.  [ruby-core:78688] [Bug #13043]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/eval.c
    branches/ruby_2_2/test/ruby/test_exception.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 57228)
+++ ruby_2_2/version.h	(revision 57229)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.7"
-#define RUBY_RELEASE_DATE "2016-12-27"
-#define RUBY_PATCHLEVEL 416
+#define RUBY_RELEASE_DATE "2016-12-29"
+#define RUBY_PATCHLEVEL 417
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 29
 
 #include "ruby/version.h"
 
Index: ruby_2_2/test/ruby/test_exception.rb
===================================================================
--- ruby_2_2/test/ruby/test_exception.rb	(revision 57228)
+++ ruby_2_2/test/ruby/test_exception.rb	(revision 57229)
@@ -717,6 +717,26 @@ end.join https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_exception.rb#L717
     assert_equal({}, e.arg, bug)
   end
 
+  def test_circular_cause
+    bug13043 = '[ruby-core:78688] [Bug #13043]'
+    begin
+      begin
+        raise "error 1"
+      ensure
+        orig_error = $!
+        begin
+          raise "error 2"
+        rescue => err
+          raise orig_error
+        end
+      end
+    rescue => x
+    end
+    assert_equal(orig_error, x)
+    assert_equal(orig_error, err.cause)
+    assert_nil(orig_error.cause, bug13043)
+  end
+
   def test_anonymous_message
     assert_in_out_err([], "raise Class.new(RuntimeError), 'foo'", [], /foo\n/)
   end
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 57228)
+++ ruby_2_2/ChangeLog	(revision 57229)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu Dec 29 06:00:08 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval.c (exc_setup_cause): always set cause of cause to get rid
+	  of circular references.  [ruby-core:78688] [Bug #13043]
+
 Tue Dec 27 20:43:54 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* time.c (usec2subsecx): fix return type, which is a numeric object but
Index: ruby_2_2/eval.c
===================================================================
--- ruby_2_2/eval.c	(revision 57228)
+++ ruby_2_2/eval.c	(revision 57229)
@@ -466,8 +466,11 @@ exc_setup_cause(VALUE exc, VALUE cause) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/eval.c#L466
 	}
     }
 #endif
-    if (!NIL_P(cause) && cause != exc) {
+    if (!NIL_P(cause) && cause != exc && BUILTIN_TYPE(cause) != T_NODE) {
 	rb_ivar_set(exc, id_cause, cause);
+	if (!rb_ivar_defined(cause, id_cause)) {
+	    rb_ivar_set(cause, id_cause, Qnil);
+	}
     }
     return exc;
 }

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57137


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