From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by sourceware.org (Postfix) with ESMTPS id 9C3093858C66 for ; Fri, 3 May 2024 11:29:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9C3093858C66 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9C3093858C66 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::12e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714735773; cv=none; b=BmzR7XqZIAHwa6mH8XVsQVqBrFUShV4wcGr1o3+/kJkUPQn8xGHUxu1IrPBlRkRnpy8eUrpuL7m3RqJQA5DwBOKRHXtuMp6gNA4f2r5drzJaEvvSoZuYYPARpcyj+2L6at83Bavri4ActaN8SM4A339aftci8i7XJ23n1huqVKI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714735773; c=relaxed/simple; bh=zUlnK0GdUvL9EGVvWJbIfmL+uo/FpOXiOhpQoy9S4CM=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=cPiWhcliS3tctoq22If/qErR9leyVYA9Y+otuffSVQHJXJdHrNFw03qPmnMrjwRaUY/xEhOC2svQtTL3/QdMzgIxhdg8W84gQvTm4UTTmabK+52lnkSuzB9vIgoOmI9UKU4kGzWrQQFexw6MSyOvGu1R+yyLR6i8FjvudP2sYbE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-51f0b6b682fso2353010e87.1 for ; Fri, 03 May 2024 04:29:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714735770; x=1715340570; darn=gcc.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=izrLP5EYeC0FttKpLxPZiIoU0twiZTjySw75nJBBjgE=; b=AcKoWIJ7zk8JOVlEaMiGDVry9V439BDVJ5d73WwXqD5AeJbE2xhHVweB/Nl5eu0n82 0a78zlAJ9RaJqk4I7Kg1ch6OezHh2WOmFNZ84p7OGRH9qjIHvzSh2x5Qw2aK/aAZWzG9 ia/tjQs4bl/VU7s8mvHS8ODiaqDxGN/odj7x6zsvleM7CRtCJ0/608k0Kx8wRrklb5Th Iwi39Ky+VdjVR+6URg6+5FPGKHgVV8MLAkMMhwydC0YBFqm6bLfW/tGW2sWe0DH7pwNk CvG8d54Qu0hUJtbBsABEhQPq25ikTyAixY3rJG+ytWiCbRzDV8+ODCRjxHuZN7Fatd5F HdlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714735770; x=1715340570; h=content-transfer-encoding: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=izrLP5EYeC0FttKpLxPZiIoU0twiZTjySw75nJBBjgE=; b=VtstgEoyIEPBOSPGaHZcSo2uM8fraOOUuKo1btVYSVMg2+NU0j2ppohYMWJAywDf5f eghcUMiPX2NZ7NiNqDfhShT/GGLPnxAglMx0hqjK76jK2CrHrT67xlYS4eNz9PYjWQ5C FZNDToq2WamyFu5TjXAurwX4VApc37ISnrcoyKXsFmXKE4uZ5OGPznHMdsVc94FYqBgw RpqtXUxP160JVKlrGDICFuy1ol+TXo6s9qpP4e+Fd5TYVDjXYd6a0aRetQk/Cde57FDr jAMOBP7+72ZxaHIjOZNuutOv6hKcVG2toIOELd2wmqk2evIyxP0Bkdv71SfzTgSlOuPU FLAw== X-Gm-Message-State: AOJu0YzxelDXFckVi8FOyFuhEW/erh10FVx5nq7DEU6GRvm0+3kKFgBA hpLC4KrD9TphCQixpPtb20dZIFtUml4N/aSuYIzUZbQP3zHeDjsVTS0pR4MImWEKfUA47ZuTl1P Lq9NpMcMe/Dhi/eoNJ270apPJOP0= X-Google-Smtp-Source: AGHT+IGsogLm8x4iSzt1MK33Skiykcf1RrqIfPa6wQq4FH1wPDa8zCjKoQzZmxkGwOFK7T5grFp4OGTlo8EdvRH1QGo= X-Received: by 2002:a19:641a:0:b0:51d:9603:3f7e with SMTP id y26-20020a19641a000000b0051d96033f7emr1949470lfb.34.1714735769777; Fri, 03 May 2024 04:29:29 -0700 (PDT) MIME-Version: 1.0 References: <20240502213918.2029860-1-quic_apinski@quicinc.com> In-Reply-To: <20240502213918.2029860-1-quic_apinski@quicinc.com> From: Richard Biener Date: Fri, 3 May 2024 13:29:18 +0200 Message-ID: Subject: Re: [PATCH 1/3] Fix printing COMPOUND_EXPR in .original [PR23872] To: Andrew Pinski Cc: gcc-patches@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,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: On Thu, May 2, 2024 at 11:40=E2=80=AFPM Andrew Pinski wrote: > > Starting with the merge of the openmp branch into the trunk > (r0-73077-g953ff28998b59b), COMPOUND_EXPR started to be printed > as `expr; , expr` which is wrong. This was due to the wrong > conversion of dumping_stmts into `!(flags & TDF_SLIM)`. That is wrong > as we are not dumping stmts at this point (`!(flags & TDF_SLIM)` was alwa= ys > true for this case as TDF_SLIM case was handled before hand). So switch i= t > to be always false. > > Bootstrapped and tested on x86_64-linux-gnu with no regressions. OK. > gcc/ChangeLog: > > PR middle-end/23872 > * tree-pretty-print.cc (dump_generic_node ): = Fix > calls to dump_generic_node and also remove unreachable code that = is testing > `flags & TDF_SLIM`. > > gcc/testsuite/ChangeLog: > > * gfortran.dg/gomp/atomic-21.f90: Update testcase for the removal= of `;`. > > Signed-off-by: Andrew Pinski > --- > gcc/testsuite/gfortran.dg/gomp/atomic-21.f90 | 4 ++-- > gcc/tree-pretty-print.cc | 24 ++++++-------------- > 2 files changed, 9 insertions(+), 19 deletions(-) > > diff --git a/gcc/testsuite/gfortran.dg/gomp/atomic-21.f90 b/gcc/testsuite= /gfortran.dg/gomp/atomic-21.f90 > index febcdbbacfb..35099294d7a 100644 > --- a/gcc/testsuite/gfortran.dg/gomp/atomic-21.f90 > +++ b/gcc/testsuite/gfortran.dg/gomp/atomic-21.f90 > @@ -56,7 +56,7 @@ subroutine foobar() > endif > > ! TARGET_EXPR =3D #pragma omp atomic capture acq_rel > -! TARGET_EXPR =3D NON_LVALUE_EXPR =3D *TARGET_EXPR =3D=3D oo> ? pp : *TARGET_EXPR ;, if (TARGET_EXPR ) > +! TARGET_EXPR =3D NON_LVALUE_EXPR =3D *TARGET_EXPR =3D=3D oo> ? pp : *TARGET_EXPR , if (TARGET_EXPR ) > ! { > ! <<< Unknown tree: void_cst >>> > ! } > @@ -66,7 +66,7 @@ subroutine foobar() > ! }; > ! > ! { dg-final { scan-tree-dump-times "TARGET_EXPR =3D #pr= agma omp atomic capture acq_rel" 1 "original" } } > -! { dg-final { scan-tree-dump-times "TARGET_EXPR =3D N= ON_LVALUE_EXPR =3D \\*TARGET_EXPR =3D=3D oo> \\? pp : \\*TARGET_EXPR ;, if \\(TARGET_E= XPR \\)" 1 "original" } } > +! { dg-final { scan-tree-dump-times "TARGET_EXPR =3D N= ON_LVALUE_EXPR =3D \\*TARGET_EXPR =3D=3D oo> \\? pp : \\*TARGET_EXPR , if \\(TARGET_EX= PR \\)" 1 "original" } } > ! { dg-final { scan-tree-dump-times "<<< Unknown tree: void_cst >>>" 1 "= original" } } > ! { dg-final { scan-tree-dump-times "qq =3D TARGET_EXPR ;= " 1 "original" } } > > diff --git a/gcc/tree-pretty-print.cc b/gcc/tree-pretty-print.cc > index c935a7da7d1..f9ad8562078 100644 > --- a/gcc/tree-pretty-print.cc > +++ b/gcc/tree-pretty-print.cc > @@ -2856,31 +2856,21 @@ dump_generic_node (pretty_printer *pp, tree node,= int spc, dump_flags_t flags, > } > > dump_generic_node (pp, TREE_OPERAND (node, 0), > - spc, flags, !(flags & TDF_SLIM)); > - if (flags & TDF_SLIM) > - newline_and_indent (pp, spc); > - else > - { > - pp_comma (pp); > - pp_space (pp); > - } > + spc, flags, false); > + pp_comma (pp); > + pp_space (pp); > > for (tp =3D &TREE_OPERAND (node, 1); > TREE_CODE (*tp) =3D=3D COMPOUND_EXPR; > tp =3D &TREE_OPERAND (*tp, 1)) > { > dump_generic_node (pp, TREE_OPERAND (*tp, 0), > - spc, flags, !(flags & TDF_SLIM)); > - if (flags & TDF_SLIM) > - newline_and_indent (pp, spc); > - else > - { > - pp_comma (pp); > - pp_space (pp); > - } > + spc, flags, false); > + pp_comma (pp); > + pp_space (pp); > } > > - dump_generic_node (pp, *tp, spc, flags, !(flags & TDF_SLIM)); > + dump_generic_node (pp, *tp, spc, flags, false); > } > break; > > -- > 2.43.0 >