From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id 57E4238582BA; Wed, 21 Sep 2022 10:44:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 57E4238582BA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663757052; bh=9vBjDj9m4Ly9KCs1o7V+Nzhol5ioaWM+DX1O1oDZ4W8=; h=From:To:Subject:Date:From; b=A5GM8FZNmElW/0y/B+b5dnEWESGwpFW5iK2iFLTg99YCEHj4UGsA5+IY0Gf3YvHEK 9ZiV1PgVJpySjb4ZV1T4R5zdwQSwhNsFsDYNqEi+OpnEwz3tmOpnKBhvGkIpT5Jd6R Hvw0HtzjkivaK6jS5Ry/tpvp1Dvc6RjColz8FjGQ= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Biener To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-2759] tree-optimization/106984 - tsan and COND_EXPR GIMPLE X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/master X-Git-Oldrev: 519196a27cf534e94f158733b25a4f9d10737031 X-Git-Newrev: 41b5edaa5c03db36ad45a9cf524881de221a1812 Message-Id: <20220921104412.57E4238582BA@sourceware.org> Date: Wed, 21 Sep 2022 10:44:12 +0000 (GMT) List-Id: https://gcc.gnu.org/g:41b5edaa5c03db36ad45a9cf524881de221a1812 commit r13-2759-g41b5edaa5c03db36ad45a9cf524881de221a1812 Author: Richard Biener Date: Wed Sep 21 11:30:57 2022 +0200 tree-optimization/106984 - tsan and COND_EXPR GIMPLE The following adjusts a missed spot in TSAN for the RHS COND_EXPR GIMPLE IL rework. PR tree-optimization/106984 * tsan.cc (instrument_builtin_call): Build the COND_EXPR condition in a separate statement. * gcc.dg/tsan/pr106984.c: New testcase. Diff: --- gcc/testsuite/gcc.dg/tsan/pr106984.c | 7 +++++++ gcc/tsan.cc | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/gcc.dg/tsan/pr106984.c b/gcc/testsuite/gcc.dg/tsan/pr106984.c new file mode 100644 index 00000000000..69cf83d547a --- /dev/null +++ b/gcc/testsuite/gcc.dg/tsan/pr106984.c @@ -0,0 +1,7 @@ +/* { dg-do compile } */ +/* { dg-options "-fsanitize=thread" } */ + +int svcsw (int *ptr, int oldval, int newval) +{ + return __sync_val_compare_and_swap (ptr, oldval, newval); +} diff --git a/gcc/tsan.cc b/gcc/tsan.cc index 79d4582acd1..2406527c96a 100644 --- a/gcc/tsan.cc +++ b/gcc/tsan.cc @@ -620,15 +620,16 @@ instrument_builtin_call (gimple_stmt_iterator *gsi) maybe_clean_or_replace_eh_stmt (stmt, gsi_stmt (*gsi)); if (tsan_atomic_table[i].action == val_cas && lhs) { - tree cond; stmt = gsi_stmt (*gsi); - g = gimple_build_assign (make_ssa_name (TREE_TYPE (t)), t); + tree t2 = make_ssa_name (TREE_TYPE (t)); + g = gimple_build_assign (t2, t); gsi_insert_after (gsi, g, GSI_NEW_STMT); t = make_ssa_name (TREE_TYPE (TREE_TYPE (decl)), stmt); - cond = build2 (NE_EXPR, boolean_type_node, t, - build_int_cst (TREE_TYPE (t), 0)); - g = gimple_build_assign (lhs, COND_EXPR, cond, args[1], - gimple_assign_lhs (g)); + tree cond = make_ssa_name (boolean_type_node); + g = gimple_build_assign (cond, NE_EXPR, + t, build_zero_cst (TREE_TYPE (t))); + gsi_insert_after (gsi, g, GSI_NEW_STMT); + g = gimple_build_assign (lhs, COND_EXPR, cond, args[1], t2); gimple_call_set_lhs (stmt, t); update_stmt (stmt); gsi_insert_after (gsi, g, GSI_NEW_STMT);