[gcc(refs/users/alfierichards/heads/fmv_c)] Remove unnecessary `record` argument from maybe_version_functions.

[Alfie Richards via Gcc-cvs]

https://gcc.gnu.org/g:5cb80d373a338aec848850d90d12063ff5a704f9

commit 5cb80d373a338aec848850d90d12063ff5a704f9
Author: Alfie Richards <alfie.richa...@arm.com>
Date:   Tue Jan 28 15:42:49 2025 +0000

    Remove unnecessary `record` argument from maybe_version_functions.
    
    Previously, the `record` argument in maybe_version_function allowed the
    call to cgraph_node::record_function_versions to be skipped.  However,
    this was only skipped when both decls were already marked as versioned,
    in which case we trigger the early exit in record_function_versions
    instead. Therefore, the argument is unnecessary.
    
    gcc/cp/ChangeLog:
    
            * class.cc (add_method): Remove argument.
            * cp-tree.h (maybe_version_functions): Ditto.
            * decl.cc (decls_match): Ditto.
            (maybe_version_functions): Ditto.

Diff:
---
 gcc/cp/class.cc  | 2 +-
 gcc/cp/cp-tree.h | 2 +-
 gcc/cp/decl.cc   | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/gcc/cp/class.cc b/gcc/cp/class.cc
index 2b694b98e565..93f1a1bdd81b 100644
--- a/gcc/cp/class.cc
+++ b/gcc/cp/class.cc
@@ -1402,7 +1402,7 @@ add_method (tree type, tree method, bool via_using)
       /* If these are versions of the same function, process and
         move on.  */
       if (TREE_CODE (fn) == FUNCTION_DECL
-         && maybe_version_functions (method, fn, true))
+         && maybe_version_functions (method, fn))
        continue;
 
       if (DECL_INHERITED_CTOR (method))
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 927f51b116b3..5bfc08191f6d 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -7122,7 +7122,7 @@ extern void determine_local_discriminator (tree, tree = 
NULL_TREE);
 extern bool member_like_constrained_friend_p   (tree);
 extern bool fns_correspond                     (tree, tree);
 extern int decls_match                         (tree, tree, bool = true);
-extern bool maybe_version_functions            (tree, tree, bool);
+extern bool maybe_version_functions            (tree, tree);
 extern bool validate_constexpr_redeclaration   (tree, tree);
 extern bool merge_default_template_args                (tree, tree, bool);
 extern tree duplicate_decls                    (tree, tree,
diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 2ed94fd786ce..85c1b63c1f54 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -1216,9 +1216,7 @@ decls_match (tree newdecl, tree olddecl, bool 
record_versions /* = true */)
          && targetm.target_option.function_versions (newdecl, olddecl))
        {
          if (record_versions)
-           maybe_version_functions (newdecl, olddecl,
-                                    (!DECL_FUNCTION_VERSIONED (newdecl)
-                                     || !DECL_FUNCTION_VERSIONED (olddecl)));
+           maybe_version_functions (newdecl, olddecl);
          return 0;
        }
     }
@@ -1289,7 +1287,7 @@ maybe_mark_function_versioned (tree decl)
    If RECORD is set to true, record function versions.  */
 
 bool
-maybe_version_functions (tree newdecl, tree olddecl, bool record)
+maybe_version_functions (tree newdecl, tree olddecl)
 {
   if (!targetm.target_option.function_versions (newdecl, olddecl))
     return false;
@@ -1312,8 +1310,7 @@ maybe_version_functions (tree newdecl, tree olddecl, bool 
record)
       maybe_mark_function_versioned (newdecl);
     }
 
-  if (record)
-    cgraph_node::record_function_versions (olddecl, newdecl);
+  cgraph_node::record_function_versions (olddecl, newdecl);
 
   return true;
 }