From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id C7BA43858D1E; Mon, 6 Feb 2023 08:06:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C7BA43858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675670793; bh=1zJn5xzs8h5NymUgaoSwS8ZV073yIvAJnkWQjnBLs/A=; h=From:To:Subject:Date:From; b=eynH56jKB/uPnTIJ3lIHWs3qsMyIcBCfVA/lYrEISpHSOwDTol6RfgK72c+hx3s4r WjAxpsZ185gtkoO2yW8KxQ66pXMdQcApjc8zYx+Xl3uDpa2ySexGz+IW8XnmMzXkLt 6r34wehehHN1aCarB9169hv3BMP5cs92mBm0cpNo= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5708] ubsan: Fix up another spot that should have been BUILT_IN_UNREACHABLE_TRAPS [PR108655] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 31924665c86d47af6b1f22a74f594f2e1dc0ed2d X-Git-Newrev: 5df573f76bb9b42231e722145033c548a5fcdf9a Message-Id: <20230206080633.C7BA43858D1E@sourceware.org> Date: Mon, 6 Feb 2023 08:06:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:5df573f76bb9b42231e722145033c548a5fcdf9a commit r13-5708-g5df573f76bb9b42231e722145033c548a5fcdf9a Author: Jakub Jelinek Date: Mon Feb 6 09:05:56 2023 +0100 ubsan: Fix up another spot that should have been BUILT_IN_UNREACHABLE_TRAPS [PR108655] We ICE on the following testcase, because ivcanon calls gimple_build_builtin_unreachable but doesn't expect it would need vops. BUILT_IN_UNREACHABLE_TRAP I've introduced yesterday doesn't need vops and should be used in that case instead of BUILT_IN_TRAP which needs them. 2023-02-06 Jakub Jelinek PR tree-optimization/108655 * ubsan.cc (sanitize_unreachable_fn): For -funreachable-traps or -fsanitize=unreachable -fsanitize-trap=unreachable return BUILT_IN_UNREACHABLE_TRAP decl rather than BUILT_IN_TRAP. * gcc.dg/pr108655.c: New test. Diff: --- gcc/testsuite/gcc.dg/pr108655.c | 15 +++++++++++++++ gcc/ubsan.cc | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/gcc.dg/pr108655.c b/gcc/testsuite/gcc.dg/pr108655.c new file mode 100644 index 00000000000..f407616976e --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr108655.c @@ -0,0 +1,15 @@ +/* PR tree-optimization/108655 */ +/* { dg-do compile } */ +/* { dg-options "-w -O1 -funreachable-traps" } */ + +void +foo (void) +{ + int i, j; + for (; i;) + ; + for (; i < 6;) + for (j = 0; j < 6; ++j) + i += j; + __builtin_trap (); +} diff --git a/gcc/ubsan.cc b/gcc/ubsan.cc index 6dec2c3078a..c2f2e75b300 100644 --- a/gcc/ubsan.cc +++ b/gcc/ubsan.cc @@ -649,7 +649,7 @@ sanitize_unreachable_fn (tree *data, location_t loc) ? (flag_sanitize_trap & SANITIZE_UNREACHABLE) : flag_unreachable_traps) { - fn = builtin_decl_explicit (BUILT_IN_TRAP); + fn = builtin_decl_explicit (BUILT_IN_UNREACHABLE_TRAP); *data = NULL_TREE; } else if (san)