[08/11] aarch64: Inline aarch64_get_all_extension_candidates

Message ID 9e36d5f2-ab4f-ac79-0285-5871d7df21d2@e124511.cambridge.arm.com
State New
Headers
Series aarch64: Refactor target parsing |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_gcc_check--master-arm success Test passed
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 success Test passed

Commit Message

Andrew Carlotti Jan. 10, 2025, 5:24 p.m. UTC
  gcc/ChangeLog:

	* common/config/aarch64/aarch64-common.cc
	(aarch64_get_all_extension_candidates): Inline into...
	(aarch64_print_hint_for_extensions): ...this.
  

Comments

Richard Sandiford Jan. 14, 2025, 6:10 p.m. UTC | #1
Andrew Carlotti <andrew.carlotti@arm.com> writes:
> gcc/ChangeLog:
>
> 	* common/config/aarch64/aarch64-common.cc
> 	(aarch64_get_all_extension_candidates): Inline into...
> 	(aarch64_print_hint_for_extensions): ...this.

OK, thanks.

Richard

> diff --git a/gcc/common/config/aarch64/aarch64-common.cc b/gcc/common/config/aarch64/aarch64-common.cc
> index 5cc00cd3b72807ec439c9c72af297d1ff5b2b679..0d0502a72687cb50e1dd66d9e4312386ee6096fe 100644
> --- a/gcc/common/config/aarch64/aarch64-common.cc
> +++ b/gcc/common/config/aarch64/aarch64-common.cc
> @@ -205,16 +205,6 @@ static constexpr processor_info all_cores[] =
>  };
>  
>  
> -/* Append all architecture extension candidates to the CANDIDATES vector.  */
> -
> -void
> -aarch64_get_all_extension_candidates (auto_vec<const char *> *candidates)
> -{
> -  const struct extension_info *opt;
> -  for (opt = all_extensions; opt->name != NULL; opt++)
> -    candidates->safe_push (opt->name);
> -}
> -
>  /* Print a hint with a suggestion for an extension name
>     that most closely resembles what the user passed in STR.  */
>  
> @@ -222,7 +212,10 @@ void
>  aarch64_print_hint_for_extensions (const char *str)
>  {
>    auto_vec<const char *> candidates;
> -  aarch64_get_all_extension_candidates (&candidates);
> +  const struct extension_info *opt;
> +  for (opt = all_extensions; opt->name != NULL; opt++)
> +    candidates.safe_push (opt->name);
> +
>    char *s;
>    const char *hint = candidates_list_and_hint (str, s, candidates);
>    if (hint)
  

Patch

diff --git a/gcc/common/config/aarch64/aarch64-common.cc b/gcc/common/config/aarch64/aarch64-common.cc
index 5cc00cd3b72807ec439c9c72af297d1ff5b2b679..0d0502a72687cb50e1dd66d9e4312386ee6096fe 100644
--- a/gcc/common/config/aarch64/aarch64-common.cc
+++ b/gcc/common/config/aarch64/aarch64-common.cc
@@ -205,16 +205,6 @@  static constexpr processor_info all_cores[] =
 };
 
 
-/* Append all architecture extension candidates to the CANDIDATES vector.  */
-
-void
-aarch64_get_all_extension_candidates (auto_vec<const char *> *candidates)
-{
-  const struct extension_info *opt;
-  for (opt = all_extensions; opt->name != NULL; opt++)
-    candidates->safe_push (opt->name);
-}
-
 /* Print a hint with a suggestion for an extension name
    that most closely resembles what the user passed in STR.  */
 
@@ -222,7 +212,10 @@  void
 aarch64_print_hint_for_extensions (const char *str)
 {
   auto_vec<const char *> candidates;
-  aarch64_get_all_extension_candidates (&candidates);
+  const struct extension_info *opt;
+  for (opt = all_extensions; opt->name != NULL; opt++)
+    candidates.safe_push (opt->name);
+
   char *s;
   const char *hint = candidates_list_and_hint (str, s, candidates);
   if (hint)