[pypy-commit] stmgc default: Better code this way

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: 
Changeset: r469:0ebfd6dd4f46
Date: 2013-07-28 16:05 +0200
http://bitbucket.org/pypy/stmgc/changeset/0ebfd6dd4f46/

Log:    Better code this way

diff --git a/c4/stmgc.h b/c4/stmgc.h
--- a/c4/stmgc.h
+++ b/c4/stmgc.h
@@ -160,13 +160,13 @@
 #define UNLIKELY(test)  __builtin_expect(test, 0)
 
 #define stm_read_barrier(obj)                                   \
-    (UNLIKELY(((obj)->h_revision != stm_private_rev_num) &      \
+    (UNLIKELY(((obj)->h_revision != stm_private_rev_num) &&     \
               (FXCACHE_AT(obj) != (obj))) ?                     \
         stm_DirectReadBarrier(obj)                              \
      :  (obj))
 
 #define stm_write_barrier(obj)                                  \
-    (UNLIKELY(((obj)->h_revision != stm_private_rev_num) |      \
+    (UNLIKELY(((obj)->h_revision != stm_private_rev_num) ||     \
               (((obj)->h_tid & GCFLAG_WRITE_BARRIER) != 0)) ?   \
         stm_WriteBarrier(obj)                                   \
      :  (obj))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit