[PATCH] RISC-V: Reorganize mangle_builtin_type.[NFC]

[PATCH] RISC-V: Reorganize mangle_builtin_type.[NFC]

[juzhe.zhong]

From: Ju-Zhe Zhong <juzhe.zhong@rivai.ai>

Hi, this patch fixed my mistake in the previous commit patch.
Since "mangle_builtin_type" is a global function will be called in riscv.cc.
It's reasonable move it down and put them together stay with other global functions.

gcc/ChangeLog:

	* config/riscv/riscv-vector-builtins.cc (mangle_builtin_type): Move down the function.
---
 gcc/config/riscv/riscv-vector-builtins.cc | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/gcc/config/riscv/riscv-vector-builtins.cc b/gcc/config/riscv/riscv-vector-builtins.cc
index 99c482582d3..55d45651618 100644
--- a/gcc/config/riscv/riscv-vector-builtins.cc
+++ b/gcc/config/riscv/riscv-vector-builtins.cc
@@ -155,19 +155,6 @@ lookup_vector_type_attribute (const_tree type)
   return lookup_attribute ("RVV type", TYPE_ATTRIBUTES (type));
 }
 
-/* If TYPE is a built-in type defined by the RVV ABI, return the mangled name,
-   otherwise return NULL.  */
-const char *
-mangle_builtin_type (const_tree type)
-{
-  if (TYPE_NAME (type) && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL)
-    type = TREE_TYPE (TYPE_NAME (type));
-  if (tree attr = lookup_vector_type_attribute (type))
-    if (tree id = TREE_VALUE (chain_index (0, TREE_VALUE (attr))))
-      return IDENTIFIER_POINTER (id);
-  return NULL;
-}
-
 /* Return a representation of "const T *".  */
 static tree
 build_const_pointer (tree t)
@@ -250,6 +237,19 @@ register_vector_type (vector_type_index type)
   builtin_types[type].vector_ptr = build_pointer_type (vectype);
 }
 
+/* If TYPE is a built-in type defined by the RVV ABI, return the mangled name,
+   otherwise return NULL.  */
+const char *
+mangle_builtin_type (const_tree type)
+{
+  if (TYPE_NAME (type) && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL)
+    type = TREE_TYPE (TYPE_NAME (type));
+  if (tree attr = lookup_vector_type_attribute (type))
+    if (tree id = TREE_VALUE (chain_index (0, TREE_VALUE (attr))))
+      return IDENTIFIER_POINTER (id);
+  return NULL;
+}
+
 /* Initialize all compiler built-ins related to RVV that should be
    defined at start-up.  */
 void
-- 
2.36.1

Re: [PATCH] RISC-V: Reorganize mangle_builtin_type.[NFC]

[Kito Cheng]

Committed :)

On Sat, Oct 15, 2022 at 7:03 AM <juzhe.zhong@rivai.ai> wrote:
>
> From: Ju-Zhe Zhong <juzhe.zhong@rivai.ai>
>
> Hi, this patch fixed my mistake in the previous commit patch.
> Since "mangle_builtin_type" is a global function will be called in riscv.cc.
> It's reasonable move it down and put them together stay with other global functions.
>
> gcc/ChangeLog:
>
>         * config/riscv/riscv-vector-builtins.cc (mangle_builtin_type): Move down the function.
> ---
>  gcc/config/riscv/riscv-vector-builtins.cc | 26 +++++++++++------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/gcc/config/riscv/riscv-vector-builtins.cc b/gcc/config/riscv/riscv-vector-builtins.cc
> index 99c482582d3..55d45651618 100644
> --- a/gcc/config/riscv/riscv-vector-builtins.cc
> +++ b/gcc/config/riscv/riscv-vector-builtins.cc
> @@ -155,19 +155,6 @@ lookup_vector_type_attribute (const_tree type)
>    return lookup_attribute ("RVV type", TYPE_ATTRIBUTES (type));
>  }
>
> -/* If TYPE is a built-in type defined by the RVV ABI, return the mangled name,
> -   otherwise return NULL.  */
> -const char *
> -mangle_builtin_type (const_tree type)
> -{
> -  if (TYPE_NAME (type) && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL)
> -    type = TREE_TYPE (TYPE_NAME (type));
> -  if (tree attr = lookup_vector_type_attribute (type))
> -    if (tree id = TREE_VALUE (chain_index (0, TREE_VALUE (attr))))
> -      return IDENTIFIER_POINTER (id);
> -  return NULL;
> -}
> -
>  /* Return a representation of "const T *".  */
>  static tree
>  build_const_pointer (tree t)
> @@ -250,6 +237,19 @@ register_vector_type (vector_type_index type)
>    builtin_types[type].vector_ptr = build_pointer_type (vectype);
>  }
>
> +/* If TYPE is a built-in type defined by the RVV ABI, return the mangled name,
> +   otherwise return NULL.  */
> +const char *
> +mangle_builtin_type (const_tree type)
> +{
> +  if (TYPE_NAME (type) && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL)
> +    type = TREE_TYPE (TYPE_NAME (type));
> +  if (tree attr = lookup_vector_type_attribute (type))
> +    if (tree id = TREE_VALUE (chain_index (0, TREE_VALUE (attr))))
> +      return IDENTIFIER_POINTER (id);
> +  return NULL;
> +}
> +
>  /* Initialize all compiler built-ins related to RVV that should be
>     defined at start-up.  */
>  void
> --
> 2.36.1
>