#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"
#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 *);
&& 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;
}
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 (t)
{
if (do_warning)
- warning ("%Jfunction '%F' can never be inlined because it has "
+ warning ("%Jfunction %qF can never be inlined because it has "
"pending sizes", fn, fn);
goto cannot_inline;
}
}
- if (! DECL_FILE_SCOPE_P (fn))
+ 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 "
+ warning ("%Jnested function %qF can never be inlined because it "
"has possibly saved pending sizes", fn, fn);
goto cannot_inline;
}
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 fnname = get_file_function_name (method_type);
- tree cs;
-
- start_function (void_list_node,
- build_nt (CALL_EXPR, fnname,
- tree_cons (NULL_TREE, NULL_TREE, void_list_node),
- NULL_TREE),
- NULL_TREE);
- store_parm_decls ();
-
- cs = c_begin_compound_stmt (true);
-
- for (; cdtors; cdtors = TREE_CHAIN (cdtors))
- add_stmt (build_function_call (TREE_VALUE (cdtors), 0));
-
- add_stmt (c_end_compound_stmt (cs, true));
-
- finish_function ();
-}
-
-/* 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.
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)
{
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;
}
{
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));
+}
OSDN Git Service
