ubsan: Fix up another spot that should have been BUILT_IN_UNREACHABLE_TRAPS [PR108655]
Message ID | Y91bM7eeiHWZMwWI@tucnak |
---|---|
State | Unresolved |
Headers |
Return-Path: <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1039052wrn; Fri, 3 Feb 2023 12:15:57 -0800 (PST) X-Google-Smtp-Source: AK7set91tsiURFijM0XcxJpshY0fwDWNaUH+SxzxaFMN60Du/cUotB9d4CgDatkj2FR5aBHH0JTu X-Received: by 2002:a17:906:ccce:b0:872:ec40:65e9 with SMTP id ot14-20020a170906ccce00b00872ec4065e9mr12102499ejb.18.1675455357035; Fri, 03 Feb 2023 12:15:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675455357; cv=none; d=google.com; s=arc-20160816; b=gZ1yPMeJscDUJRj5yZuKk70yCtkXeRL7hOUjEtEKbO/a1cZHVSTgjVViRPqiLCivxN O5OnuDApsXjKrVgP0cbcNzBtxmxn9aXKlkCUaK6l59CQEVTcRPXb77huv+dV2cqCTpKm 8cUANZ5ltv1PXgaZY1onKzBC4OFK9GueOEuIXQSCZWl6gmU5USo15BcktnNdQBxI7m9p W/SI4sIgjcAgIHd5UX8GX+LbmXQBsitheD9lwiRFil2KcVZFGLdKMnWRfKneHL8rdG2X PfDP8qBSKZ5RKAaohwgumFKp2ZTx208jI3kCpDNy9CT+nzXZC8yEh3ChIezloJ9OGvMP aKtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:cc:to:date :resent-to:resent-message-id:resent-date:resent-from:dmarc-filter :delivered-to:dkim-signature:dkim-filter; bh=kxPKlFC93TppUOFAaHsqnSsDECqRPmci5ZdMYnnZdnk=; b=CN4v43KjgPWyQDlSgAcdLhPb/uzDcQ22KVp2+z0uw7AUYeDj+c2IV/K2D29FJFdpSQ exLCzTG3krhcyDZM9D+4IiJXipIpcIzIv3/zxLhoT01EM7IH1WwJtWEQRfmGk7ivCLo+ 9a3MeYK25FhVmcVF2jt9FGxQ0kBc/p/bNC7x8m+bAi+wu/UdqcxVucg8k+Spc17lv018 TCgo4G48D5RBnKVSKu0yB8qMcx3+upX6ndriQZG+7T+ZppuA/hmiI8kw2G28kYEWvKio zKORMEMftCJlWgfenHsib7ORmP6tf69oWAZ5uG1+OY3HG+FTPvk7I8moI3zQdm5Qju68 cWMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=CTDnp2iY; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id up10-20020a170907cc8a00b00886e4a97692si3462165ejc.880.2023.02.03.12.15.56 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 12:15:57 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=CTDnp2iY; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6F9E93857437 for <ouuuleilei@gmail.com>; Fri, 3 Feb 2023 20:14:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6F9E93857437 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675455297; bh=kxPKlFC93TppUOFAaHsqnSsDECqRPmci5ZdMYnnZdnk=; h=Resent-From:Resent-Date:Resent-To:Date:To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=CTDnp2iYzmfP7+2K5D54VptU/mpVJuczqV0+jg+dRBvsHWyESwbMJemJaCQdbtVN2 PkIaFyY/60CCStm4+OL/52kieN8D4P2fU0zW68KcEtSUE+Ew0wsEDIebNgdA2z8iet lb1DtosUYxQUfXWZ5Pbtz2jP5DJkGyzZdkSMTyyM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 16A3438493ED for <gcc-patches@gcc.gnu.org>; Fri, 3 Feb 2023 20:14:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 16A3438493ED Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-208-Sw-pjTP9Ns2zZ7uCG3CppA-1; Fri, 03 Feb 2023 15:14:12 -0500 X-MC-Unique: Sw-pjTP9Ns2zZ7uCG3CppA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 54552100F90F; Fri, 3 Feb 2023 20:14:12 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.223]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 15D2018EC5; Fri, 3 Feb 2023 20:14:11 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 313KE9GO1415136 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 3 Feb 2023 21:14:09 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 313KE8bm1415135; Fri, 3 Feb 2023 21:14:08 +0100 Resent-From: Jakub Jelinek <jakub@redhat.com> Resent-Date: Fri, 3 Feb 2023 21:14:08 +0100 Resent-Message-ID: <Y91rED8RDJgGgPGL@tucnak> Resent-To: Richard Biener <rguenther@suse.de>, gcc-patches@gcc.gnu.org Date: Fri, 3 Feb 2023 20:06:29 +0100 To: Richard Biener <rguenther@suse.de> Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] ubsan: Fix up another spot that should have been BUILT_IN_UNREACHABLE_TRAPS [PR108655] Message-ID: <Y91bM7eeiHWZMwWI@tucnak> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> From: Jakub Jelinek via Gcc-patches <gcc-patches@gcc.gnu.org> Reply-To: Jakub Jelinek <jakub@redhat.com> Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756842276366581448?= X-GMAIL-MSGID: =?utf-8?q?1756842276366581448?= |
Series |
ubsan: Fix up another spot that should have been BUILT_IN_UNREACHABLE_TRAPS [PR108655]
|
|
Checks
Context | Check | Description |
---|---|---|
snail/gcc-patch-check | warning | Git am fail log |
Commit Message
Jakub Jelinek
Feb. 3, 2023, 7:06 p.m. UTC
Hi! 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. Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? 2023-02-03 Jakub Jelinek <jakub@redhat.com> 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. Jakub
Comments
On Fri, Feb 3, 2023 at 9:15 PM Jakub Jelinek via Gcc-patches <gcc-patches@gcc.gnu.org> wrote: > > Hi! > > 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. > > Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? OK. > 2023-02-03 Jakub Jelinek <jakub@redhat.com> > > 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. > > --- gcc/ubsan.cc.jj 2023-01-02 09:32:38.393053992 +0100 > +++ gcc/ubsan.cc 2023-02-03 11:40:47.047399386 +0100 > @@ -649,7 +649,7 @@ sanitize_unreachable_fn (tree *data, 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) > --- gcc/testsuite/gcc.dg/pr108655.c.jj 2023-02-03 11:46:39.533190031 +0100 > +++ gcc/testsuite/gcc.dg/pr108655.c 2023-02-03 11:46:28.272356439 +0100 > @@ -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 (); > +} > > Jakub >
--- gcc/ubsan.cc.jj 2023-01-02 09:32:38.393053992 +0100 +++ gcc/ubsan.cc 2023-02-03 11:40:47.047399386 +0100 @@ -649,7 +649,7 @@ sanitize_unreachable_fn (tree *data, 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) --- gcc/testsuite/gcc.dg/pr108655.c.jj 2023-02-03 11:46:39.533190031 +0100 +++ gcc/testsuite/gcc.dg/pr108655.c 2023-02-03 11:46:28.272356439 +0100 @@ -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 (); +}