summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-04 02:02:32 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-04 02:02:32 +0000
commitffb1a5d8017a5b331c26f2df985e8cf8fb0bf9e6 (patch)
treec208d8e3c34d519de7c5654a7990f97b91697021 /eval.c
parentd785c36b885f2cee8353954b87cf5624d387a769 (diff)
Revert r57229 and finally giving up backporting [Bug #13043]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@57263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/eval.c b/eval.c
index 43d1948f2f..fbd28565ed 100644
--- a/eval.c
+++ b/eval.c
@@ -466,11 +466,8 @@ exc_setup_cause(VALUE exc, VALUE cause)
}
}
#endif
- if (!NIL_P(cause) && cause != exc && BUILTIN_TYPE(cause) != T_NODE) {
+ 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;
}