summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-11 09:12:45 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-11 09:12:45 +0000
commit542b31ca278ef5b2314ac3186067cda5615b040a (patch)
treeb8501ae7576071544d8175eea5f1f5a0bb480bc3
parent86597752f7724a184319c4a2dc26d6760359cfbd (diff)
* vm_trace.c (rb_postponed_job_flush): fix bit operation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43252 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--vm_trace.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 54b2132472..0809274fe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 11 18:11:34 2013 Koichi Sasada <ko1@atdot.net>
+
+ * vm_trace.c (rb_postponed_job_flush): fix bit operation.
+
Fri Oct 11 17:33:24 2013 Akinori MUSHA <knu@iDaemons.org>
* misc/ruby-electric.el: Import ruby-electric.el 2.0 from
diff --git a/vm_trace.c b/vm_trace.c
index 52afb2bb5d..0e09c7e310 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -1464,5 +1464,5 @@ rb_postponed_job_flush(rb_vm_t *vm)
TH_POP_TAG();
}
/* restore POSTPONED_JOB mask */
- th->interrupt_mask &= ~saved_postponed_job_interrupt_mask;
+ th->interrupt_mask &= ~(saved_postponed_job_interrupt_mask ^ POSTPONED_JOB_INTERRUPT_MASK);
}