From 04e348e61ad5cfde94311b38c9b4f8581e205c0d Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 10 Mar 2015 08:28:22 +0000 Subject: * thread.c (thread_join): Fixnum (except TAG_FATAL) and NODE should not be reached here. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'thread.c') diff --git a/thread.c b/thread.c index e1bed76cdc..0cfb4e7f94 100644 --- a/thread.c +++ b/thread.c @@ -884,11 +884,16 @@ thread_join(rb_thread_t *target_th, double delay) VALUE err = target_th->errinfo; if (FIXNUM_P(err)) { - /* */ + switch (err) { + case INT2FIX(TAG_FATAL): + /* OK. killed. */ + break; + default: + rb_bug("thread_join: Fixnum (%d) should not reach here.", FIX2INT(err)); + } } else if (RB_TYPE_P(target_th->errinfo, T_NODE)) { - rb_exc_raise(rb_vm_make_jump_tag_but_local_jump( - GET_THROWOBJ_STATE(err), GET_THROWOBJ_VAL(err))); + rb_bug("thread_join: NODE should not reach here."); } else { /* normal exception */ -- cgit v1.2.3