From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 32F913889803; Thu, 24 Mar 2022 13:10:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 32F913889803 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-7801] hardened conditionals: drop copied identifiers X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/heads/master X-Git-Oldrev: b8c4171ebd72079e55aceadbcfc883f517cdf895 X-Git-Newrev: fb488cba571539b6644e8f99f1dd997cdb4c82c1 Message-Id: <20220324131021.32F913889803@sourceware.org> Date: Thu, 24 Mar 2022 13:10:21 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Mar 2022 13:10:21 -0000 https://gcc.gnu.org/g:fb488cba571539b6644e8f99f1dd997cdb4c82c1 commit r12-7801-gfb488cba571539b6644e8f99f1dd997cdb4c82c1 Author: Alexandre Oliva Date: Thu Mar 24 10:02:29 2022 -0300 hardened conditionals: drop copied identifiers The copies of identifiers, indended to associate hardening SSA temporaries to the original variables they refer to, end up causing -fcompare-debug to fail, because DECL_UIDs are not identical, and the nouid flag used in compare-debug dumps doesn't affect the uids in naked identifiers, so the divergence becomes apparent. This patch drops the naked identifiers. Though somewhat desirable, they're not necessary. for gcc/ChangeLog PR debug/104564 * gimple-harden-conditionals.cc (detach_value): Keep temps anonymous. for gcc/testsuite/ChangeLog PR debug/104564 * c-c++-common/torture/harden-comp.c: Adjust. * c-c++-common/torture/harden-cond.c: Adjust. Diff: --- gcc/gimple-harden-conditionals.cc | 11 ++++------- gcc/testsuite/c-c++-common/torture/harden-comp.c | 2 +- gcc/testsuite/c-c++-common/torture/harden-cond.c | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gcc/gimple-harden-conditionals.cc b/gcc/gimple-harden-conditionals.cc index be01f3ea8c4..c7e5e077a74 100644 --- a/gcc/gimple-harden-conditionals.cc +++ b/gcc/gimple-harden-conditionals.cc @@ -126,14 +126,11 @@ detach_value (location_t loc, gimple_stmt_iterator *gsip, tree val) return val; } - /* Create a SSA "copy" of VAL. This could be an anonymous - temporary, but it's nice to have it named after the corresponding - variable. Alas, when VAL is a DECL_BY_REFERENCE RESULT_DECL, - setting (a copy of) it would be flagged by checking, so we don't - use copy_ssa_name: we create an anonymous SSA name, and then give - it the same identifier (rather than decl) as VAL. */ + /* Create a SSA "copy" of VAL. It would be nice to have it named + after the corresponding variable, but sharing the same decl is + problematic when VAL is a DECL_BY_REFERENCE RESULT_DECL, and + copying just the identifier hits -fcompare-debug failures. */ tree ret = make_ssa_name (TREE_TYPE (val)); - SET_SSA_NAME_VAR_OR_IDENTIFIER (ret, SSA_NAME_IDENTIFIER (val)); /* Some modes won't fit in general regs, so we fall back to memory for them. ??? It would be ideal to try to identify an alternate, diff --git a/gcc/testsuite/c-c++-common/torture/harden-comp.c b/gcc/testsuite/c-c++-common/torture/harden-comp.c index 1ee0b366344..502f52e25be 100644 --- a/gcc/testsuite/c-c++-common/torture/harden-comp.c +++ b/gcc/testsuite/c-c++-common/torture/harden-comp.c @@ -11,4 +11,4 @@ f (int i, int j) /* { dg-final { scan-tree-dump-times "Adding reversed compare" 1 "hardcmp" } } */ /* { dg-final { scan-tree-dump-times "__builtin_trap" 1 "hardcmp" } } */ /* { dg-final { scan-tree-dump-times "_\[0-9\]* = i_\[0-9\]*\[(\]D\[)\] < j_\[0-9\]*\[(\]D\[)\];" 1 "hardcmp" } } */ -/* { dg-final { scan-tree-dump-times "_\[0-9\]* = i_\[0-9\]* >= j_\[0-9\]*;" 1 "hardcmp" } } */ +/* { dg-final { scan-tree-dump-times "_\[0-9\]* = _\[0-9\]* >= _\[0-9\]*;" 1 "hardcmp" } } */ diff --git a/gcc/testsuite/c-c++-common/torture/harden-cond.c b/gcc/testsuite/c-c++-common/torture/harden-cond.c index 86de8e155ed..213b048b25a 100644 --- a/gcc/testsuite/c-c++-common/torture/harden-cond.c +++ b/gcc/testsuite/c-c++-common/torture/harden-cond.c @@ -15,4 +15,4 @@ f (int i, int j) /* { dg-final { scan-tree-dump-times "Adding reversed compare" 2 "hardcbr" } } */ /* { dg-final { scan-tree-dump-times "__builtin_trap" 2 "hardcbr" } } */ /* { dg-final { scan-tree-dump-times "if \[(\]i_\[0-9\]*\[(\]D\[)\] < j_\[0-9\]*\[(\]D\[)\]\[)\]" 1 "hardcbr" } } */ -/* { dg-final { scan-tree-dump-times "if \[(\]i_\[0-9\]* >= j_\[0-9\]*\[)\]" 2 "hardcbr" } } */ +/* { dg-final { scan-tree-dump-times "if \[(\]_\[0-9\]* >= _\[0-9\]*\[)\]" 2 "hardcbr" } } */