diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 3 | ||||
-rw-r--r-- | test/ruby/test_exception.rb | 20 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 1 insertions, 29 deletions
@@ -3,11 +3,6 @@ Tue Dec 27 20:43:54 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * 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@ruby-lang.org> - - * 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@rhe.jp> * re.c (match_{names,hash,equal}): consider the case of RMatch::regexp @@ -468,9 +468,6 @@ exc_setup_cause(VALUE exc, VALUE cause) #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; } diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 0e0179fd5f..3268096463 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -717,26 +717,6 @@ end.join 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 @@ -1,6 +1,6 @@ #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 |