[PATCH v8 6/8] aarch64: Make `NUM_VECTOR_TYPES` an enum member

[Karl Meakin via Sourceware Forge]

From: Karl Meakin <karl.mea...@arm.com>

Change `NUM_VECTOR_TYPES` from a preprocessor macro to an enum member of
`vector_type_index`

gcc/ChangeLog:

        * config/aarch64/aarch64-sve-builtins.cc (VECTOR_TYPE_none):
        Delete preprocessor macro.
        * config/aarch64/aarch64-sve-builtins.h (VECTOR_TYPE_none): Add
        enum member.
---
 gcc/config/aarch64/aarch64-sve-builtins.cc | 1 -
 gcc/config/aarch64/aarch64-sve-builtins.h  | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/gcc/config/aarch64/aarch64-sve-builtins.cc b/gcc/config/aarch64/aarch64-sve-builtins.cc
index 65fd5583c9db..668228c33e94 100644
--- a/gcc/config/aarch64/aarch64-sve-builtins.cc
+++ b/gcc/config/aarch64/aarch64-sve-builtins.cc
@@ -124,7 +124,6 @@ static const char *const pred_suffixes[NUM_PREDS + 1] = {
 
 /* Static information about each mode_suffix_index.  */
 constexpr mode_suffix_info mode_suffixes[] = {
-#define VECTOR_TYPE_none NUM_VECTOR_TYPES
 #define DEF_SVE_MODE(NAME, BASE, DISPLACEMENT, UNITS)		  \
   { /* .string			 = */ "_" #NAME,		  \
     /* .base_vector_type	 = */ VECTOR_TYPE_##BASE,	  \
diff --git a/gcc/config/aarch64/aarch64-sve-builtins.h b/gcc/config/aarch64/aarch64-sve-builtins.h
index b1ea66095444..628f1788f03e 100644
--- a/gcc/config/aarch64/aarch64-sve-builtins.h
+++ b/gcc/config/aarch64/aarch64-sve-builtins.h
@@ -114,7 +114,8 @@ enum vector_type_index
 {
 #define DEF_SVE_TYPE(ACLE_NAME, ...) VECTOR_TYPE_##ACLE_NAME,
 #include "aarch64-sve-builtins.def"
-  NUM_VECTOR_TYPES
+  VECTOR_TYPE_none,
+  NUM_VECTOR_TYPES = VECTOR_TYPE_none,
 };
 
 /* Classifies the available measurement units for an address displacement.  */