X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fc-format.c;h=dd570ab23dc178929aa1525075b09a759471beaf;hb=7f956288294532a62a8a2ce320703b45641df731;hp=e5009a32fea2584b4675e90f3ab25e9bebab6f9c;hpb=841667053837143adaa91e24e7214b191ee179a1;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/c-format.c b/gcc/c-format.c index e5009a32fea..dd570ab23dc 100644 --- a/gcc/c-format.c +++ b/gcc/c-format.c @@ -1,6 +1,6 @@ /* Check calls to formatted I/O functions (-Wformat). Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GCC. @@ -139,7 +139,7 @@ check_format_string (tree argument, unsigned HOST_WIDE_INT format_num, != char_type_node)) { if (!(flags & (int) ATTR_FLAG_BUILT_IN)) - error ("format string arg not a string type"); + error ("format string argument not a string type"); *no_add_attrs = true; return false; } @@ -147,17 +147,12 @@ check_format_string (tree argument, unsigned HOST_WIDE_INT format_num, return true; } -/* Strip any conversions from the expression, verify it is a constant, - and store its value. If validated_p is true, abort on errors. +/* Verify EXPR is a constant, and store its value. + If validated_p is true there should be no errors. Returns true on success, false otherwise. */ static bool get_constant (tree expr, unsigned HOST_WIDE_INT *value, int validated_p) { - while (TREE_CODE (expr) == NOP_EXPR - || TREE_CODE (expr) == CONVERT_EXPR - || TREE_CODE (expr) == NON_LVALUE_EXPR) - expr = TREE_OPERAND (expr, 0); - if (TREE_CODE (expr) != INTEGER_CST || TREE_INT_CST_HIGH (expr) != 0) { gcc_assert (!validated_p); @@ -169,12 +164,12 @@ get_constant (tree expr, unsigned HOST_WIDE_INT *value, int validated_p) return true; } -/* Decode the arguments to a "format" attribute into a function_format_info - structure. It is already known that the list is of the right length. - If VALIDATED_P is true, then these attributes have already been validated - and this function will abort if they are erroneous; if false, it - will give an error message. Returns true if the attributes are - successfully decoded, false otherwise. */ +/* Decode the arguments to a "format" attribute into a + function_format_info structure. It is already known that the list + is of the right length. If VALIDATED_P is true, then these + attributes have already been validated and must not be erroneous; + if false, it will give an error message. Returns true if the + attributes are successfully decoded, false otherwise. */ static bool decode_format_attr (tree args, function_format_info *info, int validated_p) @@ -199,7 +194,8 @@ decode_format_attr (tree args, function_format_info *info, int validated_p) if (info->format_type == format_type_error) { gcc_assert (!validated_p); - warning ("%qs is an unrecognized format function type", p); + warning (0, "%qE is an unrecognized format function type", + format_type_id); return false; } } @@ -212,14 +208,14 @@ decode_format_attr (tree args, function_format_info *info, int validated_p) if (!get_constant (first_arg_num_expr, &info->first_arg_num, validated_p)) { - error ("'...' has invalid operand number"); + error ("%<...%> has invalid operand number"); return false; } if (info->first_arg_num != 0 && info->first_arg_num <= info->format_num) { gcc_assert (!validated_p); - error ("format string arg follows the args to be formatted"); + error ("format string argument follows the args to be formatted"); return false; } @@ -837,7 +833,7 @@ check_function_format (tree attrs, tree params) break; } if (args != 0) - warning ("function might be possible candidate for %qs format attribute", + warning (0, "function might be possible candidate for %qs format attribute", format_types[info.format_type].name); } } @@ -928,7 +924,7 @@ maybe_read_dollar_number (const char **format, { if (dollar_needed) { - warning ("missing $ operand number in format"); + warning (0, "missing $ operand number in format"); return -1; } else @@ -949,7 +945,7 @@ maybe_read_dollar_number (const char **format, { if (dollar_needed) { - warning ("missing $ operand number in format"); + warning (0, "missing $ operand number in format"); return -1; } else @@ -958,14 +954,14 @@ maybe_read_dollar_number (const char **format, *format = fcp + 1; if (pedantic && !dollar_format_warned) { - warning ("%s does not support %%n$ operand number formats", + warning (0, "%s does not support %%n$ operand number formats", C_STD_NAME (STD_EXT)); dollar_format_warned = 1; } if (overflow_flag || argnum == 0 || (dollar_first_arg_num && argnum > dollar_arguments_count)) { - warning ("operand number out of range in format"); + warning (0, "operand number out of range in format"); return -1; } if (argnum > dollar_max_arg_used) @@ -988,7 +984,7 @@ maybe_read_dollar_number (const char **format, && dollar_arguments_used[argnum - 1] == 1) { dollar_arguments_used[argnum - 1] = 2; - warning ("format argument %d used more than once in %s format", + warning (0, "format argument %d used more than once in %s format", argnum, fki->name); } else @@ -1020,7 +1016,7 @@ avoid_dollar_number (const char *format) format++; if (*format == '$') { - warning ("$ operand number used after format without operand number"); + warning (0, "$ operand number used after format without operand number"); return true; } return false; @@ -1050,7 +1046,7 @@ finish_dollar_format_checking (format_check_results *res, int pointer_gap_ok) || dollar_arguments_pointer_p[i])) found_pointer_gap = true; else - warning ("format argument %d unused before used argument %d in $-style format", + warning (0, "format argument %d unused before used argument %d in $-style format", i + 1, dollar_max_arg_used); } } @@ -1067,10 +1063,10 @@ finish_dollar_format_checking (format_check_results *res, int pointer_gap_ok) /* Retrieve the specification for a format flag. SPEC contains the specifications for format flags for the applicable kind of format. FLAG is the flag in question. If PREDICATES is NULL, the basic - spec for that flag must be retrieved and this function aborts if - it cannot be found. If PREDICATES is not NULL, it is a string listing - possible predicates for the spec entry; if an entry predicated on any - of these is found, it is returned, otherwise NULL is returned. */ + spec for that flag must be retrieved and must exist. If + PREDICATES is not NULL, it is a string listing possible predicates + for the spec entry; if an entry predicated on any of these is + found, it is returned, otherwise NULL is returned. */ static const format_flag_spec * get_flag_spec (const format_flag_spec *spec, int flag, const char *predicates) @@ -1145,7 +1141,7 @@ check_format_info (function_format_info *info, tree params) /* For strftime-like formats, warn for not checking the format string; but there are no arguments to check. */ if (warn_format_nonliteral) - warning ("format not a string literal, format string not checked"); + warning (0, "format not a string literal, format string not checked"); } else if (info->first_arg_num != 0) { @@ -1159,9 +1155,9 @@ check_format_info (function_format_info *info, tree params) ++arg_num; } if (params == 0 && (warn_format_nonliteral || warn_format_security)) - warning ("format not a string literal and no format arguments"); + warning (0, "format not a string literal and no format arguments"); else if (warn_format_nonliteral) - warning ("format not a string literal, argument types not checked"); + warning (0, "format not a string literal, argument types not checked"); } } @@ -1174,20 +1170,20 @@ check_format_info (function_format_info *info, tree params) case of extra format arguments. */ if (res.number_extra_args > 0 && res.number_non_literal == 0 && res.number_other == 0 && warn_format_extra_args) - warning ("too many arguments for format"); + warning (0, "too many arguments for format"); if (res.number_dollar_extra_args > 0 && res.number_non_literal == 0 && res.number_other == 0 && warn_format_extra_args) - warning ("unused arguments in $-style format"); + warning (0, "unused arguments in $-style format"); if (res.number_empty > 0 && res.number_non_literal == 0 && res.number_other == 0 && warn_format_zero_length) - warning ("zero-length %s format string", + warning (0, "zero-length %s format string", format_types[info->format_type].name); if (res.number_wide > 0) - warning ("format is a wide character string"); + warning (0, "format is a wide character string"); if (res.number_unterminated > 0) - warning ("unterminated format string"); + warning (0, "unterminated format string"); } /* Callback from check_function_arguments_recurse to check a @@ -1397,7 +1393,7 @@ check_format_info_main (format_check_results *res, if (*format_chars == 0) { if (format_chars - orig_format_chars != format_length) - warning ("embedded %<\\0%> in format"); + warning (0, "embedded %<\\0%> in format"); if (info->first_arg_num != 0 && params != 0 && has_operand_number <= 0) { @@ -1412,7 +1408,7 @@ check_format_info_main (format_check_results *res, continue; if (*format_chars == 0) { - warning ("spurious trailing %<%%%> in format"); + warning (0, "spurious trailing %<%%%> in format"); continue; } if (*format_chars == '%') @@ -1456,7 +1452,7 @@ check_format_info_main (format_check_results *res, *format_chars, NULL); if (strchr (flag_chars, *format_chars) != 0) { - warning ("repeated %s in format", _(s->name)); + warning (0, "repeated %s in format", _(s->name)); } else { @@ -1469,7 +1465,7 @@ check_format_info_main (format_check_results *res, ++format_chars; if (*format_chars == 0) { - warning ("missing fill character at end of strfmon format"); + warning (0, "missing fill character at end of strfmon format"); return; } } @@ -1513,7 +1509,7 @@ check_format_info_main (format_check_results *res, { if (params == 0) { - warning ("too few arguments for format"); + warning (0, "too few arguments for format"); return; } cur_param = TREE_VALUE (params); @@ -1554,7 +1550,7 @@ check_format_info_main (format_check_results *res, } if (found_width && !non_zero_width_char && (fki->flags & (int) FMT_FLAG_ZERO_WIDTH_BAD)) - warning ("zero width in %s format", fki->name); + warning (0, "zero width in %s format", fki->name); if (found_width) { i = strlen (flag_chars); @@ -1572,7 +1568,7 @@ check_format_info_main (format_check_results *res, flag_chars[i++] = fki->left_precision_char; flag_chars[i] = 0; if (!ISDIGIT (*format_chars)) - warning ("empty left precision in %s format", fki->name); + warning (0, "empty left precision in %s format", fki->name); while (ISDIGIT (*format_chars)) ++format_chars; } @@ -1615,7 +1611,7 @@ check_format_info_main (format_check_results *res, { if (params == 0) { - warning ("too few arguments for format"); + warning (0, "too few arguments for format"); return; } cur_param = TREE_VALUE (params); @@ -1645,7 +1641,7 @@ check_format_info_main (format_check_results *res, { if (!(fki->flags & (int) FMT_FLAG_EMPTY_PREC_OK) && !ISDIGIT (*format_chars)) - warning ("empty precision in %s format", fki->name); + warning (0, "empty precision in %s format", fki->name); while (ISDIGIT (*format_chars)) ++format_chars; } @@ -1684,7 +1680,7 @@ check_format_info_main (format_check_results *res, { /* Warn if the length modifier is non-standard. */ if (ADJ_STD (length_chars_std) > C_STD_VER) - warning ("%s does not support the %qs %s length modifier", + warning (0, "%s does not support the %qs %s length modifier", C_STD_NAME (length_chars_std), length_chars, fki->name); } @@ -1700,7 +1696,7 @@ check_format_info_main (format_check_results *res, { const format_flag_spec *s = get_flag_spec (flag_specs, *format_chars, NULL); - warning ("repeated %s in format", _(s->name)); + warning (0, "repeated %s in format", _(s->name)); } else { @@ -1734,7 +1730,7 @@ check_format_info_main (format_check_results *res, || (!(fki->flags & (int) FMT_FLAG_FANCY_PERCENT_OK) && format_char == '%')) { - warning ("conversion lacks type at end of format"); + warning (0, "conversion lacks type at end of format"); continue; } format_chars++; @@ -1745,17 +1741,17 @@ check_format_info_main (format_check_results *res, if (fci->format_chars == 0) { if (ISGRAPH (format_char)) - warning ("unknown conversion type character %qc in format", + warning (0, "unknown conversion type character %qc in format", format_char); else - warning ("unknown conversion type character 0x%x in format", + warning (0, "unknown conversion type character 0x%x in format", format_char); continue; } if (pedantic) { if (ADJ_STD (fci->std) > C_STD_VER) - warning ("%s does not support the %<%%%c%> %s format", + warning (0, "%s does not support the %<%%%c%> %s format", C_STD_NAME (fci->std), format_char, fki->name); } @@ -1771,7 +1767,7 @@ check_format_info_main (format_check_results *res, continue; if (strchr (fci->flag_chars, flag_chars[i]) == 0) { - warning ("%s used with %<%%%c%> %s format", + warning (0, "%s used with %<%%%c%> %s format", _(s->name), format_char, fki->name); d++; continue; @@ -1780,7 +1776,7 @@ check_format_info_main (format_check_results *res, { const format_flag_spec *t; if (ADJ_STD (s->std) > C_STD_VER) - warning ("%s does not support %s", + warning (0, "%s does not support %s", C_STD_NAME (s->std), _(s->long_name)); t = get_flag_spec (flag_specs, flag_chars[i], fci->flags2); if (t != NULL && ADJ_STD (t->std) > ADJ_STD (s->std)) @@ -1789,7 +1785,7 @@ check_format_info_main (format_check_results *res, ? t->long_name : s->long_name); if (ADJ_STD (t->std) > C_STD_VER) - warning ("%s does not support %s with the %<%%%c%> %s format", + warning (0, "%s does not support %s with the %<%%%c%> %s format", C_STD_NAME (t->std), _(long_name), format_char, fki->name); } @@ -1822,21 +1818,21 @@ check_format_info_main (format_check_results *res, if (bad_flag_pairs[i].ignored) { if (bad_flag_pairs[i].predicate != 0) - warning ("%s ignored with %s and %<%%%c%> %s format", + warning (0, "%s ignored with %s and %<%%%c%> %s format", _(s->name), _(t->name), format_char, fki->name); else - warning ("%s ignored with %s in %s format", + warning (0, "%s ignored with %s in %s format", _(s->name), _(t->name), fki->name); } else { if (bad_flag_pairs[i].predicate != 0) - warning ("use of %s and %s together with %<%%%c%> %s format", + warning (0, "use of %s and %s together with %<%%%c%> %s format", _(s->name), _(t->name), format_char, fki->name); else - warning ("use of %s and %s together in %s format", + warning (0, "use of %s and %s together in %s format", _(s->name), _(t->name), fki->name); } } @@ -1855,10 +1851,10 @@ check_format_info_main (format_check_results *res, else if (strchr (fci->flags2, '2') != 0) y2k_level = 2; if (y2k_level == 3) - warning ("%<%%%c%> yields only last 2 digits of year in some locales", + warning (0, "%<%%%c%> yields only last 2 digits of year in some locales", format_char); else if (y2k_level == 2) - warning ("%<%%%c%> yields only last 2 digits of year", format_char); + warning (0, "%<%%%c%> yields only last 2 digits of year", format_char); } if (strchr (fci->flags2, '[') != 0) @@ -1874,7 +1870,7 @@ check_format_info_main (format_check_results *res, ++format_chars; if (*format_chars != ']') /* The end of the format string was reached. */ - warning ("no closing %<]%> for %<%%[%> format"); + warning (0, "no closing %<]%> for %<%%[%> format"); } wanted_type = 0; @@ -1887,14 +1883,14 @@ check_format_info_main (format_check_results *res, wanted_type_std = fci->types[length_chars_val].std; if (wanted_type == 0) { - warning ("use of %qs length modifier with %qc type character", + warning (0, "use of %qs length modifier with %qc type character", length_chars, format_char); /* Heuristic: skip one argument when an invalid length/type combination is encountered. */ arg_num++; if (params == 0) { - warning ("too few arguments for format"); + warning (0, "too few arguments for format"); return; } params = TREE_CHAIN (params); @@ -1908,7 +1904,7 @@ check_format_info_main (format_check_results *res, && ADJ_STD (wanted_type_std) > ADJ_STD (fci->std)) { if (ADJ_STD (wanted_type_std) > C_STD_VER) - warning ("%s does not support the %<%%%s%c%> %s format", + warning (0, "%s does not support the %<%%%s%c%> %s format", C_STD_NAME (wanted_type_std), length_chars, format_char, fki->name); } @@ -1925,9 +1921,9 @@ check_format_info_main (format_check_results *res, if (main_arg_num != 0) { if (suppressed) - warning ("operand number specified with suppressed assignment"); + warning (0, "operand number specified with suppressed assignment"); else - warning ("operand number specified for format taking no argument"); + warning (0, "operand number specified for format taking no argument"); } } else @@ -1944,7 +1940,7 @@ check_format_info_main (format_check_results *res, ++arg_num; if (has_operand_number > 0) { - warning ("missing $ operand number in format"); + warning (0, "missing $ operand number in format"); return; } else @@ -1956,7 +1952,7 @@ check_format_info_main (format_check_results *res, { if (params == 0) { - warning ("too few arguments for format"); + warning (0, "too few arguments for format"); return; } @@ -2069,7 +2065,7 @@ check_format_types (format_wanted_type *types, const char *format_start, && i == 0 && cur_param != 0 && integer_zerop (cur_param)) - warning ("writing through null pointer (arg %d)", + warning (0, "writing through null pointer (argument %d)", arg_num); /* Check for reading through a NULL pointer. */ @@ -2077,7 +2073,7 @@ check_format_types (format_wanted_type *types, const char *format_start, && i == 0 && cur_param != 0 && integer_zerop (cur_param)) - warning ("reading through null pointer (arg %d)", + warning (0, "reading through null pointer (argument %d)", arg_num); if (cur_param != 0 && TREE_CODE (cur_param) == ADDR_EXPR) @@ -2097,7 +2093,8 @@ check_format_types (format_wanted_type *types, const char *format_start, && (CONSTANT_CLASS_P (cur_param) || (DECL_P (cur_param) && TREE_READONLY (cur_param)))))) - warning ("writing into constant object (arg %d)", arg_num); + warning (0, "writing into constant object (argument %d)", + arg_num); /* If there are extra type qualifiers beyond the first indirection, then this makes the types technically @@ -2107,7 +2104,8 @@ check_format_types (format_wanted_type *types, const char *format_start, && (TYPE_READONLY (cur_type) || TYPE_VOLATILE (cur_type) || TYPE_RESTRICT (cur_type))) - warning ("extra type qualifiers in format argument (arg %d)", + warning (0, "extra type qualifiers in format argument " + "(argument %d)", arg_num); } @@ -2217,20 +2215,20 @@ format_type_warning (const char *descr, const char *format_start, if (wanted_type_name) { if (descr) - warning ("%s should have type %<%s%s%>, but argument %d has type %qT", + warning (0, "%s should have type %<%s%s%>, but argument %d has type %qT", descr, wanted_type_name, p, arg_num, arg_type); else - warning ("format %q.*s expects type %<%s%s%>, but argument %d has type %qT", + warning (0, "format %q.*s expects type %<%s%s%>, but argument %d has type %qT", format_length, format_start, wanted_type_name, p, arg_num, arg_type); } else { if (descr) - warning ("%s should have type %<%T%s%>, but argument %d has type %qT", + warning (0, "%s should have type %<%T%s%>, but argument %d has type %qT", descr, wanted_type, p, arg_num, arg_type); else - warning ("format %q.*s expects type %<%T%s%>, but argument %d has type %qT", + warning (0, "format %q.*s expects type %<%T%s%>, but argument %d has type %qT", format_length, format_start, wanted_type, p, arg_num, arg_type); } } @@ -2238,7 +2236,7 @@ format_type_warning (const char *descr, const char *format_start, /* Given a format_char_info array FCI, and a character C, this function returns the index into the conversion_specs where that specifier's - data is located. If the character isn't found it aborts. */ + data is located. The character must exist. */ static unsigned int find_char_info_specifier_index (const format_char_info *fci, int c) { @@ -2254,8 +2252,7 @@ find_char_info_specifier_index (const format_char_info *fci, int c) /* Given a format_length_info array FLI, and a character C, this function returns the index into the conversion_specs where that - modifier's data is located. If the character isn't found it - aborts. */ + modifier's data is located. The character must exist. */ static unsigned int find_length_info_modifier_index (const format_length_info *fli, int c) { @@ -2287,9 +2284,25 @@ init_dynamic_asm_fprintf_info (void) HOST_WIDE_INT __gcc_host_wide_int__;" in one's source code prior to using that modifier. */ hwi = maybe_get_identifier ("__gcc_host_wide_int__"); + if (!hwi) + { + error ("%<__gcc_host_wide_int__%> is not defined as a type"); + return; + } + hwi = identifier_global_value (hwi); + if (!hwi || TREE_CODE (hwi) != TYPE_DECL) + { + error ("%<__gcc_host_wide_int__%> is not defined as a type"); + return; + } + hwi = DECL_ORIGINAL_TYPE (hwi); gcc_assert (hwi); - hwi = DECL_ORIGINAL_TYPE (identifier_global_value (hwi)); - gcc_assert (hwi); + if (hwi != long_integer_type_node && hwi != long_long_integer_type_node) + { + error ("%<__gcc_host_wide_int__%> is not defined as %" + " or %"); + return; + } /* Create a new (writable) copy of asm_fprintf_length_specs. */ new_asm_fprintf_length_specs = (format_length_info *) @@ -2333,19 +2346,70 @@ init_dynamic_diag_info (void) However we don't force a hard ICE because we may see only one or the other type. */ if ((loc = maybe_get_identifier ("location_t"))) - loc = TREE_TYPE (identifier_global_value (loc)); + { + loc = identifier_global_value (loc); + if (loc) + { + if (TREE_CODE (loc) != TYPE_DECL) + { + error ("% is not defined as a type"); + loc = 0; + } + else + loc = TREE_TYPE (loc); + } + } /* We need to grab the underlying 'union tree_node' so peek into an extra type level. */ if ((t = maybe_get_identifier ("tree"))) - t = TREE_TYPE (TREE_TYPE (identifier_global_value (t))); + { + t = identifier_global_value (t); + if (t) + { + if (TREE_CODE (t) != TYPE_DECL) + { + error ("% is not defined as a type"); + t = 0; + } + else if (TREE_CODE (TREE_TYPE (t)) != POINTER_TYPE) + { + error ("% is not defined as a pointer type"); + t = 0; + } + else + t = TREE_TYPE (TREE_TYPE (t)); + } + } /* Find the underlying type for HOST_WIDE_INT. For the %w length modifier to work, one must have issued: "typedef HOST_WIDE_INT __gcc_host_wide_int__;" in one's source code prior to using that modifier. */ if ((hwi = maybe_get_identifier ("__gcc_host_wide_int__"))) - hwi = DECL_ORIGINAL_TYPE (identifier_global_value (hwi)); + { + hwi = identifier_global_value (hwi); + if (hwi) + { + if (TREE_CODE (hwi) != TYPE_DECL) + { + error ("%<__gcc_host_wide_int__%> is not defined as a type"); + hwi = 0; + } + else + { + hwi = DECL_ORIGINAL_TYPE (hwi); + gcc_assert (hwi); + if (hwi != long_integer_type_node + && hwi != long_long_integer_type_node) + { + error ("%<__gcc_host_wide_int__%> is not defined" + " as % or %"); + hwi = 0; + } + } + } + } /* Assign the new data for use. */ @@ -2496,7 +2560,7 @@ handle_format_attribute (tree *node, tree ARG_UNUSED (name), tree args, if (arg_num != info.first_arg_num) { if (!(flags & (int) ATTR_FLAG_BUILT_IN)) - error ("args to be formatted is not '...'"); + error ("args to be formatted is not %<...%>"); *no_add_attrs = true; return NULL_TREE; }