[compiler-rt] b8f4232 - tsan: rename deadlock detector Mutex to UserMutex

[Dmitry Vyukov via llvm-commits]

Author: Dmitry Vyukov
Date: 2021-07-29T12:38:14+02:00
New Revision: b8f4232823d77c350ccf83cdd91b9f67fed2d31c

URL: https://github.com/llvm/llvm-project/commit/b8f4232823d77c350ccf83cdd91b9f67fed2d31c
DIFF: https://github.com/llvm/llvm-project/commit/b8f4232823d77c350ccf83cdd91b9f67fed2d31c.diff

LOG: tsan: rename deadlock detector Mutex to UserMutex

It conflicts with sanitizer_common Mutex.

Reviewed By: melver

Differential Revision: https://reviews.llvm.org/D107053

Added: 
    

Modified: 
    compiler-rt/lib/tsan/dd/dd_rtl.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/tsan/dd/dd_rtl.h b/compiler-rt/lib/tsan/dd/dd_rtl.h
index b1e19be57d3f2..5871a7118ea9a 100644
--- a/compiler-rt/lib/tsan/dd/dd_rtl.h
+++ b/compiler-rt/lib/tsan/dd/dd_rtl.h
@@ -19,7 +19,7 @@ namespace __dsan {
 
 typedef DDFlags Flags;
 
-struct Mutex {
+struct UserMutex {
   DDMutex dd;
 };
 
@@ -37,7 +37,7 @@ struct Callback final : public DDCallback {
   u32 Unwind() override;
 };
 
-typedef AddrHashMap<Mutex, 31051> MutexHashMap;
+typedef AddrHashMap<UserMutex, 31051> MutexHashMap;
 
 struct Context {
   DDetector *dd;