From ca32b29ec3e92dcf8dda5c2501d0baf9dd1cb09d Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 13 Jan 2022 18:46:26 +0100 Subject: [PATCH] Use more ARRAY_SIZE. gcc/ada/ChangeLog: * locales.c (iso_639_1_to_639_3): Use ARRAY_SIZE. (language_name_to_639_3): Likewise. (country_name_to_3166): Likewise. gcc/analyzer/ChangeLog: * engine.cc (exploded_node::get_dot_fillcolor): Use ARRAY_SIZE. * function-set.cc (test_stdio_example): Likewise. * sm-file.cc (get_file_using_fns): Likewise. * sm-malloc.cc (malloc_state_machine::unaffected_by_call_p): Likewise. * sm-signal.cc (get_async_signal_unsafe_fns): Likewise. gcc/ChangeLog: * attribs.cc (diag_attr_exclusions): Use ARRAY_SIZE. (decls_mismatched_attributes): Likewise. * builtins.cc (c_strlen): Likewise. * cfg.cc (DEF_BASIC_BLOCK_FLAG): Likewise. * common/config/aarch64/aarch64-common.cc (aarch64_option_init_struct): Likewise. * config/aarch64/aarch64-builtins.cc (aarch64_lookup_simd_builtin_type): Likewise. (aarch64_init_simd_builtin_types): Likewise. (aarch64_init_builtin_rsqrt): Likewise. * config/aarch64/aarch64.cc (is_madd_op): Likewise. * config/arm/arm-builtins.cc (arm_lookup_simd_builtin_type): Likewise. (arm_init_simd_builtin_types): Likewise. * config/avr/gen-avr-mmcu-texi.cc (mcus[ARRAY_SIZE): Likewise. (c_prefix): Likewise. (main): Likewise. * config/c6x/c6x.cc (N_SAVE_ORDER): Likewise. * config/darwin-c.cc (darwin_register_frameworks): Likewise. * config/gcn/mkoffload.cc (process_obj): Likewise. * config/i386/i386-builtins.cc (get_builtin_code_for_version): Likewise. (fold_builtin_cpu): Likewise. * config/m32c/m32c.cc (PUSHM_N): Likewise. * config/nvptx/mkoffload.cc (process): Likewise. * config/rs6000/driver-rs6000.cc (host_detect_local_cpu): Likewise. * config/s390/s390.cc (NR_C_MODES): Likewise. * config/tilepro/gen-mul-tables.cc (find_sequences): Likewise. (create_insn_code_compression_table): Likewise. * config/vms/vms.cc (NBR_CRTL_NAMES): Likewise. * diagnostic-format-json.cc (json_from_expanded_location): Likewise. * dwarf2out.cc (ARRAY_SIZE): Likewise. * genhooks.cc (emit_documentation): Likewise. (emit_init_macros): Likewise. * gimple-ssa-sprintf.cc (format_floating): Likewise. * gimple-ssa-warn-access.cc (memmodel_name): Likewise. * godump.cc (keyword_hash_init): Likewise. * hash-table.cc (hash_table_higher_prime_index): Likewise. * input.cc (for_each_line_table_case): Likewise. * ipa-free-lang-data.cc (free_lang_data): Likewise. * ipa-inline.cc (sanitize_attrs_match_for_inline_p): Likewise. * optc-save-gen.awk: Likewise. * spellcheck.cc (test_metric_conditions): Likewise. * tree-vect-slp-patterns.cc (sizeof): Likewise. (ARRAY_SIZE): Likewise. * tree.cc (build_common_tree_nodes): Likewise. gcc/c-family/ChangeLog: * c-common.cc (ARRAY_SIZE): Use ARRAY_SIZE. (c_common_nodes_and_builtins): Likewise. * c-format.cc (check_tokens): Likewise. (check_plain): Likewise. * c-pragma.cc (c_pp_lookup_pragma): Likewise. (init_pragma): Likewise. * known-headers.cc (get_string_macro_hint): Likewise. (get_stdlib_header_for_name): Likewise. * c-attribs.cc: Likewise. gcc/c/ChangeLog: * c-decl.cc (match_builtin_function_types): Use ARRAY_SIZE. gcc/cp/ChangeLog: * module.cc (depset::entity_kind_name): Use ARRAY_SIZE. * name-lookup.cc (get_std_name_hint): Likewise. * parser.cc (cp_parser_new): Likewise. gcc/fortran/ChangeLog: * frontend-passes.cc (gfc_code_walker): Use ARRAY_SIZE. * openmp.cc (gfc_match_omp_context_selector_specification): Likewise. * trans-intrinsic.cc (conv_intrinsic_ieee_builtin): Likewise. * trans-types.cc (gfc_get_array_descr_info): Likewise. gcc/jit/ChangeLog: * jit-builtins.cc (find_builtin_by_name): Use ARRAY_SIZE. (get_string_for_type_id): Likewise. * jit-recording.cc (recording::context::context): Likewise. gcc/lto/ChangeLog: * lto-common.cc (lto_resolution_read): Use ARRAY_SIZE. * lto-lang.cc (lto_init): Likewise. --- gcc/ada/locales.c | 8 +++++--- gcc/analyzer/engine.cc | 2 +- gcc/analyzer/function-set.cc | 2 +- gcc/analyzer/sm-file.cc | 3 +-- gcc/analyzer/sm-malloc.cc | 3 +-- gcc/analyzer/sm-signal.cc | 3 +-- gcc/attribs.cc | 4 ++-- gcc/builtins.cc | 2 +- gcc/c-family/c-attribs.cc | 3 +-- gcc/c-family/c-common.cc | 7 ++----- gcc/c-family/c-format.cc | 12 ++++++------ gcc/c-family/c-pragma.cc | 9 ++++----- gcc/c-family/known-headers.cc | 5 ++--- gcc/c/c-decl.cc | 8 +++----- gcc/cfg.cc | 2 +- gcc/common/config/aarch64/aarch64-common.cc | 3 +-- gcc/config/aarch64/aarch64-builtins.cc | 6 +++--- gcc/config/aarch64/aarch64.cc | 2 +- gcc/config/arm/arm-builtins.cc | 4 ++-- gcc/config/avr/gen-avr-mmcu-texi.cc | 8 +++++--- gcc/config/c6x/c6x.cc | 2 +- gcc/config/darwin-c.cc | 2 +- gcc/config/gcn/mkoffload.cc | 2 +- gcc/config/i386/i386-builtins.cc | 6 ++---- gcc/config/m32c/m32c.cc | 2 +- gcc/config/nvptx/mkoffload.cc | 6 +++--- gcc/config/rs6000/driver-rs6000.cc | 2 +- gcc/config/s390/s390.cc | 2 +- gcc/config/tilepro/gen-mul-tables.cc | 4 ++-- gcc/config/vms/vms.cc | 2 +- gcc/cp/module.cc | 2 +- gcc/cp/name-lookup.cc | 2 +- gcc/cp/parser.cc | 2 +- gcc/diagnostic-format-json.cc | 2 +- gcc/dwarf2out.cc | 3 +-- gcc/fortran/frontend-passes.cc | 4 +--- gcc/fortran/openmp.cc | 3 +-- gcc/fortran/trans-intrinsic.cc | 2 +- gcc/fortran/trans-types.cc | 2 +- gcc/genhooks.cc | 9 ++++----- gcc/gimple-ssa-sprintf.cc | 2 +- gcc/gimple-ssa-warn-access.cc | 2 +- gcc/godump.cc | 2 +- gcc/hash-table.cc | 2 +- gcc/input.cc | 3 +-- gcc/ipa-free-lang-data.cc | 4 +--- gcc/ipa-inline.cc | 2 +- gcc/jit/jit-builtins.cc | 6 ++---- gcc/jit/jit-recording.cc | 4 +--- gcc/lto/lto-common.cc | 3 +-- gcc/lto/lto-lang.cc | 4 +--- gcc/optc-save-gen.awk | 16 ++++++++-------- gcc/spellcheck.cc | 2 +- gcc/tree-vect-slp-patterns.cc | 2 +- gcc/tree.cc | 4 +--- 55 files changed, 94 insertions(+), 121 deletions(-) diff --git a/gcc/ada/locales.c b/gcc/ada/locales.c index ee1385a..01cb45b 100644 --- a/gcc/ada/locales.c +++ b/gcc/ada/locales.c @@ -35,6 +35,8 @@ #include #include +#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) + typedef char char4 [4]; /* Table containing equivalences between ISO_639_1 codes and their ISO_639_3 @@ -649,7 +651,7 @@ str_get_last_byte (char *lc_all) { static char* iso_639_1_to_639_3(char* iso_639_1_code) { - int len = sizeof(iso_639)/sizeof(iso_639[0]); + int len = ARRAY_SIZE (iso_639); char **p = iso_639; int j; @@ -673,7 +675,7 @@ iso_639_1_to_639_3(char* iso_639_1_code) { static char* language_name_to_639_3(char* name) { - int len = sizeof(iso_639)/sizeof(iso_639[0]); + int len = ARRAY_SIZE (iso_639); char **p = iso_639; int j; @@ -695,7 +697,7 @@ language_name_to_639_3(char* name) { static char* country_name_to_3166 (char* name) { - int len = sizeof(iso_3166)/sizeof(iso_3166[0]); + int len = ARRAY_SIZE (iso_3166); char **p = iso_3166; int j; diff --git a/gcc/analyzer/engine.cc b/gcc/analyzer/engine.cc index 0332932..24dd598 100644 --- a/gcc/analyzer/engine.cc +++ b/gcc/analyzer/engine.cc @@ -1139,7 +1139,7 @@ exploded_node::get_dot_fillcolor () const = {"azure", "coral", "cornsilk", "lightblue", "yellow", "honeydew", "lightpink", "lightsalmon", "palegreen1", "wheat", "seashell"}; - const int num_colors = sizeof (colors) / sizeof (colors[0]); + const int num_colors = ARRAY_SIZE (colors); return colors[total_sm_state % num_colors]; } else diff --git a/gcc/analyzer/function-set.cc b/gcc/analyzer/function-set.cc index 8d9237d..be04186 100644 --- a/gcc/analyzer/function-set.cc +++ b/gcc/analyzer/function-set.cc @@ -166,7 +166,7 @@ test_stdio_example () "getwc_unlocked", "putc_unlocked" }; - const size_t count = sizeof(example) / sizeof (example[0]); + const size_t count = ARRAY_SIZE (example); function_set fs (example, count); fs.assert_sorted (); fs.assert_sane (); diff --git a/gcc/analyzer/sm-file.cc b/gcc/analyzer/sm-file.cc index ffc2809..3a45e62 100644 --- a/gcc/analyzer/sm-file.cc +++ b/gcc/analyzer/sm-file.cc @@ -329,8 +329,7 @@ get_file_using_fns () "ungetc", "vfprintf" }; - const size_t count - = sizeof(funcnames) / sizeof (funcnames[0]); + const size_t count = ARRAY_SIZE (funcnames); function_set fs (funcnames, count); return fs; } diff --git a/gcc/analyzer/sm-malloc.cc b/gcc/analyzer/sm-malloc.cc index 4c03080..20c1677 100644 --- a/gcc/analyzer/sm-malloc.cc +++ b/gcc/analyzer/sm-malloc.cc @@ -2054,8 +2054,7 @@ malloc_state_machine::unaffected_by_call_p (tree fndecl) /* This array must be kept sorted. */ "strsep", }; - const size_t count - = sizeof(funcnames) / sizeof (funcnames[0]); + const size_t count = ARRAY_SIZE (funcnames); function_set fs (funcnames, count); if (fs.contains_decl_p (fndecl)) diff --git a/gcc/analyzer/sm-signal.cc b/gcc/analyzer/sm-signal.cc index 77044e1..9b0213e 100644 --- a/gcc/analyzer/sm-signal.cc +++ b/gcc/analyzer/sm-signal.cc @@ -309,8 +309,7 @@ get_async_signal_unsafe_fns () "vsnprintf", "vsprintf" }; - const size_t count - = sizeof(async_signal_unsafe_fns) / sizeof (async_signal_unsafe_fns[0]); + const size_t count = ARRAY_SIZE (async_signal_unsafe_fns); function_set fs (async_signal_unsafe_fns, count); return fs; } diff --git a/gcc/attribs.cc b/gcc/attribs.cc index b219f87..6d4a30d 100644 --- a/gcc/attribs.cc +++ b/gcc/attribs.cc @@ -499,7 +499,7 @@ diag_attr_exclusions (tree last_decl, tree node, tree attrname, /* Iterate over the mutually exclusive attribute names and verify that the symbol doesn't contain it. */ - for (unsigned i = 0; i != sizeof attrs / sizeof *attrs; ++i) + for (unsigned i = 0; i != ARRAY_SIZE (attrs); ++i) { if (!attrs[i]) continue; @@ -2106,7 +2106,7 @@ decls_mismatched_attributes (tree tmpl, tree decl, tree attrlist, }; for (unsigned i = 0; i != 2; ++i) - for (unsigned j = 0; j != sizeof whitelist / sizeof *whitelist; ++j) + for (unsigned j = 0; j != ARRAY_SIZE (whitelist); ++j) if (lookup_attribute (whitelist[j], tmpl_attrs[i]) || lookup_attribute (whitelist[j], decl_attrs[i])) return 0; diff --git a/gcc/builtins.cc b/gcc/builtins.cc index 5fc89ad..b9d89b4 100644 --- a/gcc/builtins.cc +++ b/gcc/builtins.cc @@ -613,7 +613,7 @@ c_strlen (tree arg, int only_value, c_strlen_data *data, unsigned eltsize) if (eltsize != tree_to_uhwi (TYPE_SIZE_UNIT (TREE_TYPE (TREE_TYPE (src))))) return NULL_TREE; - /* Set MAXELTS to sizeof (SRC) / sizeof (*SRC) - 1, the maximum possible + /* Set MAXELTS to ARRAY_SIZE (SRC) - 1, the maximum possible length of SRC. Prefer TYPE_SIZE() to TREE_STRING_LENGTH() if possible in case the latter is less than the size of the array, such as when SRC refers to a short string literal used to initialize a large array. diff --git a/gcc/c-family/c-attribs.cc b/gcc/c-family/c-attribs.cc index 0f047a1..e50e79e 100644 --- a/gcc/c-family/c-attribs.cc +++ b/gcc/c-family/c-attribs.cc @@ -4952,8 +4952,7 @@ handle_access_attribute (tree node[3], tree name, tree args, int flags, int imode; { - const int nmodes = - sizeof attr_access::mode_names / sizeof *attr_access::mode_names; + const int nmodes = ARRAY_SIZE (attr_access::mode_names); for (imode = 0; imode != nmodes; ++imode) if (!strncmp (ps, attr_access::mode_names[imode], diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc index 6156e5f..c9c9e72 100644 --- a/gcc/c-family/c-common.cc +++ b/gcc/c-family/c-common.cc @@ -602,8 +602,7 @@ const struct c_common_resword c_common_reswords[] = { "null_resettable", RID_NULL_RESETTABLE, D_OBJC }, }; -const unsigned int num_c_common_reswords = - sizeof c_common_reswords / sizeof (struct c_common_resword); +const unsigned int num_c_common_reswords = ARRAY_SIZE (c_common_reswords); /* Return identifier for address space AS. */ @@ -4482,9 +4481,7 @@ c_common_nodes_and_builtins (void) /* Make fileptr_type_node a distinct void * type until FILE type is defined. Likewise for const struct tm*. */ - for (unsigned i = 0; - i < sizeof (builtin_structptr_types) / sizeof (builtin_structptr_type); - ++i) + for (unsigned i = 0; i < ARRAY_SIZE (builtin_structptr_types); ++i) builtin_structptr_types[i].node = build_variant_type_copy (builtin_structptr_types[i].base); diff --git a/gcc/c-family/c-format.cc b/gcc/c-family/c-format.cc index ea57fde..25b1c1d 100644 --- a/gcc/c-family/c-format.cc +++ b/gcc/c-family/c-format.cc @@ -3189,7 +3189,7 @@ check_tokens (const token_t *tokens, unsigned ntoks, else { /* Diagnose some common misspellings. */ - for (unsigned i = 0; i != sizeof badwords / sizeof *badwords; ++i) + for (unsigned i = 0; i != ARRAY_SIZE (badwords); ++i) { unsigned badwlen = strspn (badwords[i].name, " -"); if (wlen >= badwlen @@ -3384,14 +3384,14 @@ check_plain (location_t format_string_loc, tree format_string_cst, if (ISPUNCT (format_chars[0])) { - size_t nelts = sizeof c_opers / sizeof *c_opers; + size_t nelts = ARRAY_SIZE (c_opers); if (const char *ret = check_tokens (c_opers, nelts, format_string_loc, format_string_cst, orig_format_chars, format_chars, baltoks)) return ret; - nelts = c_dialect_cxx () ? sizeof cxx_opers / sizeof *cxx_opers : 0; + nelts = c_dialect_cxx () ? ARRAY_SIZE (cxx_opers) : 0; if (const char *ret = check_tokens (cxx_opers, nelts, format_string_loc, format_string_cst, orig_format_chars, format_chars, @@ -3401,14 +3401,14 @@ check_plain (location_t format_string_loc, tree format_string_cst, if (ISALPHA (format_chars[0])) { - size_t nelts = sizeof c_keywords / sizeof *c_keywords; + size_t nelts = ARRAY_SIZE (c_keywords); if (const char *ret = check_tokens (c_keywords, nelts, format_string_loc, format_string_cst, orig_format_chars, format_chars, baltoks)) return ret; - nelts = c_dialect_cxx () ? sizeof cxx_keywords / sizeof *cxx_keywords : 0; + nelts = c_dialect_cxx () ? ARRAY_SIZE (cxx_keywords) : 0; if (const char *ret = check_tokens (cxx_keywords, nelts, format_string_loc, format_string_cst, orig_format_chars, format_chars, @@ -3527,7 +3527,7 @@ check_plain (location_t format_string_loc, tree format_string_cst, && ISALPHA (format_chars[1])) { /* Diagnose a subset of contractions that are best avoided. */ - for (unsigned i = 0; i != sizeof contrs / sizeof *contrs; ++i) + for (unsigned i = 0; i != ARRAY_SIZE (contrs); ++i) { const char *apos = strchr (contrs[i].name, '\''); gcc_assert (apos != NULL); diff --git a/gcc/c-family/c-pragma.cc b/gcc/c-family/c-pragma.cc index 4c80bdd..cc05b25 100644 --- a/gcc/c-family/c-pragma.cc +++ b/gcc/c-family/c-pragma.cc @@ -1400,8 +1400,8 @@ static const struct omp_pragma_def omp_pragmas_simd[] = { void c_pp_lookup_pragma (unsigned int id, const char **space, const char **name) { - const int n_oacc_pragmas = sizeof (oacc_pragmas) / sizeof (*oacc_pragmas); - const int n_omp_pragmas = sizeof (omp_pragmas) / sizeof (*omp_pragmas); + const int n_oacc_pragmas = ARRAY_SIZE (oacc_pragmas); + const int n_omp_pragmas = ARRAY_SIZE (omp_pragmas); const int n_omp_pragmas_simd = sizeof (omp_pragmas_simd) / sizeof (*omp_pragmas); int i; @@ -1576,8 +1576,7 @@ init_pragma (void) { if (flag_openacc) { - const int n_oacc_pragmas - = sizeof (oacc_pragmas) / sizeof (*oacc_pragmas); + const int n_oacc_pragmas = ARRAY_SIZE (oacc_pragmas); int i; for (i = 0; i < n_oacc_pragmas; ++i) @@ -1587,7 +1586,7 @@ init_pragma (void) if (flag_openmp) { - const int n_omp_pragmas = sizeof (omp_pragmas) / sizeof (*omp_pragmas); + const int n_omp_pragmas = ARRAY_SIZE (omp_pragmas); int i; for (i = 0; i < n_omp_pragmas; ++i) diff --git a/gcc/c-family/known-headers.cc b/gcc/c-family/known-headers.cc index 8ad3eb3..01c86b2 100644 --- a/gcc/c-family/known-headers.cc +++ b/gcc/c-family/known-headers.cc @@ -79,8 +79,7 @@ get_string_macro_hint (const char *name, enum stdlib lib) if ((lib == STDLIB_C && flag_isoc99) || (lib == STDLIB_CPLUSPLUS && cxx_dialect >= cxx11 )) { - const size_t num_c99_cxx11_macros - = sizeof (c99_cxx11_macros) / sizeof (c99_cxx11_macros[0]); + const size_t num_c99_cxx11_macros = ARRAY_SIZE (c99_cxx11_macros); for (size_t i = 0; i < num_c99_cxx11_macros; i++) if (strcmp (name, c99_cxx11_macros[i]) == 0) return lib == STDLIB_C ? "" : ""; @@ -204,7 +203,7 @@ get_stdlib_header_for_name (const char *name, enum stdlib lib) {"WCHAR_MAX", {"", ""} }, {"WCHAR_MIN", {"", ""} } }; - const size_t num_hints = sizeof (hints) / sizeof (hints[0]); + const size_t num_hints = ARRAY_SIZE (hints); for (size_t i = 0; i < num_hints; i++) if (strcmp (name, hints[i].name) == 0) return hints[i].header[lib]; diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc index c701f07..e49879a 100644 --- a/gcc/c/c-decl.cc +++ b/gcc/c/c-decl.cc @@ -1658,7 +1658,7 @@ c_bind (location_t loc, tree decl, bool is_global) Used only by match_builtin_function_types. */ static const unsigned builtin_structptr_type_count - = sizeof builtin_structptr_types / sizeof builtin_structptr_types[0]; + = ARRAY_SIZE (builtin_structptr_types); static GTY(()) tree last_structptr_types[builtin_structptr_type_count]; @@ -1705,10 +1705,8 @@ match_builtin_function_types (tree newtype, tree oldtype, tree newargs = TYPE_ARG_TYPES (newtype); tree tryargs = newargs; - const unsigned nlst - = sizeof last_structptr_types / sizeof last_structptr_types[0]; - const unsigned nbst - = sizeof builtin_structptr_types / sizeof builtin_structptr_types[0]; + const unsigned nlst = ARRAY_SIZE (last_structptr_types); + const unsigned nbst = ARRAY_SIZE (builtin_structptr_types); gcc_checking_assert (nlst == nbst); diff --git a/gcc/cfg.cc b/gcc/cfg.cc index da781ba..bbd01ba 100644 --- a/gcc/cfg.cc +++ b/gcc/cfg.cc @@ -787,7 +787,7 @@ dump_bb_info (FILE *outf, basic_block bb, int indent, dump_flags_t flags, NULL #undef DEF_BASIC_BLOCK_FLAG }; - const unsigned n_bitnames = sizeof (bb_bitnames) / sizeof (char *); + const unsigned n_bitnames = ARRAY_SIZE (bb_bitnames); bool first; char *s_indent = (char *) alloca ((size_t) indent + 1); memset ((void *) s_indent, ' ', (size_t) indent); diff --git a/gcc/common/config/aarch64/aarch64-common.cc b/gcc/common/config/aarch64/aarch64-common.cc index dfda5b8..7fac90d 100644 --- a/gcc/common/config/aarch64/aarch64-common.cc +++ b/gcc/common/config/aarch64/aarch64-common.cc @@ -314,8 +314,7 @@ aarch64_option_init_struct (struct gcc_options *opts ATTRIBUTE_UNUSED) pop and attribute change (arm_neon headers, lto etc all cause this to happen quite frequently). It is a trade-off between time and space and so time won. */ - int n_extensions - = sizeof (all_extensions) / sizeof (struct aarch64_option_extension); + int n_extensions = ARRAY_SIZE (all_extensions); qsort (&all_extensions_by_on, n_extensions, sizeof (struct aarch64_option_extension), opt_ext_cmp); } diff --git a/gcc/config/aarch64/aarch64-builtins.cc b/gcc/config/aarch64/aarch64-builtins.cc index c21476d..e0a741a 100644 --- a/gcc/config/aarch64/aarch64-builtins.cc +++ b/gcc/config/aarch64/aarch64-builtins.cc @@ -832,7 +832,7 @@ aarch64_lookup_simd_builtin_type (machine_mode mode, enum aarch64_type_qualifiers q) { int i; - int nelts = sizeof (aarch64_simd_types) / sizeof (aarch64_simd_types[0]); + int nelts = ARRAY_SIZE (aarch64_simd_types); /* Non-poly scalar modes map to standard types not in the table. */ if (q != qualifier_poly && !VECTOR_MODE_P (mode)) @@ -869,7 +869,7 @@ static void aarch64_init_simd_builtin_types (void) { int i; - int nelts = sizeof (aarch64_simd_types) / sizeof (aarch64_simd_types[0]); + int nelts = ARRAY_SIZE (aarch64_simd_types); tree tdecl; /* Init all the element types built by the front-end. */ @@ -1434,7 +1434,7 @@ aarch64_init_builtin_rsqrt (void) }; builtin_decls_data *bdd = bdda; - builtin_decls_data *bdd_end = bdd + (sizeof (bdda) / sizeof (builtin_decls_data)); + builtin_decls_data *bdd_end = bdd + (ARRAY_SIZE (bdda)); for (; bdd < bdd_end; bdd++) { diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index f4d2a80..2902f94 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -20755,7 +20755,7 @@ is_madd_op (enum attr_type t1) TYPE_SMMLA, TYPE_UMLAL, TYPE_UMLALS,TYPE_SMLSD, TYPE_SMLSDX, TYPE_SMLSLD }; - for (i = 0; i < sizeof (mlatypes) / sizeof (enum attr_type); i++) + for (i = 0; i < ARRAY_SIZE (mlatypes); i++) { if (t1 == mlatypes[i]) return true; diff --git a/gcc/config/arm/arm-builtins.cc b/gcc/config/arm/arm-builtins.cc index 36a40a1..d917137 100644 --- a/gcc/config/arm/arm-builtins.cc +++ b/gcc/config/arm/arm-builtins.cc @@ -1471,7 +1471,7 @@ arm_lookup_simd_builtin_type (machine_mode mode, enum arm_type_qualifiers q) { int i; - int nelts = sizeof (arm_simd_types) / sizeof (arm_simd_types[0]); + int nelts = ARRAY_SIZE (arm_simd_types); /* Non-poly scalar modes map to standard types not in the table. */ if (q != qualifier_poly && !VECTOR_MODE_P (mode)) @@ -1503,7 +1503,7 @@ static void arm_init_simd_builtin_types (void) { int i; - int nelts = sizeof (arm_simd_types) / sizeof (arm_simd_types[0]); + int nelts = ARRAY_SIZE (arm_simd_types); tree tdecl; /* Poly types are a world of their own. In order to maintain legacy diff --git a/gcc/config/avr/gen-avr-mmcu-texi.cc b/gcc/config/avr/gen-avr-mmcu-texi.cc index d9c3a30..a44e18e 100644 --- a/gcc/config/avr/gen-avr-mmcu-texi.cc +++ b/gcc/config/avr/gen-avr-mmcu-texi.cc @@ -23,10 +23,12 @@ #define IN_GEN_AVR_MMCU_TEXI +#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) + #include "avr-devices.cc" static const avr_mcu_t* -mcus[sizeof avr_mcu_types / sizeof avr_mcu_types[0]]; +mcus[ARRAY_SIZE (avr_mcu_types)]; static int letter (char c) { @@ -56,7 +58,7 @@ c_prefix (const char *str) "attiny", "atmega", "atxmega", "ata", "at90" }; - int i, n = (int) (sizeof (prefixes) / sizeof (*prefixes)); + int i, n = (int) (ARRAY_SIZE (prefixes)); for (i = 0; i < n; i++) if (str_prefix_p (str, prefixes[i])) @@ -185,7 +187,7 @@ int main (void) print_mcus (n_mcus); n_mcus = 0; - for (i = 0; i < sizeof (avr_texinfo) / sizeof (*avr_texinfo); i++) + for (i = 0; i < ARRAY_SIZE (avr_texinfo); i++) if (arch_id == avr_texinfo[i].arch_id) printf ("@item %s\n%s\n", mcu->name, avr_texinfo[i].texinfo); } diff --git a/gcc/config/c6x/c6x.cc b/gcc/config/c6x/c6x.cc index 7fe18d6..dc01a6e 100644 --- a/gcc/config/c6x/c6x.cc +++ b/gcc/config/c6x/c6x.cc @@ -2580,7 +2580,7 @@ static unsigned reg_save_order[] = REG_B14, REG_A15 }; -#define N_SAVE_ORDER (sizeof reg_save_order / sizeof *reg_save_order) +#define N_SAVE_ORDER (ARRAY_SIZE (reg_save_order)) /* Compute the layout of the stack frame and store it in FRAME. */ diff --git a/gcc/config/darwin-c.cc b/gcc/config/darwin-c.cc index 3770857..9203c84 100644 --- a/gcc/config/darwin-c.cc +++ b/gcc/config/darwin-c.cc @@ -505,7 +505,7 @@ darwin_register_frameworks (const char *sysroot, size_t i; /* Setup default search path for frameworks. */ - for (i=0; im_top_index : -1; - for (size_t f = 0; f < sizeof ops / sizeof ops[0]; f++) + for (size_t f = 0; f < ARRAY_SIZE (ops); f++) { const Operator *const op = &ops[f]; @@ -564,7 +564,7 @@ create_insn_code_compression_table () printf ("const enum insn_code %s_multiply_insn_seq_decode_opcode[] = {\n" " CODE_FOR_nothing /* must be first */ ", ARCH); - for (size_t i = 0; i < sizeof ops / sizeof ops[0]; i++) + for (size_t i = 0; i < ARRAY_SIZE (ops); i++) { Operator *op = &ops[i]; int index = -1; diff --git a/gcc/config/vms/vms.cc b/gcc/config/vms/vms.cc index 5d565e3..d0d44ba 100644 --- a/gcc/config/vms/vms.cc +++ b/gcc/config/vms/vms.cc @@ -99,7 +99,7 @@ static const struct vms_crtl_name vms_crtl_names[] = /* Number of entires in the above array. */ -#define NBR_CRTL_NAMES (sizeof (vms_crtl_names) / sizeof (*vms_crtl_names)) +#define NBR_CRTL_NAMES (ARRAY_SIZE (vms_crtl_names)) /* List of aliased identifiers. They must be persistent across gc. */ diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 547bf36..d1dc737 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -2619,7 +2619,7 @@ depset::entity_kind_name () const {"decl", "specialization", "partial", "using", "namespace", "redirect", "binding"}; entity_kind kind = get_entity_kind (); - gcc_checking_assert (kind < sizeof (names) / sizeof(names[0])); + gcc_checking_assert (kind < ARRAY_SIZE (names)); return names[kind]; } diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc index 6bed9da..421bf2e 100644 --- a/gcc/cp/name-lookup.cc +++ b/gcc/cp/name-lookup.cc @@ -6918,7 +6918,7 @@ get_std_name_hint (const char *name) /* . */ {"vector", "", cxx98}, }; - const size_t num_hints = sizeof (hints) / sizeof (hints[0]); + const size_t num_hints = ARRAY_SIZE (hints); for (size_t i = 0; i < num_hints; i++) { if (strcmp (name, hints[i].name) == 0) diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index d4dab6c..7d94e47 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -4200,7 +4200,7 @@ cp_parser_new (cp_lexer *lexer) { /* Initialize the binops_by_token so that we can get the tree directly from the token. */ - for (unsigned i = 0; i < sizeof (binops) / sizeof (binops[0]); i++) + for (unsigned i = 0; i < ARRAY_SIZE (binops); i++) binops_by_token[binops[i].token_type] = binops[i]; cp_parser *parser = ggc_cleared_alloc (); diff --git a/gcc/diagnostic-format-json.cc b/gcc/diagnostic-format-json.cc index def3718..62594eb 100644 --- a/gcc/diagnostic-format-json.cc +++ b/gcc/diagnostic-format-json.cc @@ -62,7 +62,7 @@ json_from_expanded_location (diagnostic_context *context, location_t loc) {"byte-column", DIAGNOSTICS_COLUMN_UNIT_BYTE} }; int the_column = INT_MIN; - for (int i = 0; i != sizeof column_fields / sizeof (*column_fields); ++i) + for (int i = 0; i != ARRAY_SIZE (column_fields); ++i) { context->column_unit = column_fields[i].unit; const int col = diagnostic_converted_column (context, exploc); diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc index 5681b01..4ef644c 100644 --- a/gcc/dwarf2out.cc +++ b/gcc/dwarf2out.cc @@ -13532,8 +13532,7 @@ static const dwarf_qual_info_t dwarf_qual_info[] = { TYPE_QUAL_RESTRICT, DW_TAG_restrict_type }, { TYPE_QUAL_ATOMIC, DW_TAG_atomic_type } }; -static const unsigned int dwarf_qual_info_size - = sizeof (dwarf_qual_info) / sizeof (dwarf_qual_info[0]); +static const unsigned int dwarf_qual_info_size = ARRAY_SIZE (dwarf_qual_info); /* If DIE is a qualified DIE of some base DIE with the same parent, return the base DIE, otherwise return NULL. Set MASK to the diff --git a/gcc/fortran/frontend-passes.cc b/gcc/fortran/frontend-passes.cc index 5eba634..612c12d 100644 --- a/gcc/fortran/frontend-passes.cc +++ b/gcc/fortran/frontend-passes.cc @@ -5654,9 +5654,7 @@ gfc_code_walker (gfc_code **c, walk_code_fn_t codefn, walk_expr_fn_t exprfn, WALK_SUBEXPR (co->ext.omp_clauses->detach); for (idx = 0; idx < OMP_IF_LAST; idx++) WALK_SUBEXPR (co->ext.omp_clauses->if_exprs[idx]); - for (idx = 0; - idx < sizeof (list_types) / sizeof (list_types[0]); - idx++) + for (idx = 0; idx < ARRAY_SIZE (list_types); idx++) for (n = co->ext.omp_clauses->lists[list_types[idx]]; n; n = n->next) WALK_SUBEXPR (n->expr); diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc index 4d3fcc8..8643e43 100644 --- a/gcc/fortran/openmp.cc +++ b/gcc/fortran/openmp.cc @@ -4902,8 +4902,7 @@ gfc_match_omp_context_selector_specification (gfc_omp_declare_variant *odv) match m; const char *selector_sets[] = { "construct", "device", "implementation", "user" }; - const int selector_set_count - = sizeof (selector_sets) / sizeof (*selector_sets); + const int selector_set_count = ARRAY_SIZE (selector_sets); int i; char buf[GFC_MAX_SYMBOL_LEN + 1]; diff --git a/gcc/fortran/trans-intrinsic.cc b/gcc/fortran/trans-intrinsic.cc index 2249723..6884060 100644 --- a/gcc/fortran/trans-intrinsic.cc +++ b/gcc/fortran/trans-intrinsic.cc @@ -9784,7 +9784,7 @@ conv_intrinsic_ieee_builtin (gfc_se * se, gfc_expr * expr, enum built_in_function code, int nargs) { tree args[2]; - gcc_assert ((unsigned) nargs <= sizeof(args)/sizeof(args[0])); + gcc_assert ((unsigned) nargs <= ARRAY_SIZE (args)); conv_ieee_function_args (se, expr, args, nargs); se->expr = build_call_expr_loc_array (input_location, diff --git a/gcc/fortran/trans-types.cc b/gcc/fortran/trans-types.cc index 3cdc529..3742bf3 100644 --- a/gcc/fortran/trans-types.cc +++ b/gcc/fortran/trans-types.cc @@ -3420,7 +3420,7 @@ gfc_get_array_descr_info (const_tree type, struct array_descr_info *info) } rank = GFC_TYPE_ARRAY_RANK (type); - if (rank >= (int) (sizeof (info->dimen) / sizeof (info->dimen[0]))) + if (rank >= (int) (ARRAY_SIZE (info->dimen))) return false; etype = GFC_TYPE_ARRAY_DATAPTR_TYPE (type); diff --git a/gcc/genhooks.cc b/gcc/genhooks.cc index 20ad607..6bae85d 100644 --- a/gcc/genhooks.cc +++ b/gcc/genhooks.cc @@ -128,7 +128,7 @@ emit_documentation (const char *in_fname) } fclose (f); /* For each hook in hook_array, if it is a start hook, store its position. */ - for (i = 0; i < (int) (sizeof hook_array / sizeof hook_array[0]); i++) + for (i = 0; i < (int) (ARRAY_SIZE (hook_array)); i++) { struct s_hook sh, *shp; void *p; @@ -223,7 +223,7 @@ emit_documentation (const char *in_fname) /* POD-valued hooks sometimes come in groups with common documentation.*/ for (j = i + 1; - j < (int) (sizeof hook_array / sizeof hook_array[0]) + j < (int) (ARRAY_SIZE (hook_array)) && hook_array[j].doc == 0 && hook_array[j].type; j++) { char *namex = upstrdup (hook_array[j].name); @@ -246,8 +246,7 @@ emit_documentation (const char *in_fname) printf ("\n@end %s", deftype); } } - if (++i >= (int) (sizeof hook_array / sizeof hook_array[0]) - || !hook_array[i].doc) + if (++i >= (int) (ARRAY_SIZE (hook_array)) || !hook_array[i].doc) break; free (name); sh.name = name = upstrdup (hook_array[i].name); @@ -270,7 +269,7 @@ emit_init_macros (const char *docname) for (print_nest = 0; print_nest <= MAX_NEST; print_nest++) { - for (i = 0; i < (int) (sizeof hook_array / sizeof hook_array[0]); i++) + for (i = 0; i < (int) (ARRAY_SIZE (hook_array)); i++) { char *name = upstrdup (hook_array[i].name); diff --git a/gcc/gimple-ssa-sprintf.cc b/gcc/gimple-ssa-sprintf.cc index 961c1b7..8202129 100644 --- a/gcc/gimple-ssa-sprintf.cc +++ b/gcc/gimple-ssa-sprintf.cc @@ -1953,7 +1953,7 @@ format_floating (const directive &dir, tree arg, pointer_query &) &res.range.min, &res.range.max }; - for (int i = 0; i != sizeof minmax / sizeof *minmax; ++i) + for (int i = 0; i != ARRAY_SIZE (minmax); ++i) { /* Convert the GCC real value representation with the precision of the real type to the mpfr_t format rounding down in the diff --git a/gcc/gimple-ssa-warn-access.cc b/gcc/gimple-ssa-warn-access.cc index c420424..9357a4e 100644 --- a/gcc/gimple-ssa-warn-access.cc +++ b/gcc/gimple-ssa-warn-access.cc @@ -2853,7 +2853,7 @@ memmodel_name (unsigned HOST_WIDE_INT val) { val = memmodel_base (val); - for (unsigned i = 0; i != sizeof memory_models / sizeof *memory_models; ++i) + for (unsigned i = 0; i != ARRAY_SIZE (memory_models); ++i) { if (val == memory_models[i].modval) return memory_models[i].modname; diff --git a/gcc/godump.cc b/gcc/godump.cc index 6691688..2ae0bcc 100644 --- a/gcc/godump.cc +++ b/gcc/godump.cc @@ -1326,7 +1326,7 @@ static void keyword_hash_init (class godump_container *container) { size_t i; - size_t count = sizeof (keywords) / sizeof (keywords[0]); + size_t count = ARRAY_SIZE (keywords); void **slot; for (i = 0; i < count; i++) diff --git a/gcc/hash-table.cc b/gcc/hash-table.cc index dad1d21..1015c1e 100644 --- a/gcc/hash-table.cc +++ b/gcc/hash-table.cc @@ -84,7 +84,7 @@ unsigned int hash_table_higher_prime_index (unsigned long n) { unsigned int low = 0; - unsigned int high = sizeof (prime_tab) / sizeof (prime_tab[0]); + unsigned int high = ARRAY_SIZE (prime_tab); while (low != high) { diff --git a/gcc/input.cc b/gcc/input.cc index b397061..58beba0 100644 --- a/gcc/input.cc +++ b/gcc/input.cc @@ -3724,8 +3724,7 @@ for_each_line_table_case (void (*testcase) (const line_table_case &)) { /* ...and use each of the "interesting" location values as the starting location within line_table. */ - const int num_boundary_locations - = sizeof (boundary_locations) / sizeof (boundary_locations[0]); + const int num_boundary_locations = ARRAY_SIZE (boundary_locations); for (int loc_idx = 0; loc_idx < num_boundary_locations; loc_idx++) { line_table_case c (default_range_bits, boundary_locations[loc_idx]); diff --git a/gcc/ipa-free-lang-data.cc b/gcc/ipa-free-lang-data.cc index a742156..f99f7be 100644 --- a/gcc/ipa-free-lang-data.cc +++ b/gcc/ipa-free-lang-data.cc @@ -1109,9 +1109,7 @@ free_lang_data (void) free_lang_data_in_cgraph (&fld); /* Create gimple variants for common types. */ - for (unsigned i = 0; - i < sizeof (builtin_structptr_types) / sizeof (builtin_structptr_type); - ++i) + for (unsigned i = 0; i < ARRAY_SIZE (builtin_structptr_types); ++i) builtin_structptr_types[i].node = builtin_structptr_types[i].base; /* Reset some langhooks. Do not reset types_compatible_p, it may diff --git a/gcc/ipa-inline.cc b/gcc/ipa-inline.cc index f8bb072..22a009b 100644 --- a/gcc/ipa-inline.cc +++ b/gcc/ipa-inline.cc @@ -278,7 +278,7 @@ sanitize_attrs_match_for_inline_p (const_tree caller, const_tree callee) SANITIZE_POINTER_SUBTRACT }; - for (unsigned i = 0; i < sizeof (codes) / sizeof (codes[0]); i++) + for (unsigned i = 0; i < ARRAY_SIZE (codes); i++) if (sanitize_flags_p (codes[i], caller) != sanitize_flags_p (codes[i], callee)) return false; diff --git a/gcc/jit/jit-builtins.cc b/gcc/jit/jit-builtins.cc index b949b73..fb86c77 100644 --- a/gcc/jit/jit-builtins.cc +++ b/gcc/jit/jit-builtins.cc @@ -109,9 +109,7 @@ find_builtin_by_name (const char *in_name, We start at index 1 to skip the initial entry (BUILT_IN_NONE), which has a NULL name. */ - for (unsigned int i = 1; - i < sizeof (builtin_data) / sizeof (builtin_data[0]); - i++) + for (unsigned int i = 1; i < ARRAY_SIZE (builtin_data); i++) { const struct builtin_data& bd = builtin_data[i]; if (matches_builtin (in_name, bd)) @@ -320,7 +318,7 @@ static const char * const type_names[] = { static const char * get_string_for_type_id (enum jit_builtin_type type_id) { - gcc_assert (type_id < sizeof (type_names)/sizeof(type_names[0])); + gcc_assert (type_id < ARRAY_SIZE (type_names)); return type_names[type_id]; } diff --git a/gcc/jit/jit-recording.cc b/gcc/jit/jit-recording.cc index a31720f..4305a96 100644 --- a/gcc/jit/jit-recording.cc +++ b/gcc/jit/jit-recording.cc @@ -568,9 +568,7 @@ recording::context::context (context *parent_ctxt) if (parent_ctxt) { /* Inherit options from parent. */ - for (unsigned i = 0; - i < sizeof (m_str_options) / sizeof (m_str_options[0]); - i++) + for (unsigned i = 0; i < ARRAY_SIZE (m_str_options); i++) { const char *parent_opt = parent_ctxt->m_str_options[i]; m_str_options[i] = parent_opt ? xstrdup (parent_opt) : NULL; diff --git a/gcc/lto/lto-common.cc b/gcc/lto/lto-common.cc index ca28586..d8d0404 100644 --- a/gcc/lto/lto-common.cc +++ b/gcc/lto/lto-common.cc @@ -2104,8 +2104,7 @@ lto_resolution_read (splay_tree file_ids, FILE *resolution, lto_file *file) char r_str[27]; enum ld_plugin_symbol_resolution r = (enum ld_plugin_symbol_resolution) 0; unsigned int j; - unsigned int lto_resolution_str_len - = sizeof (lto_resolution_str) / sizeof (char *); + unsigned int lto_resolution_str_len = ARRAY_SIZE (lto_resolution_str); res_pair rp; t = fscanf (resolution, "%u " HOST_WIDE_INT_PRINT_HEX_PURE diff --git a/gcc/lto/lto-lang.cc b/gcc/lto/lto-lang.cc index 8d58d92..972a033 100644 --- a/gcc/lto/lto-lang.cc +++ b/gcc/lto/lto-lang.cc @@ -1319,9 +1319,7 @@ lto_init (void) distinction should only be relevant to the front-end, so we always use the C definition here in lto1. Likewise for const struct tm*. */ - for (unsigned i = 0; - i < sizeof (builtin_structptr_types) / sizeof (builtin_structptr_type); - ++i) + for (unsigned i = 0; i < ARRAY_SIZE (builtin_structptr_types); ++i) { gcc_assert (builtin_structptr_types[i].node == builtin_structptr_types[i].base); diff --git a/gcc/optc-save-gen.awk b/gcc/optc-save-gen.awk index 9911bab..233d1fb 100644 --- a/gcc/optc-save-gen.awk +++ b/gcc/optc-save-gen.awk @@ -1104,7 +1104,7 @@ for (i = 0; i < n_target_val; i++) { } if (has_target_explicit_mask) { - print " for (size_t i = 0; i < sizeof (ptr1->explicit_mask) / sizeof (ptr1->explicit_mask[0]); i++)"; + print " for (size_t i = 0; i < ARRAY_SIZE (ptr1->explicit_mask); i++)"; print " if (ptr1->explicit_mask[i] != ptr2->explicit_mask[i])"; print " return false;" } @@ -1152,7 +1152,7 @@ for (i = 0; i < n_target_val; i++) { print " hstate.add_hwi (ptr->" name");"; } if (has_target_explicit_mask) { - print " for (size_t i = 0; i < sizeof (ptr->explicit_mask) / sizeof (ptr->explicit_mask[0]); i++)"; + print " for (size_t i = 0; i < ARRAY_SIZE (ptr->explicit_mask); i++)"; print " hstate.add_hwi (ptr->explicit_mask[i]);"; } @@ -1192,7 +1192,7 @@ for (i = 0; i < n_target_val; i++) { } if (has_target_explicit_mask) { - print " for (size_t i = 0; i < sizeof (ptr->explicit_mask) / sizeof (ptr->explicit_mask[0]); i++)"; + print " for (size_t i = 0; i < ARRAY_SIZE (ptr->explicit_mask); i++)"; print " bp_pack_value (bp, ptr->explicit_mask[i], 64);"; } @@ -1235,7 +1235,7 @@ for (i = 0; i < n_target_val; i++) { } if (has_target_explicit_mask) { - print " for (size_t i = 0; i < sizeof (ptr->explicit_mask) / sizeof (ptr->explicit_mask[0]); i++)"; + print " for (size_t i = 0; i < ARRAY_SIZE (ptr->explicit_mask); i++)"; print " ptr->explicit_mask[i] = bp_unpack_value (bp, 64);"; } @@ -1317,7 +1317,7 @@ for (i = 0; i < n_opt_val; i++) { else print " hstate.add_hwi (ptr->" name");"; } -print " for (size_t i = 0; i < sizeof (ptr->explicit_mask) / sizeof (ptr->explicit_mask[0]); i++)"; +print " for (size_t i = 0; i < ARRAY_SIZE (ptr->explicit_mask); i++)"; print " hstate.add_hwi (ptr->explicit_mask[i]);"; print " return hstate.end ();"; print "}"; @@ -1346,7 +1346,7 @@ for (i = 0; i < n_opt_val; i++) { print " return false;"; } } -print " for (size_t i = 0; i < sizeof (ptr1->explicit_mask) / sizeof (ptr1->explicit_mask[0]); i++)"; +print " for (size_t i = 0; i < ARRAY_SIZE (ptr1->explicit_mask); i++)"; print " if (ptr1->explicit_mask[i] != ptr2->explicit_mask[i])"; print " return false;" print " return true;"; @@ -1380,7 +1380,7 @@ for (i = 0; i < n_opt_val; i++) { } } } -print " for (size_t i = 0; i < sizeof (ptr->explicit_mask) / sizeof (ptr->explicit_mask[0]); i++)"; +print " for (size_t i = 0; i < ARRAY_SIZE (ptr->explicit_mask); i++)"; print " bp_pack_value (bp, ptr->explicit_mask[i], 64);"; print "}"; @@ -1412,7 +1412,7 @@ for (i = 0; i < n_opt_val; i++) { } } } -print " for (size_t i = 0; i < sizeof (ptr->explicit_mask) / sizeof (ptr->explicit_mask[0]); i++)"; +print " for (size_t i = 0; i < ARRAY_SIZE (ptr->explicit_mask); i++)"; print " ptr->explicit_mask[i] = bp_unpack_value (bp, 64);"; print "}"; print "/* Free heap memory used by optimization options */"; diff --git a/gcc/spellcheck.cc b/gcc/spellcheck.cc index 3e58344..c7bb012 100644 --- a/gcc/spellcheck.cc +++ b/gcc/spellcheck.cc @@ -489,7 +489,7 @@ static const char * const test_data[] = { static void test_metric_conditions () { - const int num_test_cases = sizeof (test_data) / sizeof (test_data[0]); + const int num_test_cases = ARRAY_SIZE (test_data); for (int i = 0; i < num_test_cases; i++) { diff --git a/gcc/tree-vect-slp-patterns.cc b/gcc/tree-vect-slp-patterns.cc index 879d17f..a6b0d10 100644 --- a/gcc/tree-vect-slp-patterns.cc +++ b/gcc/tree-vect-slp-patterns.cc @@ -1637,4 +1637,4 @@ vect_pattern_decl_t slp_patterns[] #undef SLP_PATTERN /* Set the number of SLP pattern matchers available. */ -size_t num__slp_patterns = sizeof(slp_patterns)/sizeof(vect_pattern_decl_t); +size_t num__slp_patterns = ARRAY_SIZE (slp_patterns); diff --git a/gcc/tree.cc b/gcc/tree.cc index 5e8876d..df441c6 100644 --- a/gcc/tree.cc +++ b/gcc/tree.cc @@ -9408,9 +9408,7 @@ build_common_tree_nodes (bool signed_char) ptr_type_node = build_pointer_type (void_type_node); const_ptr_type_node = build_pointer_type (build_type_variant (void_type_node, 1, 0)); - for (unsigned i = 0; - i < sizeof (builtin_structptr_types) / sizeof (builtin_structptr_type); - ++i) + for (unsigned i = 0; i < ARRAY_SIZE (builtin_structptr_types); ++i) builtin_structptr_types[i].node = builtin_structptr_types[i].base; pointer_sized_int_node = build_nonstandard_integer_type (POINTER_SIZE, 1); -- 2.7.4