From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=BeVA=6C=gmail.com=richard.guenther@sourceware.org>
Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135])
	by sourceware.org (Postfix) with ESMTPS id 36D0B3858D1E
	for <gcc-patches@gcc.gnu.org>; Mon,  6 Feb 2023 07:18:03 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 36D0B3858D1E
Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com
Received: by mail-lf1-x135.google.com with SMTP id h24so16320857lfv.6
        for <gcc-patches@gcc.gnu.org>; Sun, 05 Feb 2023 23:18:03 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20210112;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:from:to:cc:subject:date:message-id:reply-to;
        bh=TxVQo91fIZ0+UsupepvcDLq8vd7qXntIALbqaRk0NeY=;
        b=amn1eh8v7GLmv/nuT+T5FRD1yS8MpxblDBj3NHzScMuf2q2JHVRL47bgjS8kfp1Op9
         XNT0R98SJvAhkC0jFjsaFqU9QgGXFGGQDkcsgHBayn6AfqjD0ikT5UnofXkVEmSR/bLt
         9NpIU7+gAPDH2lauv0NfFHJftLfqhPXQ8qsfkpsMh0bptgrGXumauJPgzBN2XFZLqN4n
         EItcocYZZYVy3PT8tqNr8ExU3lTRVZB+/As+a1G8Vr7+8W5fOEzeYxRk72eCiO0NIfVO
         wXkPFP5E60Hhi8MSslpOaR15XBKCM9WOID87Yin5rYOw1m9S0MoVCoIB56O6NXAH1mbQ
         uasQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=TxVQo91fIZ0+UsupepvcDLq8vd7qXntIALbqaRk0NeY=;
        b=JSN0OswO0qjQ29AQ7SX503MBGW9+dHlmpMpWQtD+O4nSlvGybblEpcThrLTyKyqU5s
         oF4TuQG+k4fBFW8Yofz6NGeRZl+Ec/HiIXkVrS24UkjpK/NznVFEdheKhdU1lxXURNlH
         62+/UJ0PJM83TUJZDqCGnF6sSPGe1aYlD7VskILKRF1pylHSynqYhofvpg9Uyo91IT4B
         cKwJj12bgGl3eknQtRpUMgh3ixNc3OQdL0Pn+S0Q1DLR/jX1w1AsxA+r9g7ww8hbMn5A
         dofEOvIaX8Jnr+mR0ClNZGInDqWZLR+n0ycVSvpkDoMf/ZhGKQxFkIENJI0MTTg2iec3
         4Qgw==
X-Gm-Message-State: AO0yUKUVi82L5O9rqyO2VfsIA5+Fk+bp0k864UtfL8uXSGbNBzEaO20R
	iCPMnTiMPJVo2lfKidcpSUIYWqcJv89HnFAGH24=
X-Google-Smtp-Source: AK7set8TvQDzaPhkNIyu4CbeIb0T0VVsH4ev5UwM3kbfR3F9pC9CR07iGQ5Avv1qOl+hF3SBZenBO2tZf9377eYsDQo=
X-Received: by 2002:ac2:5505:0:b0:4cb:6bcb:de45 with SMTP id
 j5-20020ac25505000000b004cb6bcbde45mr3481358lfk.272.1675667881687; Sun, 05
 Feb 2023 23:18:01 -0800 (PST)
MIME-Version: 1.0
References: <Y91bM7eeiHWZMwWI@tucnak>
In-Reply-To: <Y91bM7eeiHWZMwWI@tucnak>
From: Richard Biener <richard.guenther@gmail.com>
Date: Mon, 6 Feb 2023 08:17:48 +0100
Message-ID: <CAFiYyc3q_KgM0AQFjhjo8i4=koc0_zregx82mUPALO0h76CmMQ@mail.gmail.com>
Subject: Re: [PATCH] ubsan: Fix up another spot that should have been
 BUILT_IN_UNREACHABLE_TRAPS [PR108655]
To: Jakub Jelinek <jakub@redhat.com>
Cc: Richard Biener <rguenther@suse.de>, gcc-patches@gcc.gnu.org
Content-Type: text/plain; charset="UTF-8"
X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,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
List-Id: <gcc-patches.gcc.gnu.org>

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
>