X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;ds=sidebyside;f=gcc%2Fc-typeck.c;h=1bab69565bb5f3139c656e5bab7204f7476eddc5;hb=ac206aff0574a7d02a44278c0ab08420efa6fca8;hp=ddc2d0803bee61f9bef24c9ca8af47d68d29d264;hpb=318a728f904732ccea8f616d2694af282ccfc848;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index ddc2d0803be..1bab69565bb 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -23,11 +23,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA /* This file is part of the C front end. It contains routines to build C expressions given their operands, including computing the types of the result, C-specific error checks, - and some optimization. - - There are also routines to build RETURN_STMT nodes and CASE_STMT nodes, - and to process initializations in declarations (since they work - like a strange sort of assignment). */ + and some optimization. */ #include "config.h" #include "system.h" @@ -45,22 +41,35 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "intl.h" #include "ggc.h" #include "target.h" +#include "tree-iterator.h" +#include "tree-gimple.h" + +/* The level of nesting inside "__alignof__". */ +int in_alignof; + +/* The level of nesting inside "sizeof". */ +int in_sizeof; + +/* The level of nesting inside "typeof". */ +int in_typeof; /* Nonzero if we've already printed a "missing braces around initializer" message within this initializer. */ static int missing_braces_mentioned; +static int require_constant_value; +static int require_constant_elements; + static tree qualify_type (tree, tree); -static int tagged_types_tu_compatible_p (tree, tree, int); +static int tagged_types_tu_compatible_p (tree, tree); static int comp_target_types (tree, tree, int); -static int function_types_compatible_p (tree, tree, int); -static int type_lists_compatible_p (tree, tree, int); +static int function_types_compatible_p (tree, tree); +static int type_lists_compatible_p (tree, tree); static tree decl_constant_value_for_broken_optimization (tree); static tree default_function_array_conversion (tree); static tree lookup_field (tree, tree); static tree convert_arguments (tree, tree, tree, tree); static tree pointer_diff (tree, tree); -static tree internal_build_compound_expr (tree, int); static tree convert_for_assignment (tree, tree, const char *, tree, tree, int); static void warn_for_assignment (const char *, const char *, tree, int); @@ -71,8 +80,8 @@ static void push_array_bounds (int); static int spelling_length (void); static char *print_spelling (char *); static void warning_init (const char *); -static tree digest_init (tree, tree, int); -static void output_init_element (tree, tree, tree, int); +static tree digest_init (tree, tree, bool, int); +static void output_init_element (tree, bool, tree, tree, int); static void output_pending_init_elements (int); static int set_designator (int); static void push_range_stack (tree); @@ -80,6 +89,7 @@ static void add_pending_init (tree, tree); static void set_nonincremental_init (void); static void set_nonincremental_init_from_string (tree); static tree find_init_member (tree); +static int lvalue_or_else (tree, const char *); /* Do `exp = require_complete_type (exp);' to make sure exp does not have an incomplete type. (That includes void types.) */ @@ -155,7 +165,7 @@ c_incomplete_type_error (tree value, tree type) return; default: - abort (); + gcc_unreachable (); } if (TREE_CODE (TYPE_NAME (type)) == IDENTIFIER_NODE) @@ -199,16 +209,14 @@ qualify_type (tree type, tree like) TYPE_QUALS (type) | TYPE_QUALS (like)); } -/* Return the common type of two types. - We assume that comptypes has already been done and returned 1; - if that isn't so, this may crash. In particular, we assume that qualifiers - match. +/* Return the composite type of two compatible types. - This is the type for the result of most arithmetic operations - if the operands have the given two types. */ + We assume that comptypes has already been done and returned + nonzero; if that isn't so, this may crash. In particular, we + assume that qualifiers match. */ tree -common_type (tree t1, tree t2) +composite_type (tree t1, tree t2) { enum tree_code code1; enum tree_code code2; @@ -224,131 +232,55 @@ common_type (tree t1, tree t2) if (t2 == error_mark_node) return t1; + code1 = TREE_CODE (t1); + code2 = TREE_CODE (t2); + /* Merge the attributes. */ attributes = targetm.merge_type_attributes (t1, t2); - /* Treat an enum type as the unsigned integer type of the same width. */ - - if (TREE_CODE (t1) == ENUMERAL_TYPE) - t1 = c_common_type_for_size (TYPE_PRECISION (t1), 1); - if (TREE_CODE (t2) == ENUMERAL_TYPE) - t2 = c_common_type_for_size (TYPE_PRECISION (t2), 1); - - code1 = TREE_CODE (t1); - code2 = TREE_CODE (t2); + /* If one is an enumerated type and the other is the compatible + integer type, the composite type might be either of the two + (DR#013 question 3). For consistency, use the enumerated type as + the composite type. */ - /* If one type is complex, form the common type of the non-complex - components, then make that complex. Use T1 or T2 if it is the - required type. */ - if (code1 == COMPLEX_TYPE || code2 == COMPLEX_TYPE) - { - tree subtype1 = code1 == COMPLEX_TYPE ? TREE_TYPE (t1) : t1; - tree subtype2 = code2 == COMPLEX_TYPE ? TREE_TYPE (t2) : t2; - tree subtype = common_type (subtype1, subtype2); + if (code1 == ENUMERAL_TYPE && code2 == INTEGER_TYPE) + return t1; + if (code2 == ENUMERAL_TYPE && code1 == INTEGER_TYPE) + return t2; - if (code1 == COMPLEX_TYPE && TREE_TYPE (t1) == subtype) - return build_type_attribute_variant (t1, attributes); - else if (code2 == COMPLEX_TYPE && TREE_TYPE (t2) == subtype) - return build_type_attribute_variant (t2, attributes); - else - return build_type_attribute_variant (build_complex_type (subtype), - attributes); - } + gcc_assert (code1 == code2); switch (code1) { - case INTEGER_TYPE: - case REAL_TYPE: - /* If only one is real, use it as the result. */ - - if (code1 == REAL_TYPE && code2 != REAL_TYPE) - return build_type_attribute_variant (t1, attributes); - - if (code2 == REAL_TYPE && code1 != REAL_TYPE) - return build_type_attribute_variant (t2, attributes); - - /* Both real or both integers; use the one with greater precision. */ - - if (TYPE_PRECISION (t1) > TYPE_PRECISION (t2)) - return build_type_attribute_variant (t1, attributes); - else if (TYPE_PRECISION (t2) > TYPE_PRECISION (t1)) - return build_type_attribute_variant (t2, attributes); - - /* Same precision. Prefer long longs to longs to ints when the - same precision, following the C99 rules on integer type rank - (which are equivalent to the C90 rules for C90 types). */ - - if (TYPE_MAIN_VARIANT (t1) == long_long_unsigned_type_node - || TYPE_MAIN_VARIANT (t2) == long_long_unsigned_type_node) - return build_type_attribute_variant (long_long_unsigned_type_node, - attributes); - - if (TYPE_MAIN_VARIANT (t1) == long_long_integer_type_node - || TYPE_MAIN_VARIANT (t2) == long_long_integer_type_node) - { - if (TYPE_UNSIGNED (t1) || TYPE_UNSIGNED (t2)) - t1 = long_long_unsigned_type_node; - else - t1 = long_long_integer_type_node; - return build_type_attribute_variant (t1, attributes); - } - - if (TYPE_MAIN_VARIANT (t1) == long_unsigned_type_node - || TYPE_MAIN_VARIANT (t2) == long_unsigned_type_node) - return build_type_attribute_variant (long_unsigned_type_node, - attributes); - - if (TYPE_MAIN_VARIANT (t1) == long_integer_type_node - || TYPE_MAIN_VARIANT (t2) == long_integer_type_node) - { - /* But preserve unsignedness from the other type, - since long cannot hold all the values of an unsigned int. */ - if (TYPE_UNSIGNED (t1) || TYPE_UNSIGNED (t2)) - t1 = long_unsigned_type_node; - else - t1 = long_integer_type_node; - return build_type_attribute_variant (t1, attributes); - } - - /* Likewise, prefer long double to double even if same size. */ - if (TYPE_MAIN_VARIANT (t1) == long_double_type_node - || TYPE_MAIN_VARIANT (t2) == long_double_type_node) - return build_type_attribute_variant (long_double_type_node, - attributes); - - /* Otherwise prefer the unsigned one. */ - - if (TYPE_UNSIGNED (t1)) - return build_type_attribute_variant (t1, attributes); - else - return build_type_attribute_variant (t2, attributes); - case POINTER_TYPE: - /* For two pointers, do this recursively on the target type, - and combine the qualifiers of the two types' targets. */ - /* This code was turned off; I don't know why. - But ANSI C specifies doing this with the qualifiers. - So I turned it on again. */ + /* For two pointers, do this recursively on the target type. */ { tree pointed_to_1 = TREE_TYPE (t1); tree pointed_to_2 = TREE_TYPE (t2); - tree target = common_type (TYPE_MAIN_VARIANT (pointed_to_1), - TYPE_MAIN_VARIANT (pointed_to_2)); - t1 = build_pointer_type (c_build_qualified_type - (target, - TYPE_QUALS (pointed_to_1) | - TYPE_QUALS (pointed_to_2))); - return build_type_attribute_variant (t1, attributes); + tree target = composite_type (pointed_to_1, pointed_to_2); + t1 = build_pointer_type (target); + t1 = build_type_attribute_variant (t1, attributes); + return qualify_type (t1, t2); } case ARRAY_TYPE: { - tree elt = common_type (TREE_TYPE (t1), TREE_TYPE (t2)); + tree elt = composite_type (TREE_TYPE (t1), TREE_TYPE (t2)); + + /* We should not have any type quals on arrays at all. */ + gcc_assert (!TYPE_QUALS (t1) && !TYPE_QUALS (t2)); + /* Save space: see if the result is identical to one of the args. */ if (elt == TREE_TYPE (t1) && TYPE_DOMAIN (t1)) return build_type_attribute_variant (t1, attributes); if (elt == TREE_TYPE (t2) && TYPE_DOMAIN (t2)) return build_type_attribute_variant (t2, attributes); + + if (elt == TREE_TYPE (t1) && !TYPE_DOMAIN (t2) && !TYPE_DOMAIN (t1)) + return build_type_attribute_variant (t1, attributes); + if (elt == TREE_TYPE (t2) && !TYPE_DOMAIN (t2) && !TYPE_DOMAIN (t1)) + return build_type_attribute_variant (t2, attributes); + /* Merge the element types, and have a size if either arg has one. */ t1 = build_array_type (elt, TYPE_DOMAIN (TYPE_DOMAIN (t1) ? t1 : t2)); return build_type_attribute_variant (t1, attributes); @@ -358,7 +290,7 @@ common_type (tree t1, tree t2) /* Function types: prefer the one that specified arg types. If both do, merge the arg types. Also merge the return types. */ { - tree valtype = common_type (TREE_TYPE (t1), TREE_TYPE (t2)); + tree valtype = composite_type (TREE_TYPE (t1), TREE_TYPE (t2)); tree p1 = TYPE_ARG_TYPES (t1); tree p2 = TYPE_ARG_TYPES (t2); int len; @@ -374,13 +306,15 @@ common_type (tree t1, tree t2) /* Simple way if one arg fails to specify argument types. */ if (TYPE_ARG_TYPES (t1) == 0) { - t1 = build_function_type (valtype, TYPE_ARG_TYPES (t2)); - return build_type_attribute_variant (t1, attributes); + t1 = build_function_type (valtype, TYPE_ARG_TYPES (t2)); + t1 = build_type_attribute_variant (t1, attributes); + return qualify_type (t1, t2); } if (TYPE_ARG_TYPES (t2) == 0) { t1 = build_function_type (valtype, TYPE_ARG_TYPES (t1)); - return build_type_attribute_variant (t1, attributes); + t1 = build_type_attribute_variant (t1, attributes); + return qualify_type (t1, t2); } /* If both args specify argument types, we must merge the two @@ -422,8 +356,7 @@ common_type (tree t1, tree t2) tree memb; for (memb = TYPE_FIELDS (TREE_VALUE (p1)); memb; memb = TREE_CHAIN (memb)) - if (comptypes (TREE_TYPE (memb), TREE_VALUE (p2), - COMPARE_STRICT)) + if (comptypes (TREE_TYPE (memb), TREE_VALUE (p2))) { TREE_VALUE (n) = TREE_VALUE (p2); if (pedantic) @@ -437,8 +370,7 @@ common_type (tree t1, tree t2) tree memb; for (memb = TYPE_FIELDS (TREE_VALUE (p2)); memb; memb = TREE_CHAIN (memb)) - if (comptypes (TREE_TYPE (memb), TREE_VALUE (p1), - COMPARE_STRICT)) + if (comptypes (TREE_TYPE (memb), TREE_VALUE (p1))) { TREE_VALUE (n) = TREE_VALUE (p1); if (pedantic) @@ -446,12 +378,13 @@ common_type (tree t1, tree t2) goto parm_done; } } - TREE_VALUE (n) = common_type (TREE_VALUE (p1), TREE_VALUE (p2)); + TREE_VALUE (n) = composite_type (TREE_VALUE (p1), TREE_VALUE (p2)); parm_done: ; } c_override_global_bindings_to_false = false; t1 = build_function_type (valtype, newargs); + t1 = qualify_type (t1, t2); /* ... falls through ... */ } @@ -460,13 +393,186 @@ common_type (tree t1, tree t2) } } + +/* Return the type of a conditional expression between pointers to + possibly differently qualified versions of compatible types. + + We assume that comp_target_types has already been done and returned + nonzero; if that isn't so, this may crash. */ + +static tree +common_pointer_type (tree t1, tree t2) +{ + tree attributes; + tree pointed_to_1; + tree pointed_to_2; + tree target; + + /* Save time if the two types are the same. */ + + if (t1 == t2) return t1; + + /* If one type is nonsense, use the other. */ + if (t1 == error_mark_node) + return t2; + if (t2 == error_mark_node) + return t1; + + gcc_assert (TREE_CODE (t1) == POINTER_TYPE + && TREE_CODE (t2) == POINTER_TYPE); + + /* Merge the attributes. */ + attributes = targetm.merge_type_attributes (t1, t2); + + /* Find the composite type of the target types, and combine the + qualifiers of the two types' targets. */ + pointed_to_1 = TREE_TYPE (t1); + pointed_to_2 = TREE_TYPE (t2); + target = composite_type (TYPE_MAIN_VARIANT (pointed_to_1), + TYPE_MAIN_VARIANT (pointed_to_2)); + t1 = build_pointer_type (c_build_qualified_type + (target, + TYPE_QUALS (pointed_to_1) | + TYPE_QUALS (pointed_to_2))); + return build_type_attribute_variant (t1, attributes); +} + +/* Return the common type for two arithmetic types under the usual + arithmetic conversions. The default conversions have already been + applied, and enumerated types converted to their compatible integer + types. The resulting type is unqualified and has no attributes. + + This is the type for the result of most arithmetic operations + if the operands have the given two types. */ + +tree +common_type (tree t1, tree t2) +{ + enum tree_code code1; + enum tree_code code2; + + /* If one type is nonsense, use the other. */ + if (t1 == error_mark_node) + return t2; + if (t2 == error_mark_node) + return t1; + + if (TYPE_QUALS (t1) != TYPE_UNQUALIFIED) + t1 = TYPE_MAIN_VARIANT (t1); + + if (TYPE_QUALS (t2) != TYPE_UNQUALIFIED) + t2 = TYPE_MAIN_VARIANT (t2); + + if (TYPE_ATTRIBUTES (t1) != NULL_TREE) + t1 = build_type_attribute_variant (t1, NULL_TREE); + + if (TYPE_ATTRIBUTES (t2) != NULL_TREE) + t2 = build_type_attribute_variant (t2, NULL_TREE); + + /* Save time if the two types are the same. */ + + if (t1 == t2) return t1; + + code1 = TREE_CODE (t1); + code2 = TREE_CODE (t2); + + gcc_assert (code1 == VECTOR_TYPE || code1 == COMPLEX_TYPE + || code1 == REAL_TYPE || code1 == INTEGER_TYPE); + gcc_assert (code2 == VECTOR_TYPE || code2 == COMPLEX_TYPE + || code2 == REAL_TYPE || code2 == INTEGER_TYPE); + + /* If one type is a vector type, return that type. (How the usual + arithmetic conversions apply to the vector types extension is not + precisely specified.) */ + if (code1 == VECTOR_TYPE) + return t1; + + if (code2 == VECTOR_TYPE) + return t2; + + /* If one type is complex, form the common type of the non-complex + components, then make that complex. Use T1 or T2 if it is the + required type. */ + if (code1 == COMPLEX_TYPE || code2 == COMPLEX_TYPE) + { + tree subtype1 = code1 == COMPLEX_TYPE ? TREE_TYPE (t1) : t1; + tree subtype2 = code2 == COMPLEX_TYPE ? TREE_TYPE (t2) : t2; + tree subtype = common_type (subtype1, subtype2); + + if (code1 == COMPLEX_TYPE && TREE_TYPE (t1) == subtype) + return t1; + else if (code2 == COMPLEX_TYPE && TREE_TYPE (t2) == subtype) + return t2; + else + return build_complex_type (subtype); + } + + /* If only one is real, use it as the result. */ + + if (code1 == REAL_TYPE && code2 != REAL_TYPE) + return t1; + + if (code2 == REAL_TYPE && code1 != REAL_TYPE) + return t2; + + /* Both real or both integers; use the one with greater precision. */ + + if (TYPE_PRECISION (t1) > TYPE_PRECISION (t2)) + return t1; + else if (TYPE_PRECISION (t2) > TYPE_PRECISION (t1)) + return t2; + + /* Same precision. Prefer long longs to longs to ints when the + same precision, following the C99 rules on integer type rank + (which are equivalent to the C90 rules for C90 types). */ + + if (TYPE_MAIN_VARIANT (t1) == long_long_unsigned_type_node + || TYPE_MAIN_VARIANT (t2) == long_long_unsigned_type_node) + return long_long_unsigned_type_node; + + if (TYPE_MAIN_VARIANT (t1) == long_long_integer_type_node + || TYPE_MAIN_VARIANT (t2) == long_long_integer_type_node) + { + if (TYPE_UNSIGNED (t1) || TYPE_UNSIGNED (t2)) + return long_long_unsigned_type_node; + else + return long_long_integer_type_node; + } + + if (TYPE_MAIN_VARIANT (t1) == long_unsigned_type_node + || TYPE_MAIN_VARIANT (t2) == long_unsigned_type_node) + return long_unsigned_type_node; + + if (TYPE_MAIN_VARIANT (t1) == long_integer_type_node + || TYPE_MAIN_VARIANT (t2) == long_integer_type_node) + { + /* But preserve unsignedness from the other type, + since long cannot hold all the values of an unsigned int. */ + if (TYPE_UNSIGNED (t1) || TYPE_UNSIGNED (t2)) + return long_unsigned_type_node; + else + return long_integer_type_node; + } + + /* Likewise, prefer long double to double even if same size. */ + if (TYPE_MAIN_VARIANT (t1) == long_double_type_node + || TYPE_MAIN_VARIANT (t2) == long_double_type_node) + return long_double_type_node; + + /* Otherwise prefer the unsigned one. */ + + if (TYPE_UNSIGNED (t1)) + return t1; + else + return t2; +} /* Return 1 if TYPE1 and TYPE2 are compatible types for assignment or various other operations. Return 2 if they are compatible but a warning may be needed if you use them together. */ int -comptypes (tree type1, tree type2, int flags) +comptypes (tree type1, tree type2) { tree t1 = type1; tree t2 = type2; @@ -503,9 +609,10 @@ comptypes (tree type1, tree type2, int flags) /* Different classes of types can't be compatible. */ - if (TREE_CODE (t1) != TREE_CODE (t2)) return 0; + if (TREE_CODE (t1) != TREE_CODE (t2)) + return 0; - /* Qualifiers must match. */ + /* Qualifiers must match. C99 6.7.3p9 */ if (TYPE_QUALS (t1) != TYPE_QUALS (t2)) return 0; @@ -532,11 +639,11 @@ comptypes (tree type1, tree type2, int flags) if (c_dialect_objc () && (val = objc_comptypes (t1, t2, 0)) >= 0) break; val = (TREE_TYPE (t1) == TREE_TYPE (t2) - ? 1 : comptypes (TREE_TYPE (t1), TREE_TYPE (t2), flags)); + ? 1 : comptypes (TREE_TYPE (t1), TREE_TYPE (t2))); break; case FUNCTION_TYPE: - val = function_types_compatible_p (t1, t2, flags); + val = function_types_compatible_p (t1, t2); break; case ARRAY_TYPE: @@ -549,8 +656,7 @@ comptypes (tree type1, tree type2, int flags) /* Target types must match incl. qualifiers. */ if (TREE_TYPE (t1) != TREE_TYPE (t2) - && 0 == (val = comptypes (TREE_TYPE (t1), TREE_TYPE (t2), - flags))) + && 0 == (val = comptypes (TREE_TYPE (t1), TREE_TYPE (t2)))) return 0; /* Sizes must match unless one is missing or variable. */ @@ -588,12 +694,12 @@ comptypes (tree type1, tree type2, int flags) case ENUMERAL_TYPE: case UNION_TYPE: if (val != 1 && !same_translation_unit_p (t1, t2)) - val = tagged_types_tu_compatible_p (t1, t2, flags); + val = tagged_types_tu_compatible_p (t1, t2); break; case VECTOR_TYPE: val = TYPE_VECTOR_SUBPARTS (t1) == TYPE_VECTOR_SUBPARTS (t2) - && comptypes (TREE_TYPE (t1), TREE_TYPE (t2), 0); + && comptypes (TREE_TYPE (t1), TREE_TYPE (t2)); break; default: @@ -619,7 +725,7 @@ comp_target_types (tree ttl, tree ttr, int reflexive) return val; val = comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (ttl)), - TYPE_MAIN_VARIANT (TREE_TYPE (ttr)), COMPARE_STRICT); + TYPE_MAIN_VARIANT (TREE_TYPE (ttr))); if (val == 2 && pedantic) pedwarn ("types are not quite compatible"); @@ -641,7 +747,7 @@ same_translation_unit_p (tree t1, tree t2) case 'd': t1 = DECL_CONTEXT (t1); break; case 't': t1 = TYPE_CONTEXT (t1); break; case 'x': t1 = BLOCK_SUPERCONTEXT (t1); break; /* assume block */ - default: abort (); + default: gcc_unreachable (); } while (t2 && TREE_CODE (t2) != TRANSLATION_UNIT_DECL) @@ -650,7 +756,7 @@ same_translation_unit_p (tree t1, tree t2) case 'd': t2 = DECL_CONTEXT (t2); break; case 't': t2 = TYPE_CONTEXT (t2); break; case 'x': t2 = BLOCK_SUPERCONTEXT (t2); break; /* assume block */ - default: abort (); + default: gcc_unreachable (); } return t1 == t2; @@ -679,11 +785,11 @@ static const struct tagged_tu_seen * tagged_tu_seen_base; rules. */ static int -tagged_types_tu_compatible_p (tree t1, tree t2, int flags) +tagged_types_tu_compatible_p (tree t1, tree t2) { tree s1, s2; bool needs_warning = false; - + /* We have to verify that the tags of the types are the same. This is harder than it looks because this may be a typedef, so we have to go look at the original type. It may even be a typedef of a @@ -703,33 +809,33 @@ tagged_types_tu_compatible_p (tree t1, tree t2, int flags) /* C90 didn't have the requirement that the two tags be the same. */ if (flag_isoc99 && TYPE_NAME (t1) != TYPE_NAME (t2)) return 0; - + /* C90 didn't say what happened if one or both of the types were incomplete; we choose to follow C99 rules here, which is that they are compatible. */ if (TYPE_SIZE (t1) == NULL || TYPE_SIZE (t2) == NULL) return 1; - + { const struct tagged_tu_seen * tts_i; for (tts_i = tagged_tu_seen_base; tts_i != NULL; tts_i = tts_i->next) if (tts_i->t1 == t1 && tts_i->t2 == t2) return 1; } - + switch (TREE_CODE (t1)) { case ENUMERAL_TYPE: { - + /* Speed up the case where the type values are in the same order. */ tree tv1 = TYPE_VALUES (t1); tree tv2 = TYPE_VALUES (t2); - + if (tv1 == tv2) return 1; - + for (;tv1 && tv2; tv1 = TREE_CHAIN (tv1), tv2 = TREE_CHAIN (tv2)) { if (TREE_PURPOSE (tv1) != TREE_PURPOSE (tv2)) @@ -737,15 +843,15 @@ tagged_types_tu_compatible_p (tree t1, tree t2, int flags) if (simple_cst_equal (TREE_VALUE (tv1), TREE_VALUE (tv2)) != 1) return 0; } - + if (tv1 == NULL_TREE && tv2 == NULL_TREE) return 1; if (tv1 == NULL_TREE || tv2 == NULL_TREE) return 0; - + if (list_length (TYPE_VALUES (t1)) != list_length (TYPE_VALUES (t2))) return 0; - + for (s1 = TYPE_VALUES (t1); s1; s1 = TREE_CHAIN (s1)) { s2 = purpose_member (TREE_PURPOSE (s1), TYPE_VALUES (t2)); @@ -770,18 +876,18 @@ tagged_types_tu_compatible_p (tree t1, tree t2, int flags) tts.t1 = t1; tts.t2 = t2; tagged_tu_seen_base = &tts; - + if (DECL_NAME (s1) != NULL) - for (s2 = TYPE_VALUES (t2); s2; s2 = TREE_CHAIN (s2)) + for (s2 = TYPE_FIELDS (t2); s2; s2 = TREE_CHAIN (s2)) if (DECL_NAME (s1) == DECL_NAME (s2)) { int result; - result = comptypes (TREE_TYPE (s1), TREE_TYPE (s2), flags); + result = comptypes (TREE_TYPE (s1), TREE_TYPE (s2)); if (result == 0) break; if (result == 2) needs_warning = true; - + if (TREE_CODE (s1) == FIELD_DECL && simple_cst_equal (DECL_FIELD_BIT_OFFSET (s1), DECL_FIELD_BIT_OFFSET (s2)) != 1) @@ -800,13 +906,13 @@ tagged_types_tu_compatible_p (tree t1, tree t2, int flags) case RECORD_TYPE: { struct tagged_tu_seen tts; - + tts.next = tagged_tu_seen_base; tts.t1 = t1; tts.t2 = t2; tagged_tu_seen_base = &tts; - - for (s1 = TYPE_FIELDS (t1), s2 = TYPE_FIELDS (t2); + + for (s1 = TYPE_FIELDS (t1), s2 = TYPE_FIELDS (t2); s1 && s2; s1 = TREE_CHAIN (s1), s2 = TREE_CHAIN (s2)) { @@ -814,12 +920,12 @@ tagged_types_tu_compatible_p (tree t1, tree t2, int flags) if (TREE_CODE (s1) != TREE_CODE (s2) || DECL_NAME (s1) != DECL_NAME (s2)) break; - result = comptypes (TREE_TYPE (s1), TREE_TYPE (s2), flags); + result = comptypes (TREE_TYPE (s1), TREE_TYPE (s2)); if (result == 0) break; if (result == 2) needs_warning = true; - + if (TREE_CODE (s1) == FIELD_DECL && simple_cst_equal (DECL_FIELD_BIT_OFFSET (s1), DECL_FIELD_BIT_OFFSET (s2)) != 1) @@ -832,7 +938,7 @@ tagged_types_tu_compatible_p (tree t1, tree t2, int flags) } default: - abort (); + gcc_unreachable (); } } @@ -844,7 +950,7 @@ tagged_types_tu_compatible_p (tree t1, tree t2, int flags) Otherwise, the argument types must match. */ static int -function_types_compatible_p (tree f1, tree f2, int flags) +function_types_compatible_p (tree f1, tree f2) { tree args1, args2; /* 1 if no need for warning yet, 2 if warning cause has been seen. */ @@ -855,9 +961,9 @@ function_types_compatible_p (tree f1, tree f2, int flags) ret1 = TREE_TYPE (f1); ret2 = TREE_TYPE (f2); - /* 'volatile' qualifiers on a function's return type mean the function - is noreturn. */ - if (pedantic && TYPE_VOLATILE (ret1) != TYPE_VOLATILE (ret2)) + /* 'volatile' qualifiers on a function's return type used to mean + the function is noreturn. */ + if (TYPE_VOLATILE (ret1) != TYPE_VOLATILE (ret2)) pedwarn ("function return types not compatible due to `volatile'"); if (TYPE_VOLATILE (ret1)) ret1 = build_qualified_type (TYPE_MAIN_VARIANT (ret1), @@ -865,7 +971,7 @@ function_types_compatible_p (tree f1, tree f2, int flags) if (TYPE_VOLATILE (ret2)) ret2 = build_qualified_type (TYPE_MAIN_VARIANT (ret2), TYPE_QUALS (ret2) & ~TYPE_QUAL_VOLATILE); - val = comptypes (ret1, ret2, flags); + val = comptypes (ret1, ret2); if (val == 0) return 0; @@ -883,8 +989,7 @@ function_types_compatible_p (tree f1, tree f2, int flags) compare that with the other type's arglist. If they don't match, ask for a warning (but no error). */ if (TYPE_ACTUAL_ARG_TYPES (f1) - && 1 != type_lists_compatible_p (args2, TYPE_ACTUAL_ARG_TYPES (f1), - flags)) + && 1 != type_lists_compatible_p (args2, TYPE_ACTUAL_ARG_TYPES (f1))) val = 2; return val; } @@ -893,14 +998,13 @@ function_types_compatible_p (tree f1, tree f2, int flags) if (!self_promoting_args_p (args1)) return 0; if (TYPE_ACTUAL_ARG_TYPES (f2) - && 1 != type_lists_compatible_p (args1, TYPE_ACTUAL_ARG_TYPES (f2), - flags)) + && 1 != type_lists_compatible_p (args1, TYPE_ACTUAL_ARG_TYPES (f2))) val = 2; return val; } /* Both types have argument lists: compare them and propagate results. */ - val1 = type_lists_compatible_p (args1, args2, flags); + val1 = type_lists_compatible_p (args1, args2); return val1 != 1 ? val1 : val; } @@ -909,7 +1013,7 @@ function_types_compatible_p (tree f1, tree f2, int flags) or 2 for compatible with warning. */ static int -type_lists_compatible_p (tree args1, tree args2, int flags) +type_lists_compatible_p (tree args1, tree args2) { /* 1 if no need for warning yet, 2 if warning cause has been seen. */ int val = 1; @@ -942,8 +1046,7 @@ type_lists_compatible_p (tree args1, tree args2, int flags) || TREE_CODE (TREE_VALUE (args2)) == ERROR_MARK) ; else if (! (newval = comptypes (TYPE_MAIN_VARIANT (TREE_VALUE (args1)), - TYPE_MAIN_VARIANT (TREE_VALUE (args2)), - flags))) + TYPE_MAIN_VARIANT (TREE_VALUE (args2))))) { /* Allow wait (union {union wait *u; int *i} *) and wait (union wait *) to be compatible. */ @@ -957,8 +1060,7 @@ type_lists_compatible_p (tree args1, tree args2, int flags) tree memb; for (memb = TYPE_FIELDS (TREE_VALUE (args1)); memb; memb = TREE_CHAIN (memb)) - if (comptypes (TREE_TYPE (memb), TREE_VALUE (args2), - flags)) + if (comptypes (TREE_TYPE (memb), TREE_VALUE (args2))) break; if (memb == 0) return 0; @@ -973,8 +1075,7 @@ type_lists_compatible_p (tree args1, tree args2, int flags) tree memb; for (memb = TYPE_FIELDS (TREE_VALUE (args2)); memb; memb = TREE_CHAIN (memb)) - if (comptypes (TREE_TYPE (memb), TREE_VALUE (args1), - flags)) + if (comptypes (TREE_TYPE (memb), TREE_VALUE (args1))) break; if (memb == 0) return 0; @@ -1083,9 +1184,8 @@ default_function_array_conversion (tree exp) exp = TREE_OPERAND (exp, 0); } - /* Preserve the original expression code. */ - if (IS_EXPR_CODE_CLASS (TREE_CODE_CLASS (TREE_CODE (exp)))) - C_SET_EXP_ORIGINAL_CODE (exp, C_EXP_ORIGINAL_CODE (orig_exp)); + if (TREE_NO_WARNING (orig_exp)) + TREE_NO_WARNING (exp) = 1; if (code == FUNCTION_TYPE) { @@ -1114,14 +1214,14 @@ default_function_array_conversion (tree exp) | (volatilep * TYPE_QUAL_VOLATILE)); if (TREE_CODE (exp) == INDIRECT_REF) - return convert (TYPE_POINTER_TO (restype), + return convert (build_pointer_type (restype), TREE_OPERAND (exp, 0)); if (TREE_CODE (exp) == COMPOUND_EXPR) { tree op1 = default_conversion (TREE_OPERAND (exp, 1)); - return build (COMPOUND_EXPR, TREE_TYPE (op1), - TREE_OPERAND (exp, 0), op1); + return build2 (COMPOUND_EXPR, TREE_TYPE (op1), + TREE_OPERAND (exp, 0), op1); } lvalue_array_p = !not_lvalue && lvalue_p (exp); @@ -1138,10 +1238,10 @@ default_function_array_conversion (tree exp) if (TREE_CODE (exp) == VAR_DECL) { - /* ??? This is not really quite correct - in that the type of the operand of ADDR_EXPR - is not the target type of the type of the ADDR_EXPR itself. - Question is, can this lossage be avoided? */ + /* We are making an ADDR_EXPR of ptrtype. This is a valid + ADDR_EXPR because it's the best way of representing what + happens in C when we take the address of an array and place + it in a pointer to the element type. */ adr = build1 (ADDR_EXPR, ptrtype, exp); if (!c_mark_addressable (exp)) return error_mark_node; @@ -1195,9 +1295,8 @@ default_conversion (tree exp) && TREE_TYPE (TREE_OPERAND (exp, 0)) == TREE_TYPE (exp))) exp = TREE_OPERAND (exp, 0); - /* Preserve the original expression code. */ - if (IS_EXPR_CODE_CLASS (TREE_CODE_CLASS (TREE_CODE (exp)))) - C_SET_EXP_ORIGINAL_CODE (exp, C_EXP_ORIGINAL_CODE (orig_exp)); + if (TREE_NO_WARNING (orig_exp)) + TREE_NO_WARNING (exp) = 1; /* Normally convert enums to int, but convert wide enums to something wider. */ @@ -1344,6 +1443,9 @@ build_component_ref (tree datum, tree component) tree field = NULL; tree ref; + if (!objc_is_public (datum, component)) + return error_mark_node; + /* If DATUM is a COMPOUND_EXPR, move our reference inside it. Ensure that the arguments are not lvalues; otherwise, if the component is an array, it would wrongly decay to a pointer in @@ -1357,8 +1459,8 @@ build_component_ref (tree datum, tree component) case COMPOUND_EXPR: { tree value = build_component_ref (TREE_OPERAND (datum, 1), component); - return build (COMPOUND_EXPR, TREE_TYPE (value), - TREE_OPERAND (datum, 0), non_lvalue (value)); + return build2 (COMPOUND_EXPR, TREE_TYPE (value), + TREE_OPERAND (datum, 0), non_lvalue (value)); } default: break; @@ -1396,7 +1498,8 @@ build_component_ref (tree datum, tree component) if (TREE_TYPE (subdatum) == error_mark_node) return error_mark_node; - ref = build (COMPONENT_REF, TREE_TYPE (subdatum), datum, subdatum); + ref = build3 (COMPONENT_REF, TREE_TYPE (subdatum), datum, subdatum, + NULL_TREE); if (TREE_READONLY (datum) || TREE_READONLY (subdatum)) TREE_READONLY (ref) = 1; if (TREE_THIS_VOLATILE (datum) || TREE_THIS_VOLATILE (subdatum)) @@ -1549,7 +1652,7 @@ build_array_ref (tree array, tree index) } type = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (array))); - rval = build (ARRAY_REF, type, array, index); + rval = build4 (ARRAY_REF, type, array, index, NULL_TREE, NULL_TREE); /* Array ref is const/volatile if the array elements are or if the array is. */ TREE_READONLY (rval) @@ -1615,7 +1718,7 @@ build_external_ref (tree id, int fun) { tree ref; tree decl = lookup_name (id); - tree objc_ivar = lookup_objc_ivar (id); + tree objc_ivar = objc_lookup_ivar (id); if (decl && decl != error_mark_node) { @@ -1656,6 +1759,16 @@ build_external_ref (tree id, int fun) assemble_external (ref); TREE_USED (ref) = 1; + if (TREE_CODE (ref) == FUNCTION_DECL && !in_alignof) + { + if (!in_sizeof && !in_typeof) + C_DECL_USED (ref) = 1; + else if (DECL_INITIAL (ref) == 0 + && DECL_EXTERNAL (ref) + && !TREE_PUBLIC (ref)) + record_maybe_used_decl (ref); + } + if (TREE_CODE (ref) == CONST_DECL) { ref = DECL_INITIAL (ref); @@ -1677,6 +1790,86 @@ build_external_ref (tree id, int fun) return ref; } +/* Record details of decls possibly used inside sizeof or typeof. */ +struct maybe_used_decl +{ + /* The decl. */ + tree decl; + /* The level seen at (in_sizeof + in_typeof). */ + int level; + /* The next one at this level or above, or NULL. */ + struct maybe_used_decl *next; +}; + +static struct maybe_used_decl *maybe_used_decls; + +/* Record that DECL, an undefined static function reference seen + inside sizeof or typeof, might be used if the operand of sizeof is + a VLA type or the operand of typeof is a variably modified + type. */ + +void +record_maybe_used_decl (tree decl) +{ + struct maybe_used_decl *t = XOBNEW (&parser_obstack, struct maybe_used_decl); + t->decl = decl; + t->level = in_sizeof + in_typeof; + t->next = maybe_used_decls; + maybe_used_decls = t; +} + +/* Pop the stack of decls possibly used inside sizeof or typeof. If + USED is false, just discard them. If it is true, mark them used + (if no longer inside sizeof or typeof) or move them to the next + level up (if still inside sizeof or typeof). */ + +void +pop_maybe_used (bool used) +{ + struct maybe_used_decl *p = maybe_used_decls; + int cur_level = in_sizeof + in_typeof; + while (p && p->level > cur_level) + { + if (used) + { + if (cur_level == 0) + C_DECL_USED (p->decl) = 1; + else + p->level = cur_level; + } + p = p->next; + } + if (!used || cur_level == 0) + maybe_used_decls = p; +} + +/* Return the result of sizeof applied to EXPR. */ + +struct c_expr +c_expr_sizeof_expr (struct c_expr expr) +{ + struct c_expr ret; + ret.value = c_sizeof (TREE_TYPE (expr.value)); + ret.original_code = ERROR_MARK; + pop_maybe_used (C_TYPE_VARIABLE_SIZE (TREE_TYPE (expr.value))); + return ret; +} + +/* Return the result of sizeof applied to T, a structure for the type + name passed to sizeof (rather than the type itself). */ + +struct c_expr +c_expr_sizeof_type (struct c_type_name *t) +{ + tree type; + struct c_expr ret; + type = groktypename (t); + ret.value = c_sizeof (type); + ret.original_code = ERROR_MARK; + pop_maybe_used (C_TYPE_VARIABLE_SIZE (type)); + return ret; +} + /* Build a function call to function FUNCTION with parameters PARAMS. PARAMS is a list--a chain of TREE_LIST nodes--in which the TREE_VALUE of each node is a parameter-expression. @@ -1741,7 +1934,7 @@ build_function_call (tree function, tree params) && TREE_CODE (function) == NOP_EXPR && TREE_CODE (tem = TREE_OPERAND (function, 0)) == ADDR_EXPR && TREE_CODE (tem = TREE_OPERAND (tem, 0)) == FUNCTION_DECL - && ! comptypes (fntype, TREE_TYPE (tem), COMPARE_STRICT)) + && ! comptypes (fntype, TREE_TYPE (tem))) { tree return_type = TREE_TYPE (fntype); tree trap = build_function_call (built_in_decls[BUILT_IN_TRAP], @@ -1769,7 +1962,7 @@ build_function_call (tree function, tree params) else rhs = fold (build1 (NOP_EXPR, return_type, integer_zero_node)); - return build (COMPOUND_EXPR, return_type, trap, rhs); + return build2 (COMPOUND_EXPR, return_type, trap, rhs); } } @@ -1783,24 +1976,21 @@ build_function_call (tree function, tree params) check_function_arguments (TYPE_ATTRIBUTES (fntype), coerced_params); - /* Recognize certain built-in functions so we can make tree-codes - other than CALL_EXPR. We do this when it enables fold-const.c - to do something useful. */ + result = build3 (CALL_EXPR, TREE_TYPE (fntype), + function, coerced_params, NULL_TREE); + TREE_SIDE_EFFECTS (result) = 1; - if (TREE_CODE (function) == ADDR_EXPR - && TREE_CODE (TREE_OPERAND (function, 0)) == FUNCTION_DECL - && DECL_BUILT_IN (TREE_OPERAND (function, 0))) + if (require_constant_value) { - result = expand_tree_builtin (TREE_OPERAND (function, 0), - params, coerced_params); - if (result) - return result; - } + result = fold_initializer (result); - result = build (CALL_EXPR, TREE_TYPE (fntype), - function, coerced_params, NULL_TREE); - TREE_SIDE_EFFECTS (result) = 1; - result = fold (result); + if (TREE_CONSTANT (result) + && (name == NULL_TREE + || strncmp (IDENTIFIER_POINTER (name), "__builtin_", 10) != 0)) + pedwarn_init ("initializer element is not constant"); + } + else + result = fold (result); if (VOID_TYPE_P (TREE_TYPE (result))) return result; @@ -1878,7 +2068,7 @@ convert_arguments (tree typelist, tree values, tree name, tree fundecl) differ from the default conversions. */ if (warn_conversion || warn_traditional) { - int formal_prec = TYPE_PRECISION (type); + unsigned int formal_prec = TYPE_PRECISION (type); if (INTEGRAL_TYPE_P (type) && TREE_CODE (TREE_TYPE (val)) == REAL_TYPE) @@ -1999,28 +2189,23 @@ convert_arguments (tree typelist, tree values, tree name, tree fundecl) we check for operands that were written with other binary operators in a way that is likely to confuse the user. */ -tree -parser_build_binary_op (enum tree_code code, tree arg1, tree arg2) +struct c_expr +parser_build_binary_op (enum tree_code code, struct c_expr arg1, + struct c_expr arg2) { - tree result = build_binary_op (code, arg1, arg2, 1); + struct c_expr result; - char class; - char class1 = TREE_CODE_CLASS (TREE_CODE (arg1)); - char class2 = TREE_CODE_CLASS (TREE_CODE (arg2)); - enum tree_code code1 = ERROR_MARK; - enum tree_code code2 = ERROR_MARK; + enum tree_code code1 = arg1.original_code; + enum tree_code code2 = arg2.original_code; - if (TREE_CODE (result) == ERROR_MARK) - return error_mark_node; + result.value = build_binary_op (code, arg1.value, arg2.value, 1); + result.original_code = code; - if (IS_EXPR_CODE_CLASS (class1)) - code1 = C_EXP_ORIGINAL_CODE (arg1); - if (IS_EXPR_CODE_CLASS (class2)) - code2 = C_EXP_ORIGINAL_CODE (arg2); + if (TREE_CODE (result.value) == ERROR_MARK) + return result; /* Check for cases such as x+y< qualifications. But when constructing cast expressions, the protocols do matter and must be kept around. */ - if (!c_dialect_objc () || !objc_is_object_ptr (type)) - type = TYPE_MAIN_VARIANT (type); + if (objc_is_object_ptr (type) && objc_is_object_ptr (TREE_TYPE (expr))) + return build1 (NOP_EXPR, type, expr); + + type = TYPE_MAIN_VARIANT (type); if (TREE_CODE (type) == ARRAY_TYPE) { @@ -2905,7 +3028,7 @@ build_c_cast (tree type, tree expr) for (field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field)) if (comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (field)), - TYPE_MAIN_VARIANT (TREE_TYPE (value)), COMPARE_STRICT)) + TYPE_MAIN_VARIANT (TREE_TYPE (value)))) break; if (field) @@ -2917,7 +3040,7 @@ build_c_cast (tree type, tree expr) t = digest_init (type, build_constructor (type, build_tree_list (field, value)), - 0); + true, 0); TREE_CONSTANT (t) = TREE_CONSTANT (value); TREE_INVARIANT (t) = TREE_INVARIANT (value); return t; @@ -3065,9 +3188,16 @@ build_c_cast (tree type, tree expr) /* Ignore any integer overflow caused by the cast. */ if (TREE_CODE (value) == INTEGER_CST) { - TREE_OVERFLOW (value) = TREE_OVERFLOW (ovalue); - + if (EXPR_P (ovalue)) + /* If OVALUE had overflow set, then so will VALUE, so it + is safe to overwrite. */ + TREE_OVERFLOW (value) = TREE_OVERFLOW (ovalue); + else + TREE_OVERFLOW (value) = 0; + if (TREE_CODE_CLASS (TREE_CODE (ovalue)) == 'c') + /* Similarly, constant_overflow cannot have become + cleared. */ TREE_CONSTANT_OVERFLOW (value) = TREE_CONSTANT_OVERFLOW (ovalue); } } @@ -3087,15 +3217,16 @@ build_c_cast (tree type, tree expr) /* Interpret a cast of expression EXPR to type TYPE. */ tree -c_cast_expr (tree type, tree expr) +c_cast_expr (struct c_type_name *type_name, tree expr) { + tree type; int saved_wsp = warn_strict_prototypes; /* This avoids warnings about unprototyped casts on integers. E.g. "#define SIG_DFL (void(*)())0". */ if (TREE_CODE (expr) == INTEGER_CST) warn_strict_prototypes = 0; - type = groktypename (type); + type = groktypename (type_name); warn_strict_prototypes = saved_wsp; return build_c_cast (type, expr); @@ -3180,7 +3311,7 @@ build_modify_expr (tree lhs, enum tree_code modifycode, tree rhs) /* Scan operands */ - result = build (MODIFY_EXPR, lhstype, lhs, newrhs); + result = build2 (MODIFY_EXPR, lhstype, lhs, newrhs); TREE_SIDE_EFFECTS (result) = 1; /* If we got the LHS in a different type for storing in, @@ -3253,7 +3384,7 @@ convert_for_assignment (tree type, tree rhs, const char *errtype, This code doesn't fully support references, it's just for the special case of va_start and va_copy. */ if (codel == REFERENCE_TYPE - && comptypes (TREE_TYPE (type), TREE_TYPE (rhs), COMPARE_STRICT) == 1) + && comptypes (TREE_TYPE (type), TREE_TYPE (rhs)) == 1) { if (!lvalue_p (rhs)) { @@ -3301,7 +3432,7 @@ convert_for_assignment (tree type, tree rhs, const char *errtype, tree memb_type = TREE_TYPE (memb_types); if (comptypes (TYPE_MAIN_VARIANT (memb_type), - TYPE_MAIN_VARIANT (rhstype), COMPARE_STRICT)) + TYPE_MAIN_VARIANT (rhstype))) break; if (TREE_CODE (memb_type) != POINTER_TYPE) @@ -3429,7 +3560,7 @@ convert_for_assignment (tree type, tree rhs, const char *errtype, || target_cmp) ; /* If there is a mismatch, do warn. */ - else if (pedantic) + else warn_for_assignment ("pointer targets in %s differ in signedness", errtype, funname, parmnum); } @@ -3555,7 +3686,7 @@ warn_for_assignment (const char *msgid, const char *opname, tree function, { /* Function name is known; supply it. */ const char *const argstring = _("passing arg of `%s'"); - new_opname = alloca (IDENTIFIER_LENGTH (function) + new_opname = (char *) alloca (IDENTIFIER_LENGTH (function) + strlen (argstring) + 1 + 1); sprintf (new_opname, argstring, IDENTIFIER_POINTER (function)); @@ -3564,7 +3695,7 @@ warn_for_assignment (const char *msgid, const char *opname, tree function, { /* Function name unknown (call through ptr). */ const char *const argnofun = _("passing arg of pointer to function"); - new_opname = alloca (strlen (argnofun) + 1 + 1); + new_opname = (char *) alloca (strlen (argnofun) + 1 + 1); sprintf (new_opname, argnofun); } } @@ -3572,7 +3703,7 @@ warn_for_assignment (const char *msgid, const char *opname, tree function, { /* Function name is known; supply it. */ const char *const argstring = _("passing arg %d of `%s'"); - new_opname = alloca (IDENTIFIER_LENGTH (function) + new_opname = (char *) alloca (IDENTIFIER_LENGTH (function) + strlen (argstring) + 1 + 25 /*%d*/ + 1); sprintf (new_opname, argstring, argnum, IDENTIFIER_POINTER (function)); @@ -3581,7 +3712,7 @@ warn_for_assignment (const char *msgid, const char *opname, tree function, { /* Function name unknown (call through ptr); just give arg number. */ const char *const argnofun = _("passing arg %d of pointer to function"); - new_opname = alloca (strlen (argnofun) + 1 + 25 /*%d*/ + 1); + new_opname = (char *) alloca (strlen (argnofun) + 1 + 25 /*%d*/ + 1); sprintf (new_opname, argnofun, argnum); } opname = new_opname; @@ -3631,7 +3762,7 @@ store_init_value (tree decl, tree init) /* Digest the specified initializer into an expression. */ - value = digest_init (type, init, TREE_STATIC (decl)); + value = digest_init (type, init, true, TREE_STATIC (decl)); /* Store the expression if valid; else report error. */ @@ -3712,11 +3843,8 @@ static int spelling_size; /* Size of the spelling stack. */ if (depth >= spelling_size) \ { \ spelling_size += 10; \ - if (spelling_base == 0) \ - spelling_base = xmalloc (spelling_size * sizeof (struct spelling)); \ - else \ - spelling_base = xrealloc (spelling_base, \ - spelling_size * sizeof (struct spelling)); \ + spelling_base = XRESIZEVEC (struct spelling, spelling_base, \ + spelling_size); \ RESTORE_SPELLING_DEPTH (depth); \ } \ \ @@ -3806,7 +3934,7 @@ error_init (const char *msgid) char *ofwhat; error ("%s", _(msgid)); - ofwhat = print_spelling (alloca (spelling_length () + 1)); + ofwhat = print_spelling ((char *) alloca (spelling_length () + 1)); if (*ofwhat) error ("(near initialization for `%s')", ofwhat); } @@ -3821,7 +3949,7 @@ pedwarn_init (const char *msgid) char *ofwhat; pedwarn ("%s", _(msgid)); - ofwhat = print_spelling (alloca (spelling_length () + 1)); + ofwhat = print_spelling ((char *) alloca (spelling_length () + 1)); if (*ofwhat) pedwarn ("(near initialization for `%s')", ofwhat); } @@ -3836,19 +3964,37 @@ warning_init (const char *msgid) char *ofwhat; warning ("%s", _(msgid)); - ofwhat = print_spelling (alloca (spelling_length () + 1)); + ofwhat = print_spelling ((char *) alloca (spelling_length () + 1)); if (*ofwhat) warning ("(near initialization for `%s')", ofwhat); } +/* If TYPE is an array type and EXPR is a parenthesized string + constant, warn if pedantic that EXPR is being used to initialize an + object of type TYPE. */ + +void +maybe_warn_string_init (tree type, struct c_expr expr) +{ + if (pedantic + && TREE_CODE (type) == ARRAY_TYPE + && TREE_CODE (expr.value) == STRING_CST + && expr.original_code != STRING_CST) + pedwarn_init ("array initialized from parenthesized string constant"); +} + /* Digest the parser output INIT as an initializer for type TYPE. Return a C expression of type TYPE to represent the initial value. + If INIT is a string constant, STRICT_STRING is true if it is + unparenthesized or we should not warn here for it being parenthesized. + For other types of INIT, STRICT_STRING is not used. + REQUIRE_CONSTANT requests an error if non-constant initializers or elements are seen. */ static tree -digest_init (tree type, tree init, int require_constant) +digest_init (tree type, tree init, bool strict_string, int require_constant) { enum tree_code code = TREE_CODE (type); tree inside_init = init; @@ -3869,32 +4015,41 @@ digest_init (tree type, tree init, int require_constant) /* Initialization of an array of chars from a string constant optionally enclosed in braces. */ - if (code == ARRAY_TYPE) + if (code == ARRAY_TYPE && inside_init + && TREE_CODE (inside_init) == STRING_CST) { tree typ1 = TYPE_MAIN_VARIANT (TREE_TYPE (type)); - if ((typ1 == char_type_node - || typ1 == signed_char_type_node - || typ1 == unsigned_char_type_node - || typ1 == unsigned_wchar_type_node - || typ1 == signed_wchar_type_node) - && ((inside_init && TREE_CODE (inside_init) == STRING_CST))) + /* Note that an array could be both an array of character type + and an array of wchar_t if wchar_t is signed char or unsigned + char. */ + bool char_array = (typ1 == char_type_node + || typ1 == signed_char_type_node + || typ1 == unsigned_char_type_node); + bool wchar_array = !!comptypes (typ1, wchar_type_node); + if (char_array || wchar_array) { + struct c_expr expr; + bool char_string; + expr.value = inside_init; + expr.original_code = (strict_string ? STRING_CST : ERROR_MARK); + maybe_warn_string_init (type, expr); + + char_string + = (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (inside_init))) + == char_type_node); + if (comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (inside_init)), - TYPE_MAIN_VARIANT (type), COMPARE_STRICT)) + TYPE_MAIN_VARIANT (type))) return inside_init; - if ((TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (inside_init))) - != char_type_node) - && TYPE_PRECISION (typ1) == TYPE_PRECISION (char_type_node)) + if (!wchar_array && !char_string) { error_init ("char-array initialized from wide string"); return error_mark_node; } - if ((TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (inside_init))) - == char_type_node) - && TYPE_PRECISION (typ1) != TYPE_PRECISION (char_type_node)) + if (char_string && !char_array) { - error_init ("int-array initialized from non-wide string"); + error_init ("wchar_t-array initialized from non-wide string"); return error_mark_node; } @@ -3916,6 +4071,12 @@ digest_init (tree type, tree init, int require_constant) return inside_init; } + else if (INTEGRAL_TYPE_P (typ1)) + { + error_init ("array of inappropriate type initialized " + "from string constant"); + return error_mark_node; + } } /* Build a VECTOR_CST from a *constant* vector constructor. If the @@ -3927,8 +4088,7 @@ digest_init (tree type, tree init, int require_constant) { if (TREE_CODE (inside_init) == VECTOR_CST && comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (inside_init)), - TYPE_MAIN_VARIANT (type), - COMPARE_STRICT)) + TYPE_MAIN_VARIANT (type))) return inside_init; else return build_vector (type, CONSTRUCTOR_ELTS (inside_init)); @@ -3939,19 +4099,19 @@ digest_init (tree type, tree init, int require_constant) if (inside_init && TREE_TYPE (inside_init) != 0 && (comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (inside_init)), - TYPE_MAIN_VARIANT (type), COMPARE_STRICT) + TYPE_MAIN_VARIANT (type)) || (code == ARRAY_TYPE - && comptypes (TREE_TYPE (inside_init), type, COMPARE_STRICT)) + && comptypes (TREE_TYPE (inside_init), type)) || (code == VECTOR_TYPE - && comptypes (TREE_TYPE (inside_init), type, COMPARE_STRICT)) + && comptypes (TREE_TYPE (inside_init), type)) || (code == POINTER_TYPE && TREE_CODE (TREE_TYPE (inside_init)) == ARRAY_TYPE && comptypes (TREE_TYPE (TREE_TYPE (inside_init)), - TREE_TYPE (type), COMPARE_STRICT)) + TREE_TYPE (type))) || (code == POINTER_TYPE && TREE_CODE (TREE_TYPE (inside_init)) == FUNCTION_TYPE && comptypes (TREE_TYPE (inside_init), - TREE_TYPE (type), COMPARE_STRICT)))) + TREE_TYPE (type))))) { if (code == POINTER_TYPE) { @@ -4135,9 +4295,6 @@ static int constructor_depth; /* 0 if implicitly pushing constructor levels is allowed. */ int constructor_no_implicit = 0; /* 0 for C; 1 for some other languages. */ -static int require_constant_value; -static int require_constant_elements; - /* DECL node for which an initializer is being read. 0 means we are reading a constructor expression such as (struct foo) {...}. */ @@ -4179,9 +4336,9 @@ struct constructor_stack struct init_node *pending_elts; int offset; int depth; - /* If nonzero, this value should replace the entire + /* If value nonzero, this value should replace the entire constructor at this level. */ - tree replacement_value; + struct c_expr replacement_value; struct constructor_range_stack *range_stack; char constant; char simple; @@ -4237,7 +4394,7 @@ void start_init (tree decl, tree asmspec_tree, int top_level) { const char *locus; - struct initializer_stack *p = xmalloc (sizeof (struct initializer_stack)); + struct initializer_stack *p = XNEW (struct initializer_stack); const char *asmspec = 0; if (asmspec_tree) @@ -4308,12 +4465,11 @@ finish_init (void) free (q); } - if (constructor_range_stack) - abort (); + gcc_assert (!constructor_range_stack); /* Pop back to the data of the outer initializer (if any). */ free (spelling_base); - + constructor_decl = p->decl; constructor_asmspec = p->asmspec; require_constant_value = p->require_constant_value; @@ -4339,7 +4495,7 @@ finish_init (void) void really_start_incremental_init (tree type) { - struct constructor_stack *p = xmalloc (sizeof (struct constructor_stack)); + struct constructor_stack *p = XNEW (struct constructor_stack); if (type == 0) type = TREE_TYPE (constructor_decl); @@ -4360,7 +4516,8 @@ really_start_incremental_init (tree type) p->erroneous = constructor_erroneous; p->pending_elts = constructor_pending_elts; p->depth = constructor_depth; - p->replacement_value = 0; + p->replacement_value.value = 0; + p->replacement_value.original_code = ERROR_MARK; p->implicit = 0; p->range_stack = 0; p->outer = 0; @@ -4402,14 +4559,14 @@ really_start_incremental_init (tree type) /* Detect non-empty initializations of zero-length arrays. */ if (constructor_max_index == NULL_TREE && TYPE_SIZE (constructor_type)) - constructor_max_index = build_int_2 (-1, -1); + constructor_max_index = build_int_cst (NULL_TREE, -1); /* constructor_max_index needs to be an INTEGER_CST. Attempts to initialize VLAs will cause a proper error; avoid tree checking errors as well by setting a safe value. */ if (constructor_max_index && TREE_CODE (constructor_max_index) != INTEGER_CST) - constructor_max_index = build_int_2 (-1, -1); + constructor_max_index = build_int_cst (NULL_TREE, -1); constructor_index = convert (bitsizetype, @@ -4424,7 +4581,7 @@ really_start_incremental_init (tree type) { /* Vectors are like simple fixed-size arrays. */ constructor_max_index = - build_int_2 (TYPE_VECTOR_SUBPARTS (constructor_type) - 1, 0); + build_int_cst (NULL_TREE, TYPE_VECTOR_SUBPARTS (constructor_type) - 1); constructor_index = convert (bitsizetype, bitsize_zero_node); constructor_unfilled_index = constructor_index; } @@ -4475,7 +4632,7 @@ push_init_level (int implicit) value = find_init_member (constructor_index); } - p = xmalloc (sizeof (struct constructor_stack)); + p = XNEW (struct constructor_stack); p->type = constructor_type; p->fields = constructor_fields; p->index = constructor_index; @@ -4489,7 +4646,8 @@ push_init_level (int implicit) p->erroneous = constructor_erroneous; p->pending_elts = constructor_pending_elts; p->depth = constructor_depth; - p->replacement_value = 0; + p->replacement_value.value = 0; + p->replacement_value.original_code = ERROR_MARK; p->implicit = implicit; p->outer = 0; p->incremental = constructor_incremental; @@ -4578,7 +4736,7 @@ push_init_level (int implicit) { /* Vectors are like simple fixed-size arrays. */ constructor_max_index = - build_int_2 (TYPE_VECTOR_SUBPARTS (constructor_type) - 1, 0); + build_int_cst (NULL_TREE, TYPE_VECTOR_SUBPARTS (constructor_type) - 1); constructor_index = convert (bitsizetype, integer_zero_node); constructor_unfilled_index = constructor_index; } @@ -4592,14 +4750,14 @@ push_init_level (int implicit) /* Detect non-empty initializations of zero-length arrays. */ if (constructor_max_index == NULL_TREE && TYPE_SIZE (constructor_type)) - constructor_max_index = build_int_2 (-1, -1); + constructor_max_index = build_int_cst (NULL_TREE, -1); /* constructor_max_index needs to be an INTEGER_CST. Attempts to initialize VLAs will cause a proper error; avoid tree checking errors as well by setting a safe value. */ if (constructor_max_index && TREE_CODE (constructor_max_index) != INTEGER_CST) - constructor_max_index = build_int_2 (-1, -1); + constructor_max_index = build_int_cst (NULL_TREE, -1); constructor_index = convert (bitsizetype, @@ -4626,18 +4784,23 @@ push_init_level (int implicit) } /* At the end of an implicit or explicit brace level, - finish up that level of constructor. - If we were outputting the elements as they are read, return 0 + finish up that level of constructor. If a single expression + with redundant braces initialized that level, return the + c_expr structure for that expression. Otherwise, the original_code + element is set to ERROR_MARK. + If we were outputting the elements as they are read, return 0 as the value from inner levels (process_init_element ignores that), - but return error_mark_node from the outermost level + but return error_mark_node as the value from the outermost level (that's what we want to put in DECL_INITIAL). - Otherwise, return a CONSTRUCTOR expression. */ + Otherwise, return a CONSTRUCTOR expression as the value. */ -tree +struct c_expr pop_init_level (int implicit) { struct constructor_stack *p; - tree constructor = 0; + struct c_expr ret; + ret.value = 0; + ret.original_code = ERROR_MARK; if (implicit == 0) { @@ -4646,8 +4809,7 @@ pop_init_level (int implicit) while (constructor_stack->implicit) process_init_element (pop_init_level (1)); - if (constructor_range_stack) - abort (); + gcc_assert (!constructor_range_stack); } /* Now output all pending elements. */ @@ -4667,8 +4829,10 @@ pop_init_level (int implicit) already have pedwarned for empty brackets. */ if (integer_zerop (constructor_unfilled_index)) constructor_type = NULL_TREE; - else if (! TYPE_SIZE (constructor_type)) + else { + gcc_assert (!TYPE_SIZE (constructor_type)); + if (constructor_depth > 2) error_init ("initialization of flexible array member in a nested context"); else if (pedantic) @@ -4680,14 +4844,10 @@ pop_init_level (int implicit) if (TREE_CHAIN (constructor_fields) != NULL_TREE) constructor_type = NULL_TREE; } - else - /* Zero-length arrays are no longer special, so we should no longer - get here. */ - abort (); } /* Warn when some struct elements are implicitly initialized to zero. */ - if (extra_warnings + if (warn_missing_field_initializers && constructor_type && TREE_CODE (constructor_type) == RECORD_TYPE && constructor_unfilled_fields) @@ -4709,10 +4869,10 @@ pop_init_level (int implicit) } /* Pad out the end of the structure. */ - if (p->replacement_value) + if (p->replacement_value.value) /* If this closes a superfluous brace pair, just pass out the element between them. */ - constructor = p->replacement_value; + ret = p->replacement_value; else if (constructor_type == 0) ; else if (TREE_CODE (constructor_type) != RECORD_TYPE @@ -4726,28 +4886,28 @@ pop_init_level (int implicit) { if (!constructor_erroneous) error_init ("empty scalar initializer"); - constructor = error_mark_node; + ret.value = error_mark_node; } else if (TREE_CHAIN (constructor_elements) != 0) { error_init ("extra elements in scalar initializer"); - constructor = TREE_VALUE (constructor_elements); + ret.value = TREE_VALUE (constructor_elements); } else - constructor = TREE_VALUE (constructor_elements); + ret.value = TREE_VALUE (constructor_elements); } else { if (constructor_erroneous) - constructor = error_mark_node; + ret.value = error_mark_node; else { - constructor = build_constructor (constructor_type, - nreverse (constructor_elements)); + ret.value = build_constructor (constructor_type, + nreverse (constructor_elements)); if (constructor_constant) - TREE_CONSTANT (constructor) = TREE_INVARIANT (constructor) = 1; + TREE_CONSTANT (ret.value) = TREE_INVARIANT (ret.value) = 1; if (constructor_constant && constructor_simple) - TREE_STATIC (constructor) = 1; + TREE_STATIC (ret.value) = 1; } } @@ -4773,13 +4933,16 @@ pop_init_level (int implicit) constructor_stack = p->next; free (p); - if (constructor == 0) + if (ret.value == 0) { if (constructor_stack == 0) - return error_mark_node; - return NULL_TREE; + { + ret.value = error_mark_node; + return ret; + } + return ret; } - return constructor; + return ret; } /* Common handling for both array range and field name designators. @@ -4796,14 +4959,14 @@ set_designator (int array) if (constructor_type == 0) return 1; - /* If there were errors in this designator list already, bail out silently. */ + /* If there were errors in this designator list already, bail out + silently. */ if (designator_errorneous) return 1; if (!designator_depth) { - if (constructor_range_stack) - abort (); + gcc_assert (!constructor_range_stack); /* Designator list starts at the level of closest explicit braces. */ @@ -4819,19 +4982,20 @@ set_designator (int array) return 1; } - if (TREE_CODE (constructor_type) == RECORD_TYPE - || TREE_CODE (constructor_type) == UNION_TYPE) + switch (TREE_CODE (constructor_type)) { + case RECORD_TYPE: + case UNION_TYPE: subtype = TREE_TYPE (constructor_fields); if (subtype != error_mark_node) subtype = TYPE_MAIN_VARIANT (subtype); - } - else if (TREE_CODE (constructor_type) == ARRAY_TYPE) - { + break; + case ARRAY_TYPE: subtype = TYPE_MAIN_VARIANT (TREE_TYPE (constructor_type)); + break; + default: + gcc_unreachable (); } - else - abort (); subcode = TREE_CODE (subtype); if (array && subcode != ARRAY_TYPE) @@ -4859,7 +5023,7 @@ push_range_stack (tree range_end) { struct constructor_range_stack *p; - p = ggc_alloc (sizeof (struct constructor_range_stack)); + p = GGC_NEW (struct constructor_range_stack); p->prev = constructor_range_stack; p->next = 0; p->fields = constructor_fields; @@ -4884,6 +5048,13 @@ set_init_index (tree first, tree last) designator_errorneous = 1; + if (!INTEGRAL_TYPE_P (TREE_TYPE (first)) + || (last && !INTEGRAL_TYPE_P (TREE_TYPE (last)))) + { + error_init ("array index in initializer not of integer type"); + return; + } + while ((TREE_CODE (first) == NOP_EXPR || TREE_CODE (first) == CONVERT_EXPR || TREE_CODE (first) == NON_LVALUE_EXPR) @@ -5033,7 +5204,7 @@ add_pending_init (tree purpose, tree value) } } - r = ggc_alloc (sizeof (struct init_node)); + r = GGC_NEW (struct init_node); r->purpose = purpose; r->value = value; @@ -5244,18 +5415,17 @@ set_nonincremental_init_from_string (tree str) const char *p, *end; int byte, wchar_bytes, charwidth, bitpos; - if (TREE_CODE (constructor_type) != ARRAY_TYPE) - abort (); + gcc_assert (TREE_CODE (constructor_type) == ARRAY_TYPE); if (TYPE_PRECISION (TREE_TYPE (TREE_TYPE (str))) == TYPE_PRECISION (char_type_node)) wchar_bytes = 1; - else if (TYPE_PRECISION (TREE_TYPE (TREE_TYPE (str))) - == TYPE_PRECISION (wchar_type_node)) - wchar_bytes = TYPE_PRECISION (wchar_type_node) / BITS_PER_UNIT; else - abort (); - + { + gcc_assert (TYPE_PRECISION (TREE_TYPE (TREE_TYPE (str))) + == TYPE_PRECISION (wchar_type_node)); + wchar_bytes = TYPE_PRECISION (wchar_type_node) / BITS_PER_UNIT; + } charwidth = TYPE_PRECISION (char_type_node); type = TREE_TYPE (constructor_type); p = TREE_STRING_POINTER (str); @@ -5308,8 +5478,7 @@ set_nonincremental_init_from_string (tree str) << (bitpos - HOST_BITS_PER_WIDE_INT); } - value = build_int_2 (val[1], val[0]); - TREE_TYPE (value) = type; + value = build_int_cst_wide (type, val[1], val[0]); add_pending_init (purpose, value); } @@ -5376,13 +5545,17 @@ find_init_member (tree field) Otherwise, collect it in a list from which we will make a CONSTRUCTOR. TYPE is the data type that the containing data type wants here. FIELD is the field (a FIELD_DECL) or the index that this element fills. + If VALUE is a string constant, STRICT_STRING is true if it is + unparenthesized or we should not warn here for it being parenthesized. + For other types of VALUE, STRICT_STRING is not used. PENDING if non-nil means output pending elements that belong right after this element. (PENDING is normally 1; it is 0 while outputting pending elements, to avoid recursion.) */ static void -output_init_element (tree value, tree type, tree field, int pending) +output_init_element (tree value, bool strict_string, tree type, tree field, + int pending) { if (type == error_mark_node) { @@ -5393,9 +5566,9 @@ output_init_element (tree value, tree type, tree field, int pending) || (TREE_CODE (TREE_TYPE (value)) == ARRAY_TYPE && !(TREE_CODE (value) == STRING_CST && TREE_CODE (type) == ARRAY_TYPE - && TREE_CODE (TREE_TYPE (type)) == INTEGER_TYPE) + && INTEGRAL_TYPE_P (TREE_TYPE (type))) && !comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (value)), - TYPE_MAIN_VARIANT (type), COMPARE_STRICT))) + TYPE_MAIN_VARIANT (type)))) value = default_conversion (value); if (TREE_CODE (value) == COMPOUND_LITERAL_EXPR @@ -5438,7 +5611,7 @@ output_init_element (tree value, tree type, tree field, int pending) || TREE_CHAIN (field))))) return; - value = digest_init (type, value, require_constant_value); + value = digest_init (type, value, strict_string, require_constant_value); if (value == error_mark_node) { constructor_erroneous = 1; @@ -5558,7 +5731,7 @@ output_pending_init_elements (int all) { if (tree_int_cst_equal (elt->purpose, constructor_unfilled_index)) - output_init_element (elt->value, + output_init_element (elt->value, true, TREE_TYPE (constructor_type), constructor_unfilled_index, 0); else if (tree_int_cst_lt (constructor_unfilled_index, @@ -5612,7 +5785,7 @@ output_pending_init_elements (int all) if (tree_int_cst_equal (elt_bitpos, ctor_unfilled_bitpos)) { constructor_unfilled_fields = elt->purpose; - output_init_element (elt->value, TREE_TYPE (elt->purpose), + output_init_element (elt->value, true, TREE_TYPE (elt->purpose), elt->purpose, 0); } else if (tree_int_cst_lt (ctor_unfilled_bitpos, elt_bitpos)) @@ -5679,10 +5852,11 @@ output_pending_init_elements (int all) it calls output_init_element. */ void -process_init_element (tree value) +process_init_element (struct c_expr value) { - tree orig_value = value; - int string_flag = value != 0 && TREE_CODE (value) == STRING_CST; + tree orig_value = value.value; + int string_flag = orig_value != 0 && TREE_CODE (orig_value) == STRING_CST; + bool strict_string = value.original_code == STRING_CST; designator_depth = 0; designator_errorneous = 0; @@ -5692,16 +5866,16 @@ process_init_element (tree value) if (string_flag && constructor_type && TREE_CODE (constructor_type) == ARRAY_TYPE - && TREE_CODE (TREE_TYPE (constructor_type)) == INTEGER_TYPE + && INTEGRAL_TYPE_P (TREE_TYPE (constructor_type)) && integer_zerop (constructor_unfilled_index)) { - if (constructor_stack->replacement_value) + if (constructor_stack->replacement_value.value) error_init ("excess elements in char array initializer"); constructor_stack->replacement_value = value; return; } - if (constructor_stack->replacement_value != 0) + if (constructor_stack->replacement_value.value != 0) { error_init ("excess elements in struct initializer"); return; @@ -5734,10 +5908,10 @@ process_init_element (tree value) { /* If value is a compound literal and we'll be just using its content, don't put it into a SAVE_EXPR. */ - if (TREE_CODE (value) != COMPOUND_LITERAL_EXPR + if (TREE_CODE (value.value) != COMPOUND_LITERAL_EXPR || !require_constant_value || flag_isoc99) - value = save_expr (value); + value.value = save_expr (value.value); } while (1) @@ -5769,16 +5943,16 @@ process_init_element (tree value) } /* Accept a string constant to initialize a subarray. */ - if (value != 0 + if (value.value != 0 && fieldcode == ARRAY_TYPE - && TREE_CODE (TREE_TYPE (fieldtype)) == INTEGER_TYPE + && INTEGRAL_TYPE_P (TREE_TYPE (fieldtype)) && string_flag) - value = orig_value; + value.value = orig_value; /* Otherwise, if we have come to a subaggregate, and we don't have an element of its type, push into it. */ - else if (value != 0 && !constructor_no_implicit - && value != error_mark_node - && TYPE_MAIN_VARIANT (TREE_TYPE (value)) != fieldtype + else if (value.value != 0 && !constructor_no_implicit + && value.value != error_mark_node + && TYPE_MAIN_VARIANT (TREE_TYPE (value.value)) != fieldtype && (fieldcode == RECORD_TYPE || fieldcode == ARRAY_TYPE || fieldcode == UNION_TYPE)) { @@ -5786,10 +5960,11 @@ process_init_element (tree value) continue; } - if (value) + if (value.value) { push_member_name (constructor_fields); - output_init_element (value, fieldtype, constructor_fields, 1); + output_init_element (value.value, strict_string, + fieldtype, constructor_fields, 1); RESTORE_SPELLING_DEPTH (constructor_depth); } else @@ -5851,20 +6026,21 @@ process_init_element (tree value) __STDC__ anyway (and we've already complained about the member-designator already). */ if (warn_traditional && !in_system_header && !constructor_designated - && !(value && (integer_zerop (value) || real_zerop (value)))) + && !(value.value && (integer_zerop (value.value) + || real_zerop (value.value)))) warning ("traditional C rejects initialization of unions"); /* Accept a string constant to initialize a subarray. */ - if (value != 0 + if (value.value != 0 && fieldcode == ARRAY_TYPE - && TREE_CODE (TREE_TYPE (fieldtype)) == INTEGER_TYPE + && INTEGRAL_TYPE_P (TREE_TYPE (fieldtype)) && string_flag) - value = orig_value; + value.value = orig_value; /* Otherwise, if we have come to a subaggregate, and we don't have an element of its type, push into it. */ - else if (value != 0 && !constructor_no_implicit - && value != error_mark_node - && TYPE_MAIN_VARIANT (TREE_TYPE (value)) != fieldtype + else if (value.value != 0 && !constructor_no_implicit + && value.value != error_mark_node + && TYPE_MAIN_VARIANT (TREE_TYPE (value.value)) != fieldtype && (fieldcode == RECORD_TYPE || fieldcode == ARRAY_TYPE || fieldcode == UNION_TYPE)) { @@ -5872,10 +6048,11 @@ process_init_element (tree value) continue; } - if (value) + if (value.value) { push_member_name (constructor_fields); - output_init_element (value, fieldtype, constructor_fields, 1); + output_init_element (value.value, strict_string, + fieldtype, constructor_fields, 1); RESTORE_SPELLING_DEPTH (constructor_depth); } else @@ -5894,16 +6071,16 @@ process_init_element (tree value) enum tree_code eltcode = TREE_CODE (elttype); /* Accept a string constant to initialize a subarray. */ - if (value != 0 + if (value.value != 0 && eltcode == ARRAY_TYPE - && TREE_CODE (TREE_TYPE (elttype)) == INTEGER_TYPE + && INTEGRAL_TYPE_P (TREE_TYPE (elttype)) && string_flag) - value = orig_value; + value.value = orig_value; /* Otherwise, if we have come to a subaggregate, and we don't have an element of its type, push into it. */ - else if (value != 0 && !constructor_no_implicit - && value != error_mark_node - && TYPE_MAIN_VARIANT (TREE_TYPE (value)) != elttype + else if (value.value != 0 && !constructor_no_implicit + && value.value != error_mark_node + && TYPE_MAIN_VARIANT (TREE_TYPE (value.value)) != elttype && (eltcode == RECORD_TYPE || eltcode == ARRAY_TYPE || eltcode == UNION_TYPE)) { @@ -5920,17 +6097,18 @@ process_init_element (tree value) } /* Now output the actual element. */ - if (value) + if (value.value) { push_array_bounds (tree_low_cst (constructor_index, 0)); - output_init_element (value, elttype, constructor_index, 1); + output_init_element (value.value, strict_string, + elttype, constructor_index, 1); RESTORE_SPELLING_DEPTH (constructor_depth); } constructor_index = size_binop (PLUS_EXPR, constructor_index, bitsize_one_node); - if (! value) + if (!value.value) /* If we are doing the bookkeeping for an element that was directly output as a constructor, we must update constructor_unfilled_index. */ @@ -5949,13 +6127,14 @@ process_init_element (tree value) } /* Now output the actual element. */ - if (value) - output_init_element (value, elttype, constructor_index, 1); + if (value.value) + output_init_element (value.value, strict_string, + elttype, constructor_index, 1); constructor_index = size_binop (PLUS_EXPR, constructor_index, bitsize_one_node); - if (! value) + if (!value.value) /* If we are doing the bookkeeping for an element that was directly output as a constructor, we must update constructor_unfilled_index. */ @@ -5971,8 +6150,9 @@ process_init_element (tree value) } else { - if (value) - output_init_element (value, constructor_type, NULL_TREE, 1); + if (value.value) + output_init_element (value.value, strict_string, + constructor_type, NULL_TREE, 1); constructor_fields = 0; } @@ -5987,16 +6167,14 @@ process_init_element (tree value) constructor_range_stack = 0; while (constructor_stack != range_stack->stack) { - if (!constructor_stack->implicit) - abort (); + gcc_assert (constructor_stack->implicit); process_init_element (pop_init_level (1)); } for (p = range_stack; !p->range_end || tree_int_cst_equal (p->index, p->range_end); p = p->prev) { - if (!constructor_stack->implicit) - abort (); + gcc_assert (constructor_stack->implicit); process_init_element (pop_init_level (1)); } @@ -6035,7 +6213,7 @@ process_init_element (tree value) /* Build a complete asm-statement, whose components are a CV_QUALIFIER (guaranteed to be 'volatile' or null) and ARGS (represented using - an ASM_STMT node). */ + an ASM_EXPR node). */ tree build_asm_stmt (tree cv_qualifier, tree args) { @@ -6048,7 +6226,7 @@ build_asm_stmt (tree cv_qualifier, tree args) some INPUTS, and some CLOBBERS. The latter three may be NULL. SIMPLE indicates whether there was anything at all after the string in the asm expression -- asm("blah") and asm("blah" : ) - are subtly different. We use a ASM_STMT node to represent this. */ + are subtly different. We use a ASM_EXPR node to represent this. */ tree build_asm_expr (tree string, tree outputs, tree inputs, tree clobbers, bool simple) @@ -6099,7 +6277,7 @@ build_asm_expr (tree string, tree outputs, tree inputs, tree clobbers, for (tail = inputs; tail; tail = TREE_CHAIN (tail)) TREE_VALUE (tail) = default_function_array_conversion (TREE_VALUE (tail)); - args = build_stmt (ASM_STMT, string, outputs, inputs, clobbers); + args = build_stmt (ASM_EXPR, string, outputs, inputs, clobbers); /* Simple asm statements are treated as volatile. */ if (simple) @@ -6109,72 +6287,36 @@ build_asm_expr (tree string, tree outputs, tree inputs, tree clobbers, } return args; } + +/* Generate a goto statement to LABEL. */ -/* Expand an ASM statement with operands, handling output operands - that are not variables or INDIRECT_REFS by transforming such - cases into cases that expand_asm_operands can handle. - - Arguments are same as for expand_asm_operands. */ - -void -c_expand_asm_operands (tree string, tree outputs, tree inputs, - tree clobbers, int vol, location_t locus) +tree +c_finish_goto_label (tree label) { - int noutputs = list_length (outputs); - int i; - /* o[I] is the place that output number I should be written. */ - tree *o = alloca (noutputs * sizeof (tree)); - tree tail; + tree decl = lookup_label (label); + if (!decl) + return NULL_TREE; - /* Record the contents of OUTPUTS before it is modified. */ - for (i = 0, tail = outputs; tail; tail = TREE_CHAIN (tail), i++) - { - o[i] = TREE_VALUE (tail); - if (o[i] == error_mark_node) - return; - } - - /* Generate the ASM_OPERANDS insn; store into the TREE_VALUEs of - OUTPUTS some trees for where the values were actually stored. */ - expand_asm_operands (string, outputs, inputs, clobbers, vol, locus); + TREE_USED (decl) = 1; + return add_stmt (build1 (GOTO_EXPR, void_type_node, decl)); +} - /* Copy all the intermediate outputs into the specified outputs. */ - for (i = 0, tail = outputs; tail; tail = TREE_CHAIN (tail), i++) - { - if (o[i] != TREE_VALUE (tail)) - { - expand_expr (build_modify_expr (o[i], NOP_EXPR, TREE_VALUE (tail)), - NULL_RTX, VOIDmode, EXPAND_NORMAL); - free_temp_slots (); +/* Generate a computed goto statement to EXPR. */ - /* Restore the original value so that it's correct the next - time we expand this function. */ - TREE_VALUE (tail) = o[i]; - } - /* Detect modification of read-only values. - (Otherwise done by build_modify_expr.) */ - else - { - tree type = TREE_TYPE (o[i]); - if (TREE_READONLY (o[i]) - || TYPE_READONLY (type) - || ((TREE_CODE (type) == RECORD_TYPE - || TREE_CODE (type) == UNION_TYPE) - && C_TYPE_FIELDS_READONLY (type))) - readonly_error (o[i], "modification by `asm'"); - } - } - - /* Those MODIFY_EXPRs could do autoincrements. */ - emit_queue (); +tree +c_finish_goto_ptr (tree expr) +{ + if (pedantic) + pedwarn ("ISO C forbids `goto *expr;'"); + expr = convert (ptr_type_node, expr); + return add_stmt (build1 (GOTO_EXPR, void_type_node, expr)); } - -/* Expand a C `return' statement. - RETVAL is the expression for what to return, - or a null pointer for `return;' with no value. */ + +/* Generate a C `return' statement. RETVAL is the expression for what + to return, or a null pointer for `return;' with no value. */ tree -c_expand_return (tree retval) +c_finish_return (tree retval) { tree valtype = TREE_TYPE (TREE_TYPE (current_function_decl)); @@ -6241,7 +6383,8 @@ c_expand_return (tree retval) case ADDR_EXPR: inner = TREE_OPERAND (inner, 0); - while (TREE_CODE_CLASS (TREE_CODE (inner)) == 'r') + while (TREE_CODE_CLASS (TREE_CODE (inner)) == 'r' + && TREE_CODE (inner) != INDIRECT_REF) inner = TREE_OPERAND (inner, 0); if (DECL_P (inner) @@ -6258,21 +6401,27 @@ c_expand_return (tree retval) break; } - retval = build (MODIFY_EXPR, TREE_TYPE (res), res, t); + retval = build2 (MODIFY_EXPR, TREE_TYPE (res), res, t); } - return add_stmt (build_return_stmt (retval)); + return add_stmt (build_stmt (RETURN_EXPR, retval)); } struct c_switch { /* The SWITCH_STMT being built. */ tree switch_stmt; + + /* The original type of the testing expression, ie. before the + default conversion is applied. */ + tree orig_type; + /* A splay-tree mapping the low element of a case range to the high element, or NULL_TREE if there is no high element. Used to determine whether or not a new case label duplicates an old case label. We need a tree, rather than simply a hash table, because of the GNU case range extension. */ splay_tree cases; + /* The next node on the stack. */ struct c_switch *next; }; @@ -6283,7 +6432,7 @@ struct c_switch { during the processing of the body of a function, and we never collect at that point. */ -static struct c_switch *switch_stack; +struct c_switch *c_switch_stack; /* Start a C switch statement, testing expression EXP. Return the new SWITCH_STMT. */ @@ -6321,13 +6470,15 @@ c_start_case (tree exp) } /* Add this new SWITCH_STMT to the stack. */ - cs = xmalloc (sizeof (*cs)); - cs->switch_stmt = build_stmt (SWITCH_STMT, exp, NULL_TREE, orig_type); + cs = XNEW (struct c_switch); + cs->switch_stmt = build_stmt ((enum tree_code) SWITCH_STMT, exp, NULL_TREE, + orig_type); + cs->orig_type = orig_type; cs->cases = splay_tree_new (case_compare, NULL, NULL); - cs->next = switch_stack; - switch_stack = cs; + cs->next = c_switch_stack; + c_switch_stack = cs; - return add_stmt (switch_stack->switch_stmt); + return add_stmt (cs->switch_stmt); } /* Process a case label. */ @@ -6337,21 +6488,14 @@ do_case (tree low_value, tree high_value) { tree label = NULL_TREE; - if (switch_stack) + if (c_switch_stack) { - bool switch_was_empty_p = (SWITCH_BODY (switch_stack->switch_stmt) == NULL_TREE); - - label = c_add_case_label (switch_stack->cases, - SWITCH_COND (switch_stack->switch_stmt), + label = c_add_case_label (c_switch_stack->cases, + SWITCH_COND (c_switch_stack->switch_stmt), + c_switch_stack->orig_type, low_value, high_value); if (label == error_mark_node) label = NULL_TREE; - else if (switch_was_empty_p) - { - /* Attach the first case label to the SWITCH_BODY. */ - SWITCH_BODY (switch_stack->switch_stmt) = TREE_CHAIN (switch_stack->switch_stmt); - TREE_CHAIN (switch_stack->switch_stmt) = NULL_TREE; - } } else if (low_value) error ("case label not within a switch statement"); @@ -6364,22 +6508,409 @@ do_case (tree low_value, tree high_value) /* Finish the switch statement. */ void -c_finish_case (void) +c_finish_case (tree body) { - struct c_switch *cs = switch_stack; + struct c_switch *cs = c_switch_stack; + + SWITCH_BODY (cs->switch_stmt) = body; /* Emit warnings as needed. */ c_do_switch_warnings (cs->cases, cs->switch_stmt); - /* Rechain the next statements to the SWITCH_STMT. */ - last_tree = cs->switch_stmt; - /* Pop the stack. */ - switch_stack = switch_stack->next; + c_switch_stack = cs->next; splay_tree_delete (cs->cases); - free (cs); + XDELETE (cs); +} + +/* Emit an if statement. IF_LOCUS is the location of the 'if'. COND, + THEN_BLOCK and ELSE_BLOCK are expressions to be used; ELSE_BLOCK + may be null. NESTED_IF is true if THEN_BLOCK contains another IF + statement, and was not surrounded with parenthesis. */ + +void +c_finish_if_stmt (location_t if_locus, tree cond, tree then_block, + tree else_block, bool nested_if) +{ + tree stmt; + + /* Diagnose an ambiguous else if if-then-else is nested inside if-then. */ + if (warn_parentheses && nested_if && else_block == NULL) + { + tree inner_if = then_block; + + /* We know from the grammar productions that there is an IF nested + within THEN_BLOCK. Due to labels and c99 conditional declarations, + it might not be exactly THEN_BLOCK, but should be the last + non-container statement within. */ + while (1) + switch (TREE_CODE (inner_if)) + { + case COND_EXPR: + goto found; + case BIND_EXPR: + inner_if = BIND_EXPR_BODY (inner_if); + break; + case STATEMENT_LIST: + inner_if = expr_last (then_block); + break; + case TRY_FINALLY_EXPR: + case TRY_CATCH_EXPR: + inner_if = TREE_OPERAND (inner_if, 0); + break; + default: + gcc_unreachable (); + } + found: + + if (COND_EXPR_ELSE (inner_if)) + warning ("%Hsuggest explicit braces to avoid ambiguous `else'", + &if_locus); + } + + /* Diagnose ";" via the special empty statement node that we create. */ + if (extra_warnings) + { + if (TREE_CODE (then_block) == NOP_EXPR && !TREE_TYPE (then_block)) + { + if (!else_block) + warning ("%Hempty body in an if-statement", + EXPR_LOCUS (then_block)); + then_block = alloc_stmt_list (); + } + if (else_block + && TREE_CODE (else_block) == NOP_EXPR + && !TREE_TYPE (else_block)) + { + warning ("%Hempty body in an else-statement", + EXPR_LOCUS (else_block)); + else_block = alloc_stmt_list (); + } + } + + stmt = build3 (COND_EXPR, NULL_TREE, cond, then_block, else_block); + SET_EXPR_LOCATION (stmt, if_locus); + add_stmt (stmt); +} + +/* Emit a general-purpose loop construct. START_LOCUS is the location of + the beginning of the loop. COND is the loop condition. COND_IS_FIRST + is false for DO loops. INCR is the FOR increment expression. BODY is + the statement controlled by the loop. BLAB is the break label. CLAB is + the continue label. Everything is allowed to be NULL. */ + +void +c_finish_loop (location_t start_locus, tree cond, tree incr, tree body, + tree blab, tree clab, bool cond_is_first) +{ + tree entry = NULL, exit = NULL, t; + + /* Detect do { ... } while (0) and don't generate loop construct. */ + if (cond && !cond_is_first && integer_zerop (cond)) + cond = NULL; + if (cond_is_first || cond) + { + tree top = build1 (LABEL_EXPR, void_type_node, NULL_TREE); + + /* If we have an exit condition, then we build an IF with gotos either + out of the loop, or to the top of it. If there's no exit condition, + then we just build a jump back to the top. */ + exit = build_and_jump (&LABEL_EXPR_LABEL (top)); + + if (cond) + { + /* Canonicalize the loop condition to the end. This means + generating a branch to the loop condition. Reuse the + continue label, if possible. */ + if (cond_is_first) + { + if (incr || !clab) + { + entry = build1 (LABEL_EXPR, void_type_node, NULL_TREE); + t = build_and_jump (&LABEL_EXPR_LABEL (entry)); + } + else + t = build1 (GOTO_EXPR, void_type_node, clab); + SET_EXPR_LOCATION (t, start_locus); + add_stmt (t); + } + + t = build_and_jump (&blab); + exit = build3 (COND_EXPR, void_type_node, cond, exit, t); + exit = fold (exit); + if (cond_is_first) + SET_EXPR_LOCATION (exit, start_locus); + else + SET_EXPR_LOCATION (exit, input_location); + } + + add_stmt (top); + } + + if (body) + add_stmt (body); + if (clab) + add_stmt (build1 (LABEL_EXPR, void_type_node, clab)); + if (incr) + add_stmt (incr); + if (entry) + add_stmt (entry); + if (exit) + add_stmt (exit); + if (blab) + add_stmt (build1 (LABEL_EXPR, void_type_node, blab)); +} + +tree +c_finish_bc_stmt (tree *label_p, bool is_break) +{ + tree label = *label_p; + + if (!label) + *label_p = label = create_artificial_label (); + else if (TREE_CODE (label) != LABEL_DECL) + { + if (is_break) + error ("break statement not within loop or switch"); + else + error ("continue statement not within a loop"); + return NULL_TREE; + } + + return add_stmt (build1 (GOTO_EXPR, void_type_node, label)); +} + +/* A helper routine for c_process_expr_stmt and c_finish_stmt_expr. */ + +static void +emit_side_effect_warnings (tree expr) +{ + if (expr == error_mark_node) + ; + else if (!TREE_SIDE_EFFECTS (expr)) + { + if (!VOID_TYPE_P (TREE_TYPE (expr)) && !TREE_NO_WARNING (expr)) + warning ("%Hstatement with no effect", + EXPR_HAS_LOCATION (expr) ? EXPR_LOCUS (expr) : &input_location); + } + else if (warn_unused_value) + warn_if_unused_value (expr, input_location); +} + +/* Process an expression as if it were a complete statement. Emit + diagnostics, but do not call ADD_STMT. */ + +tree +c_process_expr_stmt (tree expr) +{ + if (!expr) + return NULL_TREE; + + /* Do default conversion if safe and possibly important, + in case within ({...}). */ + if ((TREE_CODE (TREE_TYPE (expr)) == ARRAY_TYPE + && (flag_isoc99 || lvalue_p (expr))) + || TREE_CODE (TREE_TYPE (expr)) == FUNCTION_TYPE) + expr = default_conversion (expr); + + if (warn_sequence_point) + verify_sequence_points (expr); + + if (TREE_TYPE (expr) != error_mark_node + && !COMPLETE_OR_VOID_TYPE_P (TREE_TYPE (expr)) + && TREE_CODE (TREE_TYPE (expr)) != ARRAY_TYPE) + error ("expression statement has incomplete type"); + + /* If we're not processing a statement expression, warn about unused values. + Warnings for statement expressions will be emitted later, once we figure + out which is the result. */ + if (!STATEMENT_LIST_STMT_EXPR (cur_stmt_list) + && (extra_warnings || warn_unused_value)) + emit_side_effect_warnings (expr); + + /* If the expression is not of a type to which we cannot assign a line + number, wrap the thing in a no-op NOP_EXPR. */ + if (DECL_P (expr) || TREE_CODE_CLASS (TREE_CODE (expr)) == 'c') + expr = build1 (NOP_EXPR, TREE_TYPE (expr), expr); + + if (EXPR_P (expr)) + SET_EXPR_LOCATION (expr, input_location); + + return expr; +} + +/* Emit an expression as a statement. */ + +tree +c_finish_expr_stmt (tree expr) +{ + if (expr) + return add_stmt (c_process_expr_stmt (expr)); + else + return NULL; +} + +/* Do the opposite and emit a statement as an expression. To begin, + create a new binding level and return it. */ + +tree +c_begin_stmt_expr (void) +{ + tree ret; + + /* We must force a BLOCK for this level so that, if it is not expanded + later, there is a way to turn off the entire subtree of blocks that + are contained in it. */ + keep_next_level (); + ret = c_begin_compound_stmt (true); + + /* Mark the current statement list as belonging to a statement list. */ + STATEMENT_LIST_STMT_EXPR (ret) = 1; + + return ret; } +tree +c_finish_stmt_expr (tree body) +{ + tree last, type, tmp, val; + tree *last_p; + + body = c_end_compound_stmt (body, true); + + /* Locate the last statement in BODY. See c_end_compound_stmt + about always returning a BIND_EXPR. */ + last_p = &BIND_EXPR_BODY (body); + last = BIND_EXPR_BODY (body); + + continue_searching: + if (TREE_CODE (last) == STATEMENT_LIST) + { + tree_stmt_iterator i; + + /* This can happen with degenerate cases like ({ }). No value. */ + if (!TREE_SIDE_EFFECTS (last)) + return body; + + /* If we're supposed to generate side effects warnings, process + all of the statements except the last. */ + if (extra_warnings || warn_unused_value) + { + for (i = tsi_start (last); !tsi_one_before_end_p (i); tsi_next (&i)) + emit_side_effect_warnings (tsi_stmt (i)); + } + else + i = tsi_last (last); + last_p = tsi_stmt_ptr (i); + last = *last_p; + } + + /* If the end of the list is exception related, then the list was split + by a call to push_cleanup. Continue searching. */ + if (TREE_CODE (last) == TRY_FINALLY_EXPR + || TREE_CODE (last) == TRY_CATCH_EXPR) + { + last_p = &TREE_OPERAND (last, 0); + last = *last_p; + goto continue_searching; + } + + /* In the case that the BIND_EXPR is not necessary, return the + expression out from inside it. */ + if (last == error_mark_node + || (last == BIND_EXPR_BODY (body) + && BIND_EXPR_VARS (body) == NULL)) + return last; + + /* Extract the type of said expression. */ + type = TREE_TYPE (last); + + /* If we're not returning a value at all, then the BIND_EXPR that + we already have is a fine expression to return. */ + if (!type || VOID_TYPE_P (type)) + return body; + + /* Now that we've located the expression containing the value, it seems + silly to make voidify_wrapper_expr repeat the process. Create a + temporary of the appropriate type and stick it in a TARGET_EXPR. */ + tmp = create_tmp_var_raw (type, NULL); + + /* Unwrap a no-op NOP_EXPR as added by c_finish_expr_stmt. This avoids + tree_expr_nonnegative_p giving up immediately. */ + val = last; + if (TREE_CODE (val) == NOP_EXPR + && TREE_TYPE (val) == TREE_TYPE (TREE_OPERAND (val, 0))) + val = TREE_OPERAND (val, 0); + + *last_p = build2 (MODIFY_EXPR, void_type_node, tmp, val); + SET_EXPR_LOCUS (*last_p, EXPR_LOCUS (last)); + + return build4 (TARGET_EXPR, type, tmp, body, NULL_TREE, NULL_TREE); +} + +/* Begin and end compound statements. This is as simple as pushing + and popping new statement lists from the tree. */ + +tree +c_begin_compound_stmt (bool do_scope) +{ + tree stmt = push_stmt_list (); + if (do_scope) + push_scope (); + return stmt; +} + +tree +c_end_compound_stmt (tree stmt, bool do_scope) +{ + tree block = NULL; + + if (do_scope) + { + if (c_dialect_objc ()) + objc_clear_super_receiver (); + block = pop_scope (); + } + + stmt = pop_stmt_list (stmt); + stmt = c_build_bind_expr (block, stmt); + + /* If this compound statement is nested immediately inside a statement + expression, then force a BIND_EXPR to be created. Otherwise we'll + do the wrong thing for ({ { 1; } }) or ({ 1; { } }). In particular, + STATEMENT_LISTs merge, and thus we can lose track of what statement + was really last. */ + if (cur_stmt_list + && STATEMENT_LIST_STMT_EXPR (cur_stmt_list) + && TREE_CODE (stmt) != BIND_EXPR) + { + stmt = build3 (BIND_EXPR, void_type_node, NULL, stmt, NULL); + TREE_SIDE_EFFECTS (stmt) = 1; + } + + return stmt; +} + +/* Queue a cleanup. CLEANUP is an expression/statement to be executed + when the current scope is exited. EH_ONLY is true when this is not + meant to apply to normal control flow transfer. */ + +void +push_cleanup (tree ARG_UNUSED (decl), tree cleanup, bool eh_only) +{ + enum tree_code code; + tree stmt, list; + bool stmt_expr; + + code = eh_only ? TRY_CATCH_EXPR : TRY_FINALLY_EXPR; + stmt = build_stmt (code, NULL, cleanup); + add_stmt (stmt); + stmt_expr = STATEMENT_LIST_STMT_EXPR (cur_stmt_list); + list = push_stmt_list (); + TREE_OPERAND (stmt, 0) = list; + STATEMENT_LIST_STMT_EXPR (list) = stmt_expr; +} + /* Build a binary-operation expression without default conversions. CODE is the kind of expression to build. This function differs from `build' in several ways: @@ -6518,6 +7049,11 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1, && (code1 == INTEGER_TYPE || code1 == REAL_TYPE || code1 == COMPLEX_TYPE || code1 == VECTOR_TYPE)) { + if (code0 == COMPLEX_TYPE || code0 == VECTOR_TYPE) + code0 = TREE_CODE (TREE_TYPE (TREE_TYPE (op0))); + if (code1 == COMPLEX_TYPE || code1 == VECTOR_TYPE) + code1 = TREE_CODE (TREE_TYPE (TREE_TYPE (op1))); + if (!(code0 == INTEGER_TYPE && code1 == INTEGER_TYPE)) resultcode = RDIV_EXPR; else @@ -6678,7 +7214,7 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1, Otherwise, the targets must be compatible and both must be object or both incomplete. */ if (comp_target_types (type0, type1, 1)) - result_type = common_type (type0, type1); + result_type = common_pointer_type (type0, type1); else if (VOID_TYPE_P (tt0)) { /* op0 != orig_op0 detects the case of something @@ -6726,7 +7262,7 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1, { if (comp_target_types (type0, type1, 1)) { - result_type = common_type (type0, type1); + result_type = common_pointer_type (type0, type1); if (pedantic && TREE_CODE (TREE_TYPE (type0)) == FUNCTION_TYPE) pedwarn ("ISO C forbids ordered comparisons of pointers to functions"); @@ -6751,7 +7287,7 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1, { if (comp_target_types (type0, type1, 1)) { - result_type = common_type (type0, type1); + result_type = common_pointer_type (type0, type1); if (!COMPLETE_TYPE_P (TREE_TYPE (type0)) != !COMPLETE_TYPE_P (TREE_TYPE (type1))) pedwarn ("comparison of complete and incomplete pointers"); @@ -6995,7 +7531,7 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1, constant expression involving such literals or a conditional expression involving such literals) and it is non-negative. */ - if (c_tree_expr_nonnegative_p (sop)) + if (tree_expr_nonnegative_p (sop)) /* OK */; /* Do not warn if the comparison is an equality operation, the unsigned quantity is an integral constant, and it @@ -7093,21 +7629,25 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1, op0 = convert (result_type, op0); if (TREE_TYPE (op1) != result_type) op1 = convert (result_type, op1); + + /* This can happen if one operand has a vector type, and the other + has a different type. */ + if (TREE_CODE (op0) == ERROR_MARK || TREE_CODE (op1) == ERROR_MARK) + return error_mark_node; } if (build_type == NULL_TREE) build_type = result_type; { - tree result = build (resultcode, build_type, op0, op1); + tree result = build2 (resultcode, build_type, op0, op1); /* Treat expressions in initializers specially as they can't trap. */ - result = initializer_stack ? fold_initializer (result) - : fold (result); + result = require_constant_value ? fold_initializer (result) + : fold (result); if (final_type != 0) result = convert (final_type, result); return result; } } -