From patchwork Wed Feb 22 09:33:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 60455 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp488765wrd; Wed, 22 Feb 2023 02:16:08 -0800 (PST) X-Google-Smtp-Source: AK7set9PvYLddmlmFSb12vi4q9FdFUpOLqDnRvXuwFNxj3eMwJZJtBA2FRsaXNFxFGxi34w1aYpf X-Received: by 2002:a17:906:4550:b0:8b1:7ae8:ba6f with SMTP id s16-20020a170906455000b008b17ae8ba6fmr18183808ejq.16.1677060968164; Wed, 22 Feb 2023 02:16:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677060968; cv=none; d=google.com; s=arc-20160816; b=v/cmIelj70D0aN4qOSbSG3ADnqTuuVMPCllwjslxdrCrFIoNqUr4VYC5LTFukY2xiC 5UD0JDryvrQ8L1TFNPNfSA4QP5UcXBcpORTi4lGs9pNwTwBZeHJCMDDQcyAC7GZNApgz I9uS7YOr2yI/PQIfxd0Q/Ym9RWdOgTrWkNvaVVYhqn6UpzGqEx5xjSK2pZM9r1Usi1/o pyaplPLErhx+/gdRHeVLg9QUfkzrxLpR1jEkPqif8QMLNeVxHNsdiW8NI2/2Sm86FtWM 1oTeL7voOt+lGygjwYd9LjjdwAeE/GZZd0KUtW7AG+szM1/FwT00G5sOtddn3geAGAST MR2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:message-id:date :user-agent:references:in-reply-to:subject:cc:to:from:ironport-sdr :dmarc-filter:delivered-to; bh=/KOPjPWiqFU3O5X/sKSAarMAEydvN3MukREuZJ+nPVg=; b=aQS+9fp4ZS8kr6Zt5ouiif2ge8EN86Mre7nXqS394IaLIVo32L0Y5+uAwiR3vam6yY amf/H5FqooRYNiB/Wm77z4nbbu1IR2ODR2vbMrdX2X6iDTz+e0NUlWufJwxB4npr3F2X oQkAmuRUWRKcg0rUxqdWC+qQ3g94dTw8aEvCgKZpRz1Hpot7x7xeLvnRAwU2idYyUikj ORpOUZRtgBDA4fs4xX9L7KUcivUE1q/Kkgi4gwDvI1NGKIcZ0nRlVXAAACK/Li74XVWm 0QIxPgoQJVn10elybQffQqPDOhpObkQHwBwm6a7eeNO1BPFlTpjVw8vK/dtPYNGwGMWn i6DA== ARC-Authentication-Results: i=1; mx.google.com; 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" Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id 20-20020a17090600d400b008dd3a4b3ef9si6223769eji.299.2023.02.22.02.16.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 02:16:08 -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; 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" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 084553850219 for ; Wed, 22 Feb 2023 10:15:36 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id 4F8623858C5E; Wed, 22 Feb 2023 10:15:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4F8623858C5E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.97,318,1669104000"; d="scan'208,223";a="101793339" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 22 Feb 2023 02:15:02 -0800 IronPort-SDR: ObYigaW+hrFdWlViSdrPwTRxe1cuIjjgT9MsSqHW5BGjCZk2dO0/o5D70QrhzcaUfrExtbT6UQ Bl/pSgHUPmb1xyTWepnaIEXPENhkLeIDzRZIWyrh6qna3yNAmbDiyYNQzAXmWwnSFoX7+v/7qP v7Eel6U//KP5eL+wM/l0QDY6NQaxcIqJAOaeAUWJUf53uKVnmJZRfrNnpkjbQyMvb3KI7mDxOw lxr6uJezhHIvIAKseSC13+robnTMd2rtSL9zuUdIT4Is0Dfthkx5GNIhsEN49RB+pUS2T8GsGI 9E8= From: Thomas Schwinge To: Richard Biener , CC: Richard Sandiford , Jakub Jelinek , Subject: Rust: Move void_list_node init to common code (was: [PATCH] Move void_list_node init to common code) In-Reply-To: <20220914140656.640BF134B3@imap2.suse-dmz.suse.de> References: <20220914140656.640BF134B3@imap2.suse-dmz.suse.de> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Wed, 22 Feb 2023 10:33:29 +0100 Message-ID: <877cwa6o46.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-15.mgc.mentorg.com (139.181.222.15) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758525882043159524?= X-GMAIL-MSGID: =?utf-8?q?1758525882043159524?= Hi! On 2022-09-14T16:06:55+0200, Richard Biener via Gcc-patches wrote: > All frontends replicate this, so move it. At that time, the Rust front end was not yet in master branch; I've now pushed to master branch commit 334f23d83261997ca89d8919b94b97aa22003a65 "Rust: Move void_list_node init to common code", see attached. Grüße Thomas > Bootstrap and regtest running for all languages on > x86_64-unknown-linux-gnu. > > OK if that succeeds? > > Thanks, > Richard. > > gcc/ > * tree.cc (build_common_tree_nodes): Initialize void_list_node > here. > > gcc/ada/ > * gcc-interface/trans.cc (gigi): Do not initialize void_list_node. > > gcc/c-family/ > * c-common.h (build_void_list_node): Remove. > * c-common.cc (c_common_nodes_and_builtins): Do not initialize > void_list_node. > > gcc/c/ > * c-decl.cc (build_void_list_node): Remove. > > gcc/cp/ > * decl.cc (cxx_init_decl_processing): Inline last > build_void_list_node call. > (build_void_list_node): Remove. > > gcc/d/ > * d-builtins.cc (d_build_c_type_nodes): Do not initialize > void_list_node. > > gcc/fortran/ > * f95-lang.c (gfc_init_decl_processing): Do not initialize > void_list_node. > > gcc/go/ > * go-lang.cc (go_langhook_init): Do not initialize > void_list_node. > > gcc/jit/ > * dummy-frontend.cc (jit_langhook_init): Do not initialize > void_list_node. > > gcc/lto/ > * lto-lang.cc (lto_build_c_type_nodes): Do not initialize > void_list_node. > --- > gcc/ada/gcc-interface/trans.cc | 1 - > gcc/c-family/c-common.cc | 2 -- > gcc/c-family/c-common.h | 1 - > gcc/c/c-decl.cc | 8 -------- > gcc/cp/decl.cc | 10 +--------- > gcc/d/d-builtins.cc | 1 - > gcc/fortran/f95-lang.cc | 2 -- > gcc/go/go-lang.cc | 3 --- > gcc/jit/dummy-frontend.cc | 3 --- > gcc/lto/lto-lang.cc | 1 - > gcc/tree.cc | 2 ++ > 11 files changed, 3 insertions(+), 31 deletions(-) > > diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc > index f2e0cb2299b..2d93947cb26 100644 > --- a/gcc/ada/gcc-interface/trans.cc > +++ b/gcc/ada/gcc-interface/trans.cc > @@ -413,7 +413,6 @@ gigi (Node_Id gnat_root, > save_gnu_tree (gnat_literal, t, false); > > /* Declare the building blocks of function nodes. */ > - void_list_node = build_tree_list (NULL_TREE, void_type_node); > void_ftype = build_function_type_list (void_type_node, NULL_TREE); > ptr_void_ftype = build_pointer_type (void_ftype); > > diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc > index 0a5b7e120c9..c0f15f4cab1 100644 > --- a/gcc/c-family/c-common.cc > +++ b/gcc/c-family/c-common.cc > @@ -4505,8 +4505,6 @@ c_common_nodes_and_builtins (void) > TYPE_NAME (void_type_node) = void_name; > } > > - void_list_node = build_void_list_node (); > - > /* Make a type to be the domain of a few array types > whose domains don't really matter. > 200 is small enough that it always fits in size_t > diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h > index ce971a29b5d..2f592f5cd58 100644 > --- a/gcc/c-family/c-common.h > +++ b/gcc/c-family/c-common.h > @@ -853,7 +853,6 @@ extern tree identifier_global_tag (tree); > extern bool names_builtin_p (const char *); > extern tree c_linkage_bindings (tree); > extern void record_builtin_type (enum rid, const char *, tree); > -extern tree build_void_list_node (void); > extern void start_fname_decls (void); > extern void finish_fname_decls (void); > extern const char *fname_as_string (int); > diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc > index 34f8feda897..b09c6393b91 100644 > --- a/gcc/c/c-decl.cc > +++ b/gcc/c/c-decl.cc > @@ -10676,14 +10676,6 @@ record_builtin_type (enum rid rid_index, const char *name, tree type) > debug_hooks->type_decl (decl, false); > } > > -/* Build the void_list_node (void_type_node having been created). */ > -tree > -build_void_list_node (void) > -{ > - tree t = build_tree_list (NULL_TREE, void_type_node); > - return t; > -} > - > /* Return a c_parm structure with the given SPECS, ATTRS and DECLARATOR. */ > > struct c_parm * > diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc > index 006e9affcba..070f673c3a2 100644 > --- a/gcc/cp/decl.cc > +++ b/gcc/cp/decl.cc > @@ -4623,7 +4623,7 @@ cxx_init_decl_processing (void) > record_unknown_type (init_list_type_node, "init list"); > > /* Used when parsing to distinguish parameter-lists () and (void). */ > - explicit_void_list_node = build_void_list_node (); > + explicit_void_list_node = build_tree_list (NULL_TREE, void_type_node); > > { > /* Make sure we get a unique function type, so we can give > @@ -18450,14 +18450,6 @@ cp_tree_node_structure (union lang_tree_node * t) > } > } > > -/* Build the void_list_node (void_type_node having been created). */ > -tree > -build_void_list_node (void) > -{ > - tree t = build_tree_list (NULL_TREE, void_type_node); > - return t; > -} > - > bool > cp_missing_noreturn_ok_p (tree decl) > { > diff --git a/gcc/d/d-builtins.cc b/gcc/d/d-builtins.cc > index c2ef0c836e1..5997e5dcaf4 100644 > --- a/gcc/d/d-builtins.cc > +++ b/gcc/d/d-builtins.cc > @@ -889,7 +889,6 @@ static GTY(()) tree signed_size_type_node; > static void > d_build_c_type_nodes (void) > { > - void_list_node = build_tree_list (NULL_TREE, void_type_node); > string_type_node = build_pointer_type (char_type_node); > const_string_type_node > = build_pointer_type (build_qualified_type (char_type_node, > diff --git a/gcc/fortran/f95-lang.cc b/gcc/fortran/f95-lang.cc > index ff4bf800e49..a6750bea787 100644 > --- a/gcc/fortran/f95-lang.cc > +++ b/gcc/fortran/f95-lang.cc > @@ -530,8 +530,6 @@ gfc_init_decl_processing (void) > only use it for actual characters, not for INTEGER(1). */ > build_common_tree_nodes (false); > > - void_list_node = build_tree_list (NULL_TREE, void_type_node); > - > /* Set up F95 type nodes. */ > gfc_init_kinds (); > gfc_init_types (); > diff --git a/gcc/go/go-lang.cc b/gcc/go/go-lang.cc > index d519a69e647..4743370ff66 100644 > --- a/gcc/go/go-lang.cc > +++ b/gcc/go/go-lang.cc > @@ -98,9 +98,6 @@ go_langhook_init (void) > { > build_common_tree_nodes (false); > > - /* I don't know why this has to be done explicitly. */ > - void_list_node = build_tree_list (NULL_TREE, void_type_node); > - > /* We must create the gogo IR after calling build_common_tree_nodes > (because Gogo::define_builtin_function_trees refers indirectly > to, e.g., unsigned_char_type_node) but before calling > diff --git a/gcc/jit/dummy-frontend.cc b/gcc/jit/dummy-frontend.cc > index 84ff359bfe3..0687567bc88 100644 > --- a/gcc/jit/dummy-frontend.cc > +++ b/gcc/jit/dummy-frontend.cc > @@ -594,9 +594,6 @@ jit_langhook_init (void) > > build_common_tree_nodes (false); > > - /* I don't know why this has to be done explicitly. */ > - void_list_node = build_tree_list (NULL_TREE, void_type_node); > - > build_common_builtin_nodes (); > > /* The default precision for floating point numbers. This is used > diff --git a/gcc/lto/lto-lang.cc b/gcc/lto/lto-lang.cc > index 972a0336f75..d36453ba25d 100644 > --- a/gcc/lto/lto-lang.cc > +++ b/gcc/lto/lto-lang.cc > @@ -1239,7 +1239,6 @@ lto_build_c_type_nodes (void) > { > gcc_assert (void_type_node); > > - void_list_node = build_tree_list (NULL_TREE, void_type_node); > string_type_node = build_pointer_type (char_type_node); > const_string_type_node > = build_pointer_type (build_qualified_type (char_type_node, TYPE_QUAL_CONST)); > diff --git a/gcc/tree.cc b/gcc/tree.cc > index 0546c8f4025..4165cbd7c3b 100644 > --- a/gcc/tree.cc > +++ b/gcc/tree.cc > @@ -9414,6 +9414,8 @@ build_common_tree_nodes (bool signed_char) > void_node = make_node (VOID_CST); > TREE_TYPE (void_node) = void_type_node; > > + void_list_node = build_tree_list (NULL_TREE, void_type_node); > + > null_pointer_node = build_int_cst (build_pointer_type (void_type_node), 0); > layout_type (TREE_TYPE (null_pointer_node)); > ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 From 334f23d83261997ca89d8919b94b97aa22003a65 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 22 Feb 2023 10:15:19 +0100 Subject: [PATCH] Rust: Move void_list_node init to common code Apply commit r13-2682-g8ff2a92a0450243e52d3299a13b30f208bafa7e0 "Move void_list_node init to common code" to the Rust front end, too. gcc/rust/ * rust-lang.cc (grs_langhook_init): Do not initialize void_list_node. --- gcc/rust/rust-lang.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gcc/rust/rust-lang.cc b/gcc/rust/rust-lang.cc index 75f6b4458d74..3e20c45d907b 100644 --- a/gcc/rust/rust-lang.cc +++ b/gcc/rust/rust-lang.cc @@ -123,10 +123,6 @@ grs_langhook_init (void) whether char is signed. */ build_common_tree_nodes (false); - // Creates a new TREE_LIST node with purpose NULL_TREE and value - // void_type_node - void_list_node = build_tree_list (NULL_TREE, void_type_node); - // Builds built-ins for middle-end after all front-end built-ins are already // instantiated build_common_builtin_nodes (); -- 2.39.1