Revert of Try TSAN blacklist for SkGLContextHelper::init. (https://codereview.chromiu...

Reason for revert:
the bot's clang doesn't know -fsanitize-blacklist

Original issue's description:
> Try TSAN blacklist for SkGLContextHelper::init.
>
> Submitting to test this; this particular problem only happens on the bot.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/ab2ec19b975a898d4ee2278ddad7d4268f134478

R=mtklein@chromium.org
TBR=mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/314543002

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 9529edae49fdfde00dc7d4afe469428601c1929a..cf46ed21d93f938afa275ff26b38041ca797c216 100644 (file)
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -413,7 +413,7 @@
             'conditions' : [
               [ 'skia_sanitizer == "thread"', {
                 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ],
-                'cflags': [ '-fPIC', '-fsanitize-blacklist=>!(pwd)/../tools/tsan.blacklist' ],
+                'cflags': [ '-fPIC' ],
                 'target_conditions': [
                   [ '_type == "executable"', {
                     'cflags': [ '-fPIE' ],

diff --git a/tools/tsan.blacklist b/tools/tsan.blacklist
deleted file mode 100644 (file)
index 9c4f978..0000000
--- a/tools/tsan.blacklist
+++ /dev/null
@@ -1,11 +0,0 @@
-# Blacklist (compile time suppressions) for TSAN.
-#
-# CAREFUL!  Comments must go on their own line or your suppressions will silently fail.
-
-# skia:2459  Seemingly misdiagnosed use-after-free, having something to do with software GL drivers.
-# Having trouble getting this suppression to match.
-# We've tried: race:swrast_dri.so
-#              race:SkGLContextHelper::init
-#              race:SkGLContextHelper
-# So now we'll try a compile time blacklist.  We'll use a file blacklist to nuke it from orbit.
-file:SkGLContextHelper.cpp

diff --git a/tools/tsan.supp b/tools/tsan.supp
index 3b10e4e997a065fb4a2ff302712e08f371e066e0..c997058db22d16d4334e4489870ea20e6edc26b3 100644 (file)
--- a/tools/tsan.supp
+++ b/tools/tsan.supp
@@ -5,6 +5,13 @@
 # WebP races (harmlessly) choosing function pointers for SIMD versions of some of its functions.
 race:third_party/externals/libwebp
 
+# skia:2459  Seemingly misdiagnosed use-after-free, having something to do with software GL drivers.
+# Having trouble getting this suppression to match.
+# We've tried: race:swrast_dri.so
+#              race:SkGLContextHelper::init
+# Maybe because it's diagnosed as a use-after-free, not as a race?
+race:SkGLContextHelper
+
 # Threadsafe, should be ported to SkLazyPtr.
 race:SkFontHost_FreeType