summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-16 13:10:39 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-16 13:10:39 +0000
commita9f6a9553033169c636beaebc61ae2fc610f3426 (patch)
tree3af4bbc625b0d7c62a7e4f32718c856ae79014c2
parent2236f6a682ae39e49706f515d2e41bed6b4b1d12 (diff)
* gc.c (chain_finalized_object): fix precedence.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index db2f37e8995..8f49704f955 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 16 22:09:27 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * gc.c (chain_finalized_object): fix precedence.
+
Tue Feb 16 21:32:01 2010 Yusuke Endoh <mame@tsg.ne.jp>
* gc.c (rb_objspace_call_finalizer): always run finalizer at exit,
diff --git a/gc.c b/gc.c
index f2135001922..7490d4d8c75 100644
--- a/gc.c
+++ b/gc.c
@@ -2623,7 +2623,7 @@ static int
chain_finalized_object(st_data_t key, st_data_t val, st_data_t arg)
{
RVALUE *p = (RVALUE *)key, **final_list = (RVALUE **)arg;
- if (p->as.basic.flags & (FL_FINALIZE|FL_MARK) == FL_FINALIZE) {
+ if ((p->as.basic.flags & (FL_FINALIZE|FL_MARK)) == FL_FINALIZE) {
if (BUILTIN_TYPE(p) != T_ZOMBIE) {
p->as.free.flags = FL_MARK | T_ZOMBIE; /* remain marked */
RDATA(p)->dfree = 0;