https://gcc.gnu.org/g:85b2b99e56b6f54b3feb530b2492955486e3d389
commit r13-8522-g85b2b99e56b6f54b3feb530b2492955486e3d389
Author: Jakub Jelinek <ja...@redhat.com>
Date: Tue Mar 26 11:06:15 2024 +0100
tsan: Don't instrument non-generic AS accesses [PR111736]
Similar to the asan and ubsan changes, we shouldn't instrument non-generic
address space accesses with tsan, because we just have library functions
which take address of the objects as generic address space pointers, so they
can't handle anything else.
2024-03-26 Jakub Jelinek <ja...@redhat.com>
PR sanitizer/111736
* tsan.cc (instrument_expr): Punt on non-generic address space
accesses.
* gcc.dg/tsan/pr111736.c: New test.
(cherry picked from commit 471967ab8b4c49338ba77defbe24b06cc51c0093)
Diff:
---
gcc/testsuite/gcc.dg/tsan/pr111736.c | 17 +++++++++++++++++
gcc/tsan.cc | 3 +++
2 files changed, 20 insertions(+)
diff --git a/gcc/testsuite/gcc.dg/tsan/pr111736.c
b/gcc/testsuite/gcc.dg/tsan/pr111736.c
new file mode 100644
index 00000000000..34ab88b3d4f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tsan/pr111736.c
@@ -0,0 +1,17 @@
+/* PR sanitizer/111736 */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-options "-fsanitize=thread -fdump-tree-optimized -ffat-lto-objects" }
*/
+/* { dg-final { scan-tree-dump-not "__tsan_read" "optimized" } } */
+/* { dg-final { scan-tree-dump-not "__tsan_write" "optimized" } } */
+
+#ifdef __x86_64__
+#define SEG __seg_fs
+#else
+#define SEG __seg_gs
+#endif
+
+void
+foo (int SEG *p, int SEG *q)
+{
+ *q = *p;
+}
diff --git a/gcc/tsan.cc b/gcc/tsan.cc
index 23f4d9e7655..0eab6c8a2dd 100644
--- a/gcc/tsan.cc
+++ b/gcc/tsan.cc
@@ -139,6 +139,9 @@ instrument_expr (gimple_stmt_iterator gsi, tree expr, bool
is_write)
if (TREE_READONLY (base) || (VAR_P (base) && DECL_HARD_REGISTER (base)))
return false;
+ if (!ADDR_SPACE_GENERIC_P (TYPE_ADDR_SPACE (TREE_TYPE (base))))
+ return false;
+
stmt = gsi_stmt (gsi);
loc = gimple_location (stmt);
rhs = is_vptr_store (stmt, expr, is_write);
