X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fc-objc-common.c;h=4b09c3e40d861e5bf92785cf45de85c14a8872d5;hb=6a9bcd3e9b7a532cebce25af24999b7e3d8da123;hp=293884af7f6a6dc04e9cd1765b108e4110700689;hpb=b553055975ca3366d1c5aba3744b461e513bbee2;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/c-objc-common.c b/gcc/c-objc-common.c index 293884af7f6..4b09c3e40d8 100644 --- a/gcc/c-objc-common.c +++ b/gcc/c-objc-common.c @@ -1,5 +1,5 @@ /* 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 Free Software Foundation, Inc. This file is part of GCC. @@ -27,6 +27,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "insn-config.h" #include "integrate.h" #include "c-tree.h" +#include "c-pretty-print.h" #include "function.h" #include "flags.h" #include "toplev.h" @@ -37,7 +38,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "langhooks.h" #include "tree-mudflap.h" #include "target.h" -#include "cgraph.h" +#include "c-objc-common.h" static bool c_tree_printer (pretty_printer *, text_info *); @@ -67,7 +68,6 @@ 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) @@ -77,7 +77,7 @@ c_cannot_inline_tree_fn (tree *fnp) && lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) == NULL) { if (do_warning) - warning ("%Jfunction '%F' can never be inlined because it " + warning ("%Jfunction %qF can never be inlined because it " "is suppressed using -fno-inline", fn, fn); goto cannot_inline; } @@ -87,48 +87,19 @@ c_cannot_inline_tree_fn (tree *fnp) 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 " + warning ("%Jfunction %qF 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 (!function_attribute_inlinable_p (fn)) { if (do_warning) - warning ("%Jfunction '%F' can never be inlined because it uses " + warning ("%Jfunction %qF 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: @@ -182,55 +153,11 @@ c_objc_common_init (void) return true; } -/* Synthesize a function which calls all the global ctors or global dtors - in this file. */ - -static void -build_cdtor (int method_type, tree cdtors) -{ - tree body; - - body = push_stmt_list (); - - for (; cdtors; cdtors = TREE_CHAIN (cdtors)) - add_stmt (build_function_call (TREE_VALUE (cdtors), NULL_TREE)); - - body = pop_stmt_list (body); - - cgraph_build_static_cdtor (method_type, body); -} - -/* Called at end of parsing, but before end-of-file processing. */ - -void -c_objc_common_finish_file (void) -{ - if (pch_file) - c_common_write_pch (); - - if (static_ctors) - { - build_cdtor ('I', static_ctors); - static_ctors = 0; - } - if (static_dtors) - { - build_cdtor ('D', static_dtors); - static_dtors = 0; - } - - cgraph_finalize_compilation_unit (); - cgraph_optimize (); - - if (flag_mudflap) - mudflap_finish_file (); -} - /* Called during diagnostic message formatting process to print a 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. @@ -242,74 +169,89 @@ static bool c_tree_printer (pretty_printer *pp, text_info *text) { 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) { case 'D': + if (DECL_DEBUG_EXPR (t) && DECL_DEBUG_EXPR_IS_FROM (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); break; case 'T': - if (TYPE_P (t)) - t = TYPE_NAME (t); - if (t && TREE_CODE (t) == TYPE_DECL) + gcc_assert (TYPE_P (t)); + name = TYPE_NAME (t); + + if (name && TREE_CODE (name) == TYPE_DECL) { - if (DECL_NAME (t)) - n = lang_hooks.decl_printable_name (t, 2); + if (DECL_NAME (name)) + pp_string (cpp, lang_hooks.decl_printable_name (name, 2)); + else + pp_type_id (cpp, t); + return true; + } + else + { + pp_type_id (cpp, t); + return true; } - else if (t) - n = IDENTIFIER_POINTER (t); break; case 'E': if (TREE_CODE (t) == IDENTIFIER_NODE) n = IDENTIFIER_POINTER (t); else - return false; + { + pp_expression (cpp, t); + return true; + } break; default: return false; } - pp_string (pp, n); + pp_string (cpp, n); 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) { return true; } + +void +c_initialize_diagnostics (diagnostic_context *context) +{ + pretty_printer *base = context->printer; + c_pretty_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; + + /* 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)); +}