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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@57229 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 1 deletions

diff --git a/eval.c b/eval.c
index fbd28565ed..43d1948f2f 100644
--- a/eval.c
+++ b/eval.c
@@ -466,8 +466,11 @@ exc_setup_cause(VALUE exc, VALUE cause)
 	}
     }
 #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;
 }