Rust: Move void_list_node init to common code (was: [PATCH] Move void_list_node init to common code)

Message ID 877cwa6o46.fsf@euler.schwinge.homeip.net
State Committed
Headers
Series Rust: Move void_list_node init to common code (was: [PATCH] Move void_list_node init to common code) |

Commit Message

Thomas Schwinge Feb. 22, 2023, 9:33 a.m. UTC
  Hi!

On 2022-09-14T16:06:55+0200, Richard Biener via Gcc-patches <gcc-patches@gcc.gnu.org> 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
  

Patch

From 334f23d83261997ca89d8919b94b97aa22003a65 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
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