X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fc-objc-common.c;h=f3cc9375420e560eca13458adf34cb1e95586af6;hp=9d05a6d97bfcd3499516d450fc5af4af2c366f59;hb=519f394d27f50f6d1d1593db372a7c949f7c95e3;hpb=231bd014bbdc801d1b137f8989b0d0c2541fd0f7 diff --git a/gcc/c-objc-common.c b/gcc/c-objc-common.c index 9d05a6d97bf..f3cc9375420 100644 --- a/gcc/c-objc-common.c +++ b/gcc/c-objc-common.c @@ -1,11 +1,12 @@ /* Some code common to C and ObjC front ends. - Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, + 2009 Free Software Foundation, Inc. This file is part of GCC. GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later +Software Foundation; either version 3, or (at your option) any later version. GCC is distributed in the hope that it will be useful, but WITHOUT ANY @@ -14,9 +15,8 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ +along with GCC; see the file COPYING3. If not see +. */ #include "config.h" #include "system.h" @@ -27,20 +27,21 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "insn-config.h" #include "integrate.h" #include "c-tree.h" +#include "intl.h" #include "c-pretty-print.h" #include "function.h" #include "flags.h" #include "toplev.h" #include "diagnostic.h" #include "tree-inline.h" -#include "varray.h" #include "ggc.h" #include "langhooks.h" #include "tree-mudflap.h" #include "target.h" #include "c-objc-common.h" -static bool c_tree_printer (pretty_printer *, text_info *); +static bool c_tree_printer (pretty_printer *, text_info *, const char *, + int, bool, bool, bool); bool c_missing_noreturn_ok_p (tree decl) @@ -50,97 +51,10 @@ c_missing_noreturn_ok_p (tree decl) return flag_hosted && MAIN_NAME_P (DECL_ASSEMBLER_NAME (decl)); } -/* We want to inline `extern inline' functions even if this would - violate inlining limits. Some glibc and linux constructs depend on - such functions always being inlined when optimizing. */ - -int -c_disregard_inline_limits (tree fn) -{ - if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) != NULL) - return 1; - - return (!flag_really_no_inline && DECL_DECLARED_INLINE_P (fn) - && DECL_EXTERNAL (fn)); -} - -int -c_cannot_inline_tree_fn (tree *fnp) -{ - tree fn = *fnp; - tree t; - bool do_warning = (warn_inline - && DECL_INLINE (fn) - && DECL_DECLARED_INLINE_P (fn) - && !DECL_IN_SYSTEM_HEADER (fn)); - - if (flag_really_no_inline - && lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) == NULL) - { - if (do_warning) - warning ("%Jfunction '%F' can never be inlined because it " - "is suppressed using -fno-inline", fn, fn); - goto cannot_inline; - } - - /* Don't auto-inline anything that might not be bound within - this unit of translation. */ - if (!DECL_DECLARED_INLINE_P (fn) && !targetm.binds_local_p (fn)) - { - if (do_warning) - warning ("%Jfunction '%F' can never be inlined because it might not " - "be bound within this unit of translation", fn, fn); - goto cannot_inline; - } - - if (! function_attribute_inlinable_p (fn)) - { - if (do_warning) - warning ("%Jfunction '%F' can never be inlined because it uses " - "attributes conflicting with inlining", fn, fn); - goto cannot_inline; - } - - /* If a function has pending sizes, we must not defer its - compilation, and we can't inline it as a tree. */ - if (fn == current_function_decl) - { - t = get_pending_sizes (); - put_pending_sizes (t); - - if (t) - { - if (do_warning) - warning ("%Jfunction '%F' can never be inlined because it has " - "pending sizes", fn, fn); - goto cannot_inline; - } - } - - if (! DECL_FILE_SCOPE_P (fn)) - { - /* If a nested function has pending sizes, we may have already - saved them. */ - if (DECL_LANG_SPECIFIC (fn)->pending_sizes) - { - if (do_warning) - warning ("%Jnested function '%F' can never be inlined because it " - "has possibly saved pending sizes", fn, fn); - goto cannot_inline; - } - } - - return 0; - - cannot_inline: - DECL_UNINLINABLE (fn) = 1; - return 1; -} - /* Called from check_global_declarations. */ bool -c_warn_unused_global_decl (tree decl) +c_warn_unused_global_decl (const_tree decl) { if (TREE_CODE (decl) == FUNCTION_DECL && DECL_DECLARED_INLINE_P (decl)) return false; @@ -154,12 +68,6 @@ c_warn_unused_global_decl (tree decl) bool c_objc_common_init (void) { - static const enum tree_code stmt_codes[] = { - c_common_stmt_codes - }; - - INIT_STATEMENT_CODES (stmt_codes); - c_init_decl_processing (); if (c_common_init () == false) @@ -170,16 +78,6 @@ c_objc_common_init (void) want an enhanced ObjC implementation. */ diagnostic_format_decoder (global_dc) = &c_tree_printer; - /* If still unspecified, make it match -std=c99 - (allowing for -pedantic-errors). */ - if (mesg_implicit_function_declaration < 0) - { - if (flag_isoc99) - mesg_implicit_function_declaration = flag_pedantic_errors ? 2 : 1; - else - mesg_implicit_function_declaration = 0; - } - return true; } @@ -187,7 +85,7 @@ c_objc_common_init (void) source-level entity onto BUFFER. The meaning of the format specifiers is as follows: %D: a general decl, - %E: An expression, + %E: an identifier or expression, %F: a function declaration, %T: a type. @@ -196,30 +94,50 @@ c_objc_common_init (void) Please notice when called, the `%' part was already skipped by the diagnostic machinery. */ static bool -c_tree_printer (pretty_printer *pp, text_info *text) +c_tree_printer (pretty_printer *pp, text_info *text, const char *spec, + int precision, bool wide, bool set_locus, bool hash) { tree t = va_arg (*text->args_ptr, tree); tree name; - const char *n = "({anonymous})"; c_pretty_printer *cpp = (c_pretty_printer *) pp; pp->padding = pp_none; - switch (*text->format_spec) + if (precision != 0 || wide || hash) + return false; + + if (set_locus && text->locus) + *text->locus = DECL_SOURCE_LOCATION (t); + + switch (*spec) { case 'D': + if (DECL_DEBUG_EXPR_IS_FROM (t) && DECL_DEBUG_EXPR (t)) + { + t = DECL_DEBUG_EXPR (t); + if (!DECL_P (t)) + { + pp_c_expression (cpp, t); + return true; + } + } + /* FALLTHRU */ + case 'F': if (DECL_NAME (t)) - n = lang_hooks.decl_printable_name (t, 2); + { + pp_identifier (cpp, lang_hooks.decl_printable_name (t, 2)); + return true; + } break; case 'T': gcc_assert (TYPE_P (t)); name = TYPE_NAME (t); - + if (name && TREE_CODE (name) == TYPE_DECL) { if (DECL_NAME (name)) - pp_string (cpp, lang_hooks.decl_printable_name (name, 2)); + pp_identifier (cpp, lang_hooks.decl_printable_name (name, 2)); else pp_type_id (cpp, t); return true; @@ -233,50 +151,22 @@ c_tree_printer (pretty_printer *pp, text_info *text) case 'E': if (TREE_CODE (t) == IDENTIFIER_NODE) - n = IDENTIFIER_POINTER (t); + pp_identifier (cpp, IDENTIFIER_POINTER (t)); else - return false; - break; + pp_expression (cpp, t); + return true; default: return false; } - pp_string (cpp, n); + pp_string (cpp, _("({anonymous})")); return true; } -tree -c_objc_common_truthvalue_conversion (tree expr) -{ - retry: - switch (TREE_CODE (TREE_TYPE (expr))) - { - case ARRAY_TYPE: - expr = default_conversion (expr); - if (TREE_CODE (TREE_TYPE (expr)) != ARRAY_TYPE) - goto retry; - - error ("used array that cannot be converted to pointer where scalar is required"); - return error_mark_node; - - case RECORD_TYPE: - error ("used struct type value where scalar is required"); - return error_mark_node; - - case UNION_TYPE: - error ("used union type value where scalar is required"); - return error_mark_node; - default: - break; - } - - return c_common_truthvalue_conversion (expr); -} - /* In C and ObjC, all decls have "C" linkage. */ bool -has_c_linkage (tree decl ATTRIBUTE_UNUSED) +has_c_linkage (const_tree decl ATTRIBUTE_UNUSED) { return true; } @@ -293,3 +183,17 @@ c_initialize_diagnostics (diagnostic_context *context) /* It is safe to free this object because it was previously XNEW()'d. */ XDELETE (base); } + +int +c_types_compatible_p (tree x, tree y) +{ + return comptypes (TYPE_MAIN_VARIANT (x), TYPE_MAIN_VARIANT (y)); +} + +/* Determine if the type is a vla type for the backend. */ + +bool +c_vla_unspec_p (tree x, tree fn ATTRIBUTE_UNUSED) +{ + return c_vla_type_p (x); +}