diff options
| author | Martin Liska <mliska@suse.cz> | 2022-05-05 12:51:36 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-05-05 13:24:04 +0200 |
| commit | 8996894d00f95b24bddb06aa6a2d62bd9cb371f9 (patch) | |
| tree | a5c519d98caa37cd210dac8f94868f9944d7997d /libsanitizer/tsan | |
| parent | f1d8a2d9bc3a817309c299147ff85e5091b6693e (diff) | |
| download | gcc-8996894d00f95b24bddb06aa6a2d62bd9cb371f9.zip gcc-8996894d00f95b24bddb06aa6a2d62bd9cb371f9.tar.gz gcc-8996894d00f95b24bddb06aa6a2d62bd9cb371f9.tar.bz2 | |
libsanitizer: merge from master (75f9e83ace52773af65dcebca543005ec8a2705d).
Diffstat (limited to 'libsanitizer/tsan')
| -rw-r--r-- | libsanitizer/tsan/tsan_rtl_ppc64.S | 1 | ||||
| -rw-r--r-- | libsanitizer/tsan/tsan_shadow.h | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libsanitizer/tsan/tsan_rtl_ppc64.S b/libsanitizer/tsan/tsan_rtl_ppc64.S index 9e533a7..8285e21 100644 --- a/libsanitizer/tsan/tsan_rtl_ppc64.S +++ b/libsanitizer/tsan/tsan_rtl_ppc64.S @@ -1,6 +1,5 @@ #include "tsan_ppc_regs.h" - .machine altivec .section .text .hidden __tsan_setjmp .globl _setjmp diff --git a/libsanitizer/tsan/tsan_shadow.h b/libsanitizer/tsan/tsan_shadow.h index 843573e..b222acf 100644 --- a/libsanitizer/tsan/tsan_shadow.h +++ b/libsanitizer/tsan/tsan_shadow.h @@ -88,10 +88,13 @@ class Shadow { if (size) *size = part_.access_ == kFreeAccess ? kShadowCell : __builtin_popcount(part_.access_); - if (typ) - *typ = (part_.is_read_ ? kAccessRead : kAccessWrite) | - (part_.is_atomic_ ? kAccessAtomic : 0) | - (part_.access_ == kFreeAccess ? kAccessFree : 0); + if (typ) { + *typ = part_.is_read_ ? kAccessRead : kAccessWrite; + if (part_.is_atomic_) + *typ |= kAccessAtomic; + if (part_.access_ == kFreeAccess) + *typ |= kAccessFree; + } } ALWAYS_INLINE |