From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by sourceware.org (Postfix) with ESMTPS id 7E7573857717; Mon, 15 May 2023 07:45:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7E7573857717 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-x129.google.com with SMTP id 2adb3069b0e04-4f13d8f74abso14198691e87.0; Mon, 15 May 2023 00:45:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684136756; x=1686728756; 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=WEDv+ouSWJbtVknDkEYAXFbfqaB0vJpD4XPyk4P6OGY=; b=QuAfFAjWT6yX/vpUYZ1GiE04X3/Nkz3PLijaiY1041WrdnRCcF/9BGhO9noR5brFmz 87Y7MmFbQBvPtSF8agYS9OHUxUKhI3hWhV42TY4l0qEzlFWlLdcbRqi/kmOvvGVE0iSh /48KDtvAwFkmALImEst3vzkAh+KwJwNrWaIeIz5P3OvIhDWMYtg2yR9uPiEyPq3V/oAT jnp7lunoa5vZcoMbv81Nj3VwpiGZCYn3gYcfVeGknzl5jz/PA+VOtqK2+lR1djpMgxRs UChUl4inOdlTWZvZJKrCQmoAVf+ZSElLsW6kFEYNOjC9mxKPepeJtEN6w+rk8D2UyQYc cpGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684136756; x=1686728756; 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=WEDv+ouSWJbtVknDkEYAXFbfqaB0vJpD4XPyk4P6OGY=; b=lYQRUK81obeaxcCOGRb8Ryc9eFqZoBwAtnRmVmD1ORLhcJbQDW6SJLLkPohjI9JmHC nj1N6veVOMWp1c0ScLwymm/U2BnHPjnQagvn0feo2o3uGbCmIxvV+bj8NxMEoTVU6a0U ThQP5HNqQ6mwflSwNb9zuVktQvY/HklB0+W3iOMSOdYTPSiIS9M3Jm3/k0AOfkxnH7Mu 1VIQQiBP1B8+usXMo3ln37OH1o6NUTZrzeYf8ONjM/kI0G048cbru4l16T3dFpEVHcOp +qiaLf23QJX6eai7Lq4oZ2CoAIW4jpGaqu+HjxfMR/WTByMDJbJGhSWQ7X8RJfw9CGkW vCXA== X-Gm-Message-State: AC+VfDyQG5TC55bxYJS+fRmDkPvo5lfTX1NneOjSUFcqZQyWqISXMcBq uLLG5PZMHMkYbM45mV6LoLDgnVXnp5MZPonIgnZ8PHsR X-Google-Smtp-Source: ACHHUZ63DCEK2+QgsEObKhWZlKVyBfPxbHTX4ctgm4Xh2C4ev1UTZ60doRlJiQJbnHbZ99XLMQniVqP53bk9EjIejYM= X-Received: by 2002:a05:6512:98f:b0:4f1:95cf:11eb with SMTP id w15-20020a056512098f00b004f195cf11ebmr5775943lft.6.1684136755620; Mon, 15 May 2023 00:45:55 -0700 (PDT) MIME-Version: 1.0 References: <20230513232321.279733-1-rep.dot.nop@gmail.com> <20230513232321.279733-7-rep.dot.nop@gmail.com> In-Reply-To: <20230513232321.279733-7-rep.dot.nop@gmail.com> From: Richard Biener Date: Mon, 15 May 2023 09:45:43 +0200 Message-ID: Subject: Re: [PATCH 06/14] lto: use _P() defines from tree.h To: Bernhard Reutner-Fischer Cc: gcc-patches@gcc.gnu.org, Bernhard Reutner-Fischer Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-6.9 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,T_SCC_BODY_TEXT_LINE 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 Sun, May 14, 2023 at 1:40=E2=80=AFAM Bernhard Reutner-Fischer via Gcc-patches wrote: > > From: Bernhard Reutner-Fischer OK. > gcc/ChangeLog: > > * lto-streamer-in.cc (lto_input_var_decl_ref): Use _P defines fro= m > tree.h. > (lto_read_body_or_constructor): Ditto. > * lto-streamer-out.cc (tree_is_indexable): Ditto. > (lto_output_var_decl_ref): Ditto. > (DFS::DFS_write_tree_body): Ditto. > (wrap_refs): Ditto. > (write_symbol_extension_info): Ditto. > > gcc/lto/ChangeLog: > > * lto-common.cc (lto_maybe_register_decl): > * lto-symtab.cc (warn_type_compatibility_p): > (lto_symtab_resolve_replaceable_p): > (lto_symtab_merge_decls_1): > * lto-symtab.h (lto_symtab_prevailing_decl): > --- > gcc/lto-streamer-in.cc | 4 ++-- > gcc/lto-streamer-out.cc | 11 +++++------ > gcc/lto/lto-common.cc | 2 +- > gcc/lto/lto-symtab.cc | 8 ++++---- > gcc/lto/lto-symtab.h | 2 +- > 5 files changed, 13 insertions(+), 14 deletions(-) > > diff --git a/gcc/lto-streamer-in.cc b/gcc/lto-streamer-in.cc > index 03cb41cfa16..2cb83406db5 100644 > --- a/gcc/lto-streamer-in.cc > +++ b/gcc/lto-streamer-in.cc > @@ -671,7 +671,7 @@ lto_input_var_decl_ref (lto_input_block *ib, lto_file= _decl_data *file_data) > unsigned int ix_u =3D streamer_read_uhwi (ib); > tree result =3D (*file_data->current_decl_state > ->streams[LTO_DECL_STREAM])[ix_u]; > - gcc_assert (TREE_CODE (result) =3D=3D VAR_DECL); > + gcc_assert (VAR_P (result)); > return result; > } > > @@ -1653,7 +1653,7 @@ lto_read_body_or_constructor (struct lto_file_decl_= data *file_data, struct symta > > if (TYPE_P (t)) > { > - gcc_assert (TYPE_CANONICAL (t) =3D=3D NULL_TREE); > + gcc_assert (TYPE_STRUCTURAL_EQUALITY_P (t)); > if (type_with_alias_set_p (t) > && canonical_type_used_p (t)) > TYPE_CANONICAL (t) =3D TYPE_MAIN_VARIANT (t); > diff --git a/gcc/lto-streamer-out.cc b/gcc/lto-streamer-out.cc > index 0bca530313c..5ab2eb4301e 100644 > --- a/gcc/lto-streamer-out.cc > +++ b/gcc/lto-streamer-out.cc > @@ -178,7 +178,7 @@ tree_is_indexable (tree t) > && lto_variably_modified_type_p (DECL_CONTEXT (t))) > return false; > else > - return (TYPE_P (t) || DECL_P (t) || TREE_CODE (t) =3D=3D SSA_NAME); > + return (IS_TYPE_OR_DECL_P (t) || TREE_CODE (t) =3D=3D SSA_NAME); > } > > > @@ -346,7 +346,7 @@ void > lto_output_var_decl_ref (struct lto_out_decl_state *decl_state, > struct lto_output_stream * obs, tree decl) > { > - gcc_checking_assert (TREE_CODE (decl) =3D=3D VAR_DECL); > + gcc_checking_assert (VAR_P (decl)); > streamer_write_uhwi_stream > (obs, lto_get_index (&decl_state->streams[LTO_DECL_STREAM], > decl)); > @@ -1078,8 +1078,7 @@ DFS::DFS_write_tree_body (struct output_block *ob, > else if (RECORD_OR_UNION_TYPE_P (expr)) > for (tree t =3D TYPE_FIELDS (expr); t; t =3D TREE_CHAIN (t)) > DFS_follow_tree_edge (t); > - else if (TREE_CODE (expr) =3D=3D FUNCTION_TYPE > - || TREE_CODE (expr) =3D=3D METHOD_TYPE) > + else if (FUNC_OR_METHOD_TYPE_P (expr)) > DFS_follow_tree_edge (TYPE_ARG_TYPES (expr)); > > if (!POINTER_TYPE_P (expr)) > @@ -2626,7 +2625,7 @@ wrap_refs (tree *tp, int *ws, void *) > { > tree t =3D *tp; > if (handled_component_p (t) > - && TREE_CODE (TREE_OPERAND (t, 0)) =3D=3D VAR_DECL > + && VAR_P (TREE_OPERAND (t, 0)) > && TREE_PUBLIC (TREE_OPERAND (t, 0))) > { > tree decl =3D TREE_OPERAND (t, 0); > @@ -3064,7 +3063,7 @@ write_symbol_extension_info (tree t) > ? GCCST_VARIABLE : GCCST_FUNCTION); > lto_write_data (&c, 1); > unsigned char section_kind =3D 0; > - if (TREE_CODE (t) =3D=3D VAR_DECL) > + if (VAR_P (t)) > { > section *s =3D get_variable_section (t, false); > if (s->common.flags & SECTION_BSS) > diff --git a/gcc/lto/lto-common.cc b/gcc/lto/lto-common.cc > index 882dd8971a4..537570204b3 100644 > --- a/gcc/lto/lto-common.cc > +++ b/gcc/lto/lto-common.cc > @@ -958,7 +958,7 @@ lto_register_function_decl_in_symtab (class data_in *= data_in, tree decl, > static void > lto_maybe_register_decl (class data_in *data_in, tree t, unsigned ix) > { > - if (TREE_CODE (t) =3D=3D VAR_DECL) > + if (VAR_P (t)) > lto_register_var_decl_in_symtab (data_in, t, ix); > else if (TREE_CODE (t) =3D=3D FUNCTION_DECL > && !fndecl_built_in_p (t)) > diff --git a/gcc/lto/lto-symtab.cc b/gcc/lto/lto-symtab.cc > index 2b57d0d5371..79ba8ddde20 100644 > --- a/gcc/lto/lto-symtab.cc > +++ b/gcc/lto/lto-symtab.cc > @@ -214,7 +214,7 @@ warn_type_compatibility_p (tree prevailing_type, tree= type, > > /* Function types needs special care, because types_compatible_p never > thinks prototype is compatible to non-prototype. */ > - if (TREE_CODE (type) =3D=3D FUNCTION_TYPE || TREE_CODE (type) =3D=3D M= ETHOD_TYPE) > + if (FUNC_OR_METHOD_TYPE_P (type)) > { > if (TREE_CODE (type) !=3D TREE_CODE (prevailing_type)) > lev |=3D 1; > @@ -401,7 +401,7 @@ lto_symtab_resolve_replaceable_p (symtab_node *e) > || DECL_WEAK (e->decl)) > return true; > > - if (TREE_CODE (e->decl) =3D=3D VAR_DECL) > + if (VAR_P (e->decl)) > return (DECL_COMMON (e->decl) > || (!flag_no_common && !DECL_INITIAL (e->decl))); > > @@ -803,7 +803,7 @@ lto_symtab_merge_decls_1 (symtab_node *first) > This is needed for C++ typeinfos, for example in > lto/20081204-1 there are typeifos in both units, just > one of them do have size. */ > - if (TREE_CODE (prevailing->decl) =3D=3D VAR_DECL) > + if (VAR_P (prevailing->decl)) > { > for (e =3D prevailing->next_sharing_asm_name; > e; e =3D e->next_sharing_asm_name) > @@ -848,7 +848,7 @@ lto_symtab_merge_decls_1 (symtab_node *first) > break; > > case FUNCTION_DECL: > - gcc_assert (TREE_CODE (e->decl) =3D=3D VAR_DECL); > + gcc_assert (VAR_P (e->decl)); > error_at (DECL_SOURCE_LOCATION (e->decl), > "function %qD redeclared as variable", > prevailing->decl); > diff --git a/gcc/lto/lto-symtab.h b/gcc/lto/lto-symtab.h > index f654f2cdebb..a60f262869b 100644 > --- a/gcc/lto/lto-symtab.h > +++ b/gcc/lto/lto-symtab.h > @@ -46,7 +46,7 @@ lto_symtab_prevailing_decl (tree decl) > return DECL_CHAIN (decl); > else > { > - if ((TREE_CODE (decl) =3D=3D VAR_DECL || TREE_CODE (decl) =3D=3D F= UNCTION_DECL) > + if ((VAR_P (decl) || TREE_CODE (decl) =3D=3D FUNCTION_DECL) > && DECL_VIRTUAL_P (decl) > && (TREE_PUBLIC (decl) || DECL_EXTERNAL (decl)) > && !symtab_node::get (decl)) > -- > 2.30.2 >