[Git][ghc/ghc][wip/tsan/cmm] 2 commits: fix it

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/tsan/cmm at Glasgow Haskell Compiler / GHC


Commits:
d822b9ec by Ben Gamari at 2022-11-04T18:43:25-04:00
fix it

- - - - -
2ea74e0d by Ben Gamari at 2022-11-04T18:43:33-04:00
hadrian: Don't specify TSAN_ENABLED in +thread_sanitizer

This is implied by the CPP guards in TSANUtils.h

- - - - -


2 changed files:

- hadrian/src/Flavour.hs
- rts/include/Cmm.h


Changes:

=====================================
hadrian/src/Flavour.hs
=====================================
@@ -181,9 +181,9 @@ splitSections = splitSectionsIf (/=ghc)
 -- there is little benefit.
 
 enableThreadSanitizer :: Flavour -> Flavour
-enableThreadSanitizer = addArgs $ mconcat
+enableThreadSanitizer = addArgs $ notStage0 ? mconcat
     [ builder (Ghc CompileHs) ? arg "-optc-fsanitize=thread"
-    , builder (Ghc CompileCWithGhc) ? (arg "-optc-fsanitize=thread" <> arg "-DTSAN_ENABLED")
+    , builder (Ghc CompileCWithGhc) ? (arg "-optc-fsanitize=thread")
     , builder (Ghc LinkHs) ? arg "-optl-fsanitize=thread"
     , builder (Cc  CompileC) ? (arg "-fsanitize=thread" <> arg "-DTSAN_ENABLED")
     , builder (Cabal Flags) ? arg "thread-sanitizer"


=====================================
rts/include/Cmm.h
=====================================
@@ -600,9 +600,9 @@
     W_[p] = value
 
 #define ACQUIRE_LOAD_WORD(out, p) \
-    prim_read_barrier \
+    prim_read_barrier; \
     TSAN_ACQUIRE(p); \
-    out = W_[p];
+    out = W_[p]
 
 /* Getting/setting the info pointer of a closure */
 #define SET_INFO(p,info) StgHeader_info(p) = info



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/25fd6534ddd9e732f649c573d699132cc25bd6d6...2ea74e0d1b3f785b318d6d2681b2f5cfe505faeb

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/25fd6534ddd9e732f649c573d699132cc25bd6d6...2ea74e0d1b3f785b318d6d2681b2f5cfe505faeb
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221104/67e8a663/attachment-0001.html>