summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--thread.c11
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index acc5c4e..a7ccb6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 10 17:27:27 2015 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c (thread_join): Fixnum (except TAG_FATAL) and
+ NODE should not be reached here.
+
Mon Mar 9 21:42:10 2015 Koichi Sasada <ko1@atdot.net>
* vm_insnhelper.c (ep_cref): rename to lep_cref() because it should be
diff --git a/thread.c b/thread.c
index e1bed76..0cfb4e7 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 */