diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2012-11-13 14:05:58 +0000 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2012-11-13 14:05:58 +0000 |
| commit | ed77156ba3c5754b4cfe4ca1d6d5d7a4fdfb7835 (patch) | |
| tree | 17ea399a1ff6986d5221410314e535467db88180 | |
| parent | 8c55a1ffa6edd1f48fd2ee6de8ff65c83b522834 (diff) | |
tsan: better function names
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@167834 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/tsan/rtl/tsan_rtl.cc | 4 | ||||
| -rw-r--r-- | lib/tsan/rtl/tsan_update_shadow_word_inl.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/tsan/rtl/tsan_rtl.cc b/lib/tsan/rtl/tsan_rtl.cc index 8c7567489..27e407711 100644 --- a/lib/tsan/rtl/tsan_rtl.cc +++ b/lib/tsan/rtl/tsan_rtl.cc @@ -331,11 +331,11 @@ static inline bool BothReads(Shadow s, int kAccessIsWrite) { return !kAccessIsWrite && !s.is_write(); } -static inline bool OldIsRWStronger(Shadow old, int kAccessIsWrite) { +static inline bool OldIsRWNotWeaker(Shadow old, int kAccessIsWrite) { return old.is_write() || !kAccessIsWrite; } -static inline bool OldIsRWWeaker(Shadow old, int kAccessIsWrite) { +static inline bool OldIsRWWeakerOrEqual(Shadow old, int kAccessIsWrite) { return !old.is_write() || kAccessIsWrite; } diff --git a/lib/tsan/rtl/tsan_update_shadow_word_inl.h b/lib/tsan/rtl/tsan_update_shadow_word_inl.h index c7864ce00..2c435556a 100644 --- a/lib/tsan/rtl/tsan_update_shadow_word_inl.h +++ b/lib/tsan/rtl/tsan_update_shadow_word_inl.h @@ -34,7 +34,7 @@ do { if (Shadow::TidsAreEqual(old, cur)) { StatInc(thr, StatShadowSameThread); if (OldIsInSameSynchEpoch(old, thr)) { - if (OldIsRWStronger(old, kAccessIsWrite)) { + if (OldIsRWNotWeaker(old, kAccessIsWrite)) { // found a slot that holds effectively the same info // (that is, same tid, same sync epoch and same size) StatInc(thr, StatMopSame); @@ -43,7 +43,7 @@ do { StoreIfNotYetStored(sp, &store_word); break; } - if (OldIsRWWeaker(old, kAccessIsWrite)) + if (OldIsRWWeakerOrEqual(old, kAccessIsWrite)) StoreIfNotYetStored(sp, &store_word); break; } |