usa	2016-12-27 23:59:55 +0900 (Tue, 27 Dec 2016)

  New Revision: 57226

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

  Log:
    revert r57222 because of SEGV

  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/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 57225)
+++ ruby_2_2/ChangeLog	(revision 57226)
@@ -3,11 +3,6 @@ Tue Dec 27 20:43:54 2016  Nobuyoshi Naka https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L3
 	* time.c (usec2subsecx): fix return type, which is a numeric object but
 	  not a long int. [Bug #13066]
 
-Tue Dec 27 20:39:28 2016  Nobuyoshi Nakada  <nobu@r...>
-
-	* eval.c (exc_setup_cause): always set cause of cause to get rid of
-	  circular references. [Bug #13043]
-
 Tue Dec 27 20:13:12 2016  Kazuki Yamaguchi  <k@r...>
 
 	* re.c (match_{names,hash,equal}): consider the case of RMatch::regexp
Index: ruby_2_2/eval.c
===================================================================
--- ruby_2_2/eval.c	(revision 57225)
+++ ruby_2_2/eval.c	(revision 57226)
@@ -468,9 +468,6 @@ exc_setup_cause(VALUE exc, VALUE cause) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/eval.c#L468
 #endif
     if (!NIL_P(cause) && cause != exc) {
 	rb_ivar_set(exc, id_cause, cause);
-	if (!rb_ivar_defined(cause, id_cause)) {
-	    rb_ivar_set(cause, id_cause, Qnil);
-	}
     }
     return exc;
 }
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 57225)
+++ ruby_2_2/version.h	(revision 57226)
@@ -1,6 +1,6 @@ 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 415
+#define RUBY_PATCHLEVEL 416
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 12
Index: ruby_2_2/test/ruby/test_exception.rb
===================================================================
--- ruby_2_2/test/ruby/test_exception.rb	(revision 57225)
+++ ruby_2_2/test/ruby/test_exception.rb	(revision 57226)
@@ -717,26 +717,6 @@ 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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /trunk:r57137


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