From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1363) id 429AC3849AE3; Wed, 24 Apr 2024 14:40:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 429AC3849AE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1713969604; bh=pSBvh7YkhJX5OwLgyGpGlE9HayEanB4v1//gwPGfpBI=; h=From:To:Subject:Date:From; b=o9MDdsXaIDUwLRK+XStwcAAGSbWQgcp+dcTz45oNf0Py7qrQahvq8+w7sDUxRrE8o OApr0lDmEpVfbLMfj1Kn/7XGvnF5tVUDGjYi/ApJZiypqxlxNt24IdNUehHpAiK9kr S1yHvWja9ZGJF30EGvrw+sGHM/wfdzXjr/u7c7TQ= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Uros Bizjak To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-11352] tsan: Don't instrument non-generic AS accesses [PR111736] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 624c3bb9ff762f196852dc77233610d1cdf7d7be X-Git-Newrev: 09910b6753427eeb3f6dded4fae3578851da7422 Message-Id: <20240424144004.429AC3849AE3@sourceware.org> Date: Wed, 24 Apr 2024 14:40:03 +0000 (GMT) List-Id: https://gcc.gnu.org/g:09910b6753427eeb3f6dded4fae3578851da7422 commit r11-11352-g09910b6753427eeb3f6dded4fae3578851da7422 Author: Jakub Jelinek 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 gcc/ChangeLog: PR sanitizer/111736 * tsan.c (instrument_expr): Punt on non-generic address space accesses. gcc/testsuite/ChangeLog: * gcc.dg/tsan/pr111736.c: New test. (cherry picked from commit 471967ab8b4c49338ba77defbe24b06cc51c0093) Diff: --- gcc/testsuite/gcc.dg/tsan/pr111736.c | 17 +++++++++++++++++ gcc/tsan.c | 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.c b/gcc/tsan.c index 7db157e21e5..e426f647cb0 100644 --- a/gcc/tsan.c +++ b/gcc/tsan.c @@ -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);