summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-06 15:52:16 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-06 15:52:16 +0000
commit783f1b29087f4e8f11b873c1657dd927b0ecdd49 (patch)
treebaa653a657d0d9a9b96e101813c5fa61655e7db9 /eval.c
parent218ac97bd87c490e46a0dffb6d9dcfdb1374ffca (diff)
merge revision(s) 65554: [Backport #15282]
Don't set throw data as cause [Bug #15282] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@65582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/eval.c b/eval.c
index 3fa538e112..d2860d09d0 100644
--- a/eval.c
+++ b/eval.c
@@ -516,7 +516,7 @@ setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE
mesg = rb_obj_dup(mesg);
}
}
- if (cause != Qundef) {
+ if (cause != Qundef && !THROW_DATA_P(cause)) {
exc_setup_cause(mesg, cause);
}
if (NIL_P(bt)) {