X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fc-objc-common.c;h=9351cd5a53996c044b703b65a79b8f029be32be9;hb=a87eb01159126249fcdbde78b65c25b8b16b9c89;hp=facaeafd82e985672212ca27a8a792c04e91c69c;hpb=32d33ab2b6aa8f79eaa31808de566d58d1a85b55;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/c-objc-common.c b/gcc/c-objc-common.c index facaeafd82e..9351cd5a539 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, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, + 2009, 2010 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,30 +15,20 @@ 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, 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301, USA. */ +along with GCC; see the file COPYING3. If not see +. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" #include "tree.h" -#include "rtl.h" -#include "insn-config.h" -#include "integrate.h" #include "c-tree.h" -#include "c-pretty-print.h" -#include "function.h" +#include "intl.h" +#include "c-family/c-pretty-print.h" #include "flags.h" -#include "toplev.h" #include "diagnostic.h" -#include "tree-inline.h" -#include "varray.h" -#include "ggc.h" +#include "tree-pretty-print.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 *, const char *, @@ -51,67 +42,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; - 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 (OPT_Winline, "function %q+F can never be inlined because it " - "is suppressed using -fno-inline", 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 (OPT_Winline, "function %q+F can never be inlined because it " - "might not be bound within this unit of translation", fn); - goto cannot_inline; - } - - if (!function_attribute_inlinable_p (fn)) - { - if (do_warning) - warning (OPT_Winline, "function %q+F can never be inlined because it " - "uses attributes conflicting with inlining", 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; @@ -135,16 +69,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; } @@ -155,26 +79,36 @@ c_objc_common_init (void) %E: an identifier or expression, %F: a function declaration, %T: a type. + %V: a list of type qualifiers from a tree. + %v: an explicit list of type qualifiers + %#v: an explicit list of type qualifiers of a function type. - These format specifiers form a subset of the format specifiers set used - by the C++ front-end. Please notice when called, the `%' part was already skipped by the diagnostic machinery. */ static bool 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 t = NULL_TREE; tree name; - const char *n = "({anonymous})"; c_pretty_printer *cpp = (c_pretty_printer *) pp; pp->padding = pp_none; - if (precision != 0 || wide || hash) + if (precision != 0 || wide) return false; - if (set_locus && text->locus) - *text->locus = DECL_SOURCE_LOCATION (t); + if (*spec == 'K') + { + percent_K_format (text); + return true; + } + + if (*spec != 'v') + { + t = va_arg (*text->args_ptr, tree); + if (set_locus && text->locus) + *text->locus = DECL_SOURCE_LOCATION (t); + } switch (*spec) { @@ -192,17 +126,20 @@ c_tree_printer (pretty_printer *pp, text_info *text, const char *spec, 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; @@ -216,25 +153,30 @@ c_tree_printer (pretty_printer *pp, text_info *text, const char *spec, case 'E': if (TREE_CODE (t) == IDENTIFIER_NODE) - n = IDENTIFIER_POINTER (t); + pp_identifier (cpp, IDENTIFIER_POINTER (t)); else - { - pp_expression (cpp, t); - return true; - } - break; + pp_expression (cpp, t); + return true; + + case 'V': + pp_c_type_qualifier_list (cpp, t); + return true; + + case 'v': + pp_c_cv_qualifiers (cpp, va_arg (*text->args_ptr, int), hash); + return true; default: return false; } - pp_string (cpp, n); + pp_string (cpp, _("({anonymous})")); return true; } /* 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; } @@ -242,8 +184,13 @@ has_c_linkage (tree decl ATTRIBUTE_UNUSED) void c_initialize_diagnostics (diagnostic_context *context) { - pretty_printer *base = context->printer; - c_pretty_printer *pp = XNEW (c_pretty_printer); + pretty_printer *base; + c_pretty_printer *pp; + + c_common_initialize_diagnostics (context); + + base = context->printer; + pp = XNEW (c_pretty_printer); memcpy (pp_base (pp), base, sizeof (pretty_printer)); pp_c_pretty_printer_init (pp); context->printer = (pretty_printer *) pp; @@ -255,7 +202,7 @@ c_initialize_diagnostics (diagnostic_context *context) int c_types_compatible_p (tree x, tree y) { - return comptypes (TYPE_MAIN_VARIANT (x), TYPE_MAIN_VARIANT (y)); + return comptypes (TYPE_MAIN_VARIANT (x), TYPE_MAIN_VARIANT (y)); } /* Determine if the type is a vla type for the backend. */