Index: compiler-rt/lib/tsan/rtl/tsan_shadow.h
===================================================================
--- compiler-rt/lib/tsan/rtl/tsan_shadow.h
+++ compiler-rt/lib/tsan/rtl/tsan_shadow.h
@@ -90,8 +90,8 @@
                                            : __builtin_popcount(part_.access_);
     if (typ)
       *typ = (part_.is_read_ ? kAccessRead : kAccessWrite) |
-             (part_.is_atomic_ ? kAccessAtomic : 0) |
-             (part_.access_ == kFreeAccess ? kAccessFree : 0);
+             (part_.is_atomic_ ? kAccessAtomic : kAccessWrite) |
+             (part_.access_ == kFreeAccess ? kAccessFree : kAccessWrite);
   }
 
   ALWAYS_INLINE