https://gcc.gnu.org/g:20e50fb3ebc5826595a832bea917f0649ea3d58a

commit r17-5875-g20e50fb3ebc5826595a832bea917f0649ea3d58a
Author: Giuliano Belinassi <[email protected]>
Date:   Mon Nov 2 16:52:52 2026 +0100

    Call symtab_node::get_create when it is suitable
    
    In many cases the original code checked if the decl is a variable or a
    function and forward the call to either varpool_node::get_create or
    cgraph_node::get_create.  However, there is an API already for
    checking that: symtab_node::get_create.  Hence, modify the code for
    the cases where this is suitable.
    
    gcc/ChangeLog:
    
            * cgraphunit.cc (symbol_table::process_same_body_aliases): Call
            symtab_node::get_create.
            * tree.cc (set_decl_section_name): Likewise.
            (decl_init_priority_insert): Likewise.
            * varasm.cc (assemble_alias): Likewise.
            (make_decl_one_only): Likewise.
    
    gcc/cp/ChangeLog:
    
            * decl.cc (duplicate_decls): Call symtab_node::get_create.
    
    Signed-off-by: Giuliano Belinassi <[email protected]>

Diff:
---
 gcc/cgraphunit.cc |  5 +----
 gcc/cp/decl.cc    |  5 +----
 gcc/tree.cc       | 14 +++-----------
 gcc/varasm.cc     | 10 ++--------
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/gcc/cgraphunit.cc b/gcc/cgraphunit.cc
index b77f082757bf..61944a9d6610 100644
--- a/gcc/cgraphunit.cc
+++ b/gcc/cgraphunit.cc
@@ -727,10 +727,7 @@ symbol_table::process_same_body_aliases (void)
   symtab_node *node;
   FOR_EACH_SYMBOL (node)
     if (node->cpp_implicit_alias && !node->analyzed)
-      node->resolve_alias
-       (VAR_P (node->alias_target)
-        ? (symtab_node *)varpool_node::get_create (node->alias_target)
-        : (symtab_node *)cgraph_node::get_create (node->alias_target));
+      node->resolve_alias (symtab_node::get_create (node->alias_target));
   cpp_implicit_aliases_done = true;
 }
 
diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 16ce7cd36b0a..7243c8a3caa6 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -3573,10 +3573,7 @@ duplicate_decls (tree newdecl, tree olddecl, bool 
hiding, bool was_hidden)
          if (DECL_ONE_ONLY (newdecl))
            {
              struct symtab_node *oldsym, *newsym;
-             if (TREE_CODE (olddecl) == FUNCTION_DECL)
-               oldsym = cgraph_node::get_create (olddecl);
-             else
-               oldsym = varpool_node::get_create (olddecl);
+             oldsym = symtab_node::get_create (olddecl);
              newsym = symtab_node::get (newdecl);
              oldsym->set_comdat_group (newsym->get_comdat_group ());
            }
diff --git a/gcc/tree.cc b/gcc/tree.cc
index 7e5a53234bae..2e46b4bcdaa3 100644
--- a/gcc/tree.cc
+++ b/gcc/tree.cc
@@ -1024,10 +1024,8 @@ set_decl_section_name (tree node, const char *value)
       if (!snode)
        return;
     }
-  else if (VAR_P (node))
-    snode = varpool_node::get_create (node);
   else
-    snode = cgraph_node::get_create (node);
+    snode = symtab_node::get_create (node);
   snode->set_section (value);
 }
 
@@ -1042,11 +1040,7 @@ set_decl_section_name (tree decl, const_tree other)
   struct symtab_node *other_node = symtab_node::get (other);
   if (other_node)
     {
-      struct symtab_node *decl_node;
-      if (VAR_P (decl))
-    decl_node = varpool_node::get_create (decl);
-      else
-    decl_node = cgraph_node::get_create (decl);
+      struct symtab_node *decl_node = symtab_node::get_create (decl);
       decl_node->set_section (*other_node);
     }
   else
@@ -6077,10 +6071,8 @@ decl_init_priority_insert (tree decl, priority_type 
priority)
       if (!snode)
        return;
     }
-  else if (VAR_P (decl))
-    snode = varpool_node::get_create (decl);
   else
-    snode = cgraph_node::get_create (decl);
+    snode = symtab_node::get_create (decl);
   snode->set_init_priority (priority);
 }
 
diff --git a/gcc/varasm.cc b/gcc/varasm.cc
index 7ce5032a6cb9..0c5f80165e94 100644
--- a/gcc/varasm.cc
+++ b/gcc/varasm.cc
@@ -6687,10 +6687,7 @@ assemble_alias (tree decl, tree target)
   TREE_USED (decl) = 1;
 
   /* Allow aliases to aliases.  */
-  if (TREE_CODE (decl) == FUNCTION_DECL)
-    cgraph_node::get_create (decl)->alias = true;
-  else
-    varpool_node::get_create (decl)->alias = true;
+  symtab_node::get_create (decl)->alias = true;
 
   /* If the target has already been emitted, we don't have to queue the
      alias.  This saves a tad of memory.  */
@@ -6938,10 +6935,7 @@ make_decl_one_only (tree decl, tree comdat_group)
 
   TREE_PUBLIC (decl) = 1;
 
-  if (VAR_P (decl))
-    symbol = varpool_node::get_create (decl);
-  else
-    symbol = cgraph_node::get_create (decl);
+  symbol = symtab_node::get_create (decl);
 
   if (SUPPORTS_ONE_ONLY)
     {

Reply via email to