summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-22 13:08:24 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-22 13:08:24 +0000
commit920736460b687bfd513e83011d9d0e8617335d0a (patch)
tree21cfcaa6cbde2df1ce1a46952db4ad2ae0024a95
parent398581564d155cab50beeb28fbb61fcbb5f4da16 (diff)
* cont.c (rb_fiber_start): unify conditions.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--cont.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b9daf5a5f0..ff08cd1301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 22 22:04:58 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+
+ * cont.c (rb_fiber_start): unify conditions.
+
Sat Dec 22 21:47:55 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* io.c (rb_io_wait_writable): use rb_thread_check_ints() instead
diff --git a/cont.c b/cont.c
index 8521a07d76..1f4c2cfde0 100644
--- a/cont.c
+++ b/cont.c
@@ -1161,10 +1161,7 @@ rb_fiber_start(void)
TH_POP_TAG();
if (state) {
- if (state == TAG_RAISE) {
- rb_threadptr_async_errinfo_enque(th, th->errinfo);
- }
- else if (state == TAG_FATAL) {
+ if (state == TAG_RAISE || state == TAG_FATAL) {
rb_threadptr_async_errinfo_enque(th, th->errinfo);
}
else {