Changeset 200654 in webkit

Timestamp:

May 10, 2016, 4:47:10 PM (9 years ago)

Author:

ddkilzer@apple.com

Message:

bmalloc should automatically disable itself when ThreadSanitizer is used
<​https://webkit.org/b/157527>

Reviewed by Michael Catanzaro.

• bmalloc/Environment.cpp:

(bmalloc::isASanEnabled): Rename to isSanitizerEnabled.
(bmalloc::isSanitizerEnabled): Rename from isASanEnabled. Add
support for detecting ThreadSanitizer.
(bmalloc::Environment::computeIsBmallocEnabled): Switch from
isASanEnabled to isSanitizerEnabled.

Location:

trunk/Source/bmalloc

Files:

• ChangeLog (modified) (1 diff)
• bmalloc/Environment.cpp (modified) (4 diffs)

trunk/Source/bmalloc/ChangeLog

@@ +1 @@
+2016-05-10  David Kilzer  <ddkilzer@apple.com>
+
+        bmalloc should automatically disable itself when ThreadSanitizer is used
+        <https://webkit.org/b/157527>
+
+        Reviewed by Michael Catanzaro.
+
+        * bmalloc/Environment.cpp:
+        (bmalloc::isASanEnabled): Rename to isSanitizerEnabled.
+        (bmalloc::isSanitizerEnabled): Rename from isASanEnabled. Add
+        support for detecting ThreadSanitizer.
+        (bmalloc::Environment::computeIsBmallocEnabled): Switch from
+        isASanEnabled to isSanitizerEnabled.
+
 2016-05-03  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/bmalloc/bmalloc/Environment.cpp

@@ -76 +76 @@
 }
 
-static bool isASanEnabled()
+static bool isSanitizerEnabled()
 {
 #if BOS(DARWIN)
+    static const char sanitizerPrefix[] = "/libclang_rt.";
+    static const char asanName[] = "asan_";
+    static const char tsanName[] = "tsan_";
     uint32_t imageCount = _dyld_image_count();
     for (uint32_t i = 0; i < imageCount; ++i) {
@@ -84 +87 @@
         if (!imageName)
             continue;
-        if (strstr(imageName, "/libclang_rt.asan_"))
-            return true;
+        if (const char* s = strstr(imageName, sanitizerPrefix)) {
+            const char* sanitizerName = s + sizeof(sanitizerPrefix) - 1;
+            if (!strncmp(sanitizerName, asanName, sizeof(asanName) - 1))
+                return true;
+            if (!strncmp(sanitizerName, tsanName, sizeof(tsanName) - 1))
+                return true;
+        }
     }
     return false;
@@ -92 +100 @@
     if (!handle)
         return false;
-    bool result = !!dlsym(handle, "__asan_poison_memory_region");
+    bool result = !!dlsym(handle, "__asan_init") || !!dlsym(handle, "__tsan_init");
     dlclose(handle);
     return result;
@@ -111 +119 @@
     if (isLibgmallocEnabled())
         return false;
-    if (isASanEnabled())
+    if (isSanitizerEnabled())
         return false;
     return true;