core(tls): hide assertions from Thread Sanitizer

alalek · alalek · commit d35422b52347 · 2017-07-27T17:31:51.000+03:00
diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h
@@ -327,6 +327,17 @@ Cv64suf;
 # endif
 #endif
 
+/****************************************************************************************\
+*                                    Thread sanitizer                                    *
+\****************************************************************************************/
+#ifndef CV_THREAD_SANITIZER
+# if defined(__has_feature)
+#   if __has_feature(thread_sanitizer)
+#     define CV_THREAD_SANITIZER
+#   endif
+# endif
+#endif
+
 /****************************************************************************************\
 *          exchange-add operation for atomic operations on reference counters            *
 \****************************************************************************************/
diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
@@ -1396,7 +1396,9 @@ class TlsStorage
     // Get data by TLS storage index
     void* getData(size_t slotIdx) const
     {
+#ifndef CV_THREAD_SANITIZER
         CV_Assert(tlsSlotsSize > slotIdx);
+#endif
 
         ThreadData* threadData = (ThreadData*)tls.GetData();
         if(threadData && threadData->slots.size() > slotIdx)
@@ -1426,7 +1428,9 @@ class TlsStorage
     // Set data to storage index
     void setData(size_t slotIdx, void* pData)
     {
+#ifndef CV_THREAD_SANITIZER
         CV_Assert(tlsSlotsSize > slotIdx);
+#endif
 
         ThreadData* threadData = (ThreadData*)tls.GetData();
         if(!threadData)
