/* Language-independent diagnostic subroutines for the GNU Compiler Collection
- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
#include "diagnostic.h"
#include "langhooks.h"
#include "langhooks-def.h"
+#include "opts.h"
/* Prototypes. */
diagnostic_info *);
static void error_recursion (diagnostic_context *) ATTRIBUTE_NORETURN;
-static bool text_specifies_location (text_info *, location_t *);
static bool diagnostic_count_diagnostic (diagnostic_context *,
diagnostic_info *);
static void diagnostic_action_after_output (diagnostic_context *,
/* A diagnostic_context surrogate for stderr. */
static diagnostic_context global_diagnostic_context;
diagnostic_context *global_dc = &global_diagnostic_context;
-
-/* Boilerplate text used in two locations. */
-#define bug_report_request \
-"Please submit a full bug report,\n\
-with preprocessed source if appropriate.\n\
-See %s for instructions.\n"
-
\f
/* Return a malloc'd string containing MSG formatted a la printf. The
caller is responsible for freeing the memory. */
context->printer->prefixing_rule = DIAGNOSTICS_SHOW_PREFIX_ONCE;
memset (context->diagnostic_count, 0, sizeof context->diagnostic_count);
- context->warnings_are_errors_message = warnings_are_errors;
+ context->issue_warnings_are_errors_message = true;
+ context->warning_as_error_requested = false;
context->abort_on_error = false;
context->internal_error = NULL;
diagnostic_starter (context) = default_diagnostic_starter;
context->last_module = 0;
context->last_function = NULL;
context->lock = 0;
- context->x_data = NULL;
-}
-
-/* Returns true if the next format specifier in TEXT is a format specifier
- for a location_t. If so, update the object pointed by LOCUS to reflect
- the specified location in *TEXT->args_ptr. */
-static bool
-text_specifies_location (text_info *text, location_t *locus)
-{
- const char *p;
- /* Skip any leading text. */
- for (p = text->format_spec; *p && *p != '%'; ++p)
- ;
-
- /* Extract the location information if any. */
- if (p[0] == '%' && p[1] == 'H')
- {
- *locus = *va_arg (*text->args_ptr, location_t *);
- text->format_spec = p + 2;
- return true;
- }
- else if (p[0] == '%' && p[1] == 'J')
- {
- tree t = va_arg (*text->args_ptr, tree);
- *locus = DECL_SOURCE_LOCATION (t);
- text->format_spec = p + 2;
- return true;
- }
-
- return false;
}
void
diagnostic->message.err_no = errno;
diagnostic->message.args_ptr = args;
diagnostic->message.format_spec = _(msgid);
- /* If the diagnostic message doesn't specify a location,
- use LOCATION. */
- if (!text_specifies_location (&diagnostic->message, &diagnostic->location))
- diagnostic->location = location;
+ diagnostic->location = location;
diagnostic->kind = kind;
+ diagnostic->option_index = 0;
}
/* Return a malloc'd string describing a location. The caller is
#undef DEFINE_DIAGNOSTIC_KIND
"must-not-happen"
};
+ const char *text = _(diagnostic_kind_text[diagnostic->kind]);
expanded_location s = expand_location (diagnostic->location);
- if (diagnostic->kind >= DK_LAST_DIAGNOSTIC_KIND)
- abort();
-
- return s.file
- ? build_message_string ("%s:%d: %s",
- s.file, s.line,
- _(diagnostic_kind_text[diagnostic->kind]))
- : build_message_string ("%s: %s", progname,
- _(diagnostic_kind_text[diagnostic->kind]));
+ gcc_assert (diagnostic->kind < DK_LAST_DIAGNOSTIC_KIND);
+
+ return
+ (s.file == NULL
+ ? build_message_string ("%s: %s", progname, text)
+#ifdef USE_MAPPED_LOCATION
+ : flag_show_column && s.column != 0
+ ? build_message_string ("%s:%d:%d: %s", s.file, s.line, s.column, text)
+#endif
+ : build_message_string ("%s:%d: %s", s.file, s.line, text));
}
/* Count a diagnostic. Return true if the message should be printed. */
switch (kind)
{
default:
- abort();
- break;
+ gcc_unreachable ();
case DK_ICE:
#ifndef ENABLE_CHECKING
if (!diagnostic_report_warnings_p ())
return false;
- if (!warnings_are_errors)
+ if (!context->warning_as_error_requested)
{
++diagnostic_kind_count (context, DK_WARNING);
break;
}
-
- if (context->warnings_are_errors_message)
+ else if (context->issue_warnings_are_errors_message)
{
pp_verbatim (context->printer,
"%s: warnings being treated as errors\n", progname);
- context->warnings_are_errors_message = false;
+ context->issue_warnings_are_errors_message = false;
}
/* And fall through. */
if (context->abort_on_error)
real_abort ();
- fnotice (stderr, bug_report_request, bug_report_url);
+ fnotice (stderr, "Please submit a full bug report,\n"
+ "with preprocessed source if appropriate.\n"
+ "See %s for instructions.\n", bug_report_url);
exit (FATAL_EXIT_CODE);
case DK_FATAL:
exit (FATAL_EXIT_CODE);
default:
- real_abort ();
+ gcc_unreachable ();
}
}
/* Prints out, if necessary, the name of the current function
- that caused an error. Called from all error and warning functions.
- We ignore the FILE parameter, as it cannot be relied upon. */
-
+ that caused an error. Called from all error and warning functions. */
void
diagnostic_report_current_function (diagnostic_context *context)
{
static void
default_diagnostic_finalizer (diagnostic_context *context,
- diagnostic_info *diagnostic __attribute__((unused)))
+ diagnostic_info *diagnostic ATTRIBUTE_UNUSED)
{
pp_destroy_prefix (context->printer);
}
diagnostic_report_diagnostic (diagnostic_context *context,
diagnostic_info *diagnostic)
{
- if (context->lock++ && diagnostic->kind < DK_SORRY)
- error_recursion (context);
+ if (context->lock > 0)
+ {
+ /* If we're reporting an ICE in the middle of some other error,
+ try to flush out the previous error, then let this one
+ through. Don't do this more than once. */
+ if (diagnostic->kind == DK_ICE && context->lock == 1)
+ pp_flush (context->printer);
+ else
+ error_recursion (context);
+ }
+
+ context->lock++;
if (diagnostic_count_diagnostic (context, diagnostic))
{
+ if (diagnostics_show_options && diagnostic->option_index)
+ diagnostic->message.format_spec
+ = ACONCAT ((diagnostic->message.format_spec,
+ " [", cl_options[diagnostic->option_index].opt_text, "]", NULL));
+
+ pp_prepare_to_format (context->printer, &diagnostic->message,
+ &diagnostic->location);
(*diagnostic_starter (context)) (context, diagnostic);
pp_format_text (context->printer, &diagnostic->message);
(*diagnostic_finalizer (context)) (context, diagnostic);
/* First skip any "../" in each filename. This allows us to give a proper
reference to a file in a subdirectory. */
- while (p[0] == '.' && p[1] == '.'
- && (p[2] == DIR_SEPARATOR
-#ifdef DIR_SEPARATOR_2
- || p[2] == DIR_SEPARATOR_2
-#endif
- ))
+ while (p[0] == '.' && p[1] == '.' && IS_DIR_SEPARATOR (p[2]))
p += 3;
- while (q[0] == '.' && q[1] == '.'
- && (q[2] == DIR_SEPARATOR
-#ifdef DIR_SEPARATOR_2
- || p[2] == DIR_SEPARATOR_2
-#endif
- ))
+ while (q[0] == '.' && q[1] == '.' && IS_DIR_SEPARATOR (q[2]))
q += 3;
/* Now skip any parts the two filenames have in common. */
p++, q++;
/* Now go backwards until the previous directory separator. */
- while (p > name && p[-1] != DIR_SEPARATOR
-#ifdef DIR_SEPARATOR_2
- && p[-1] != DIR_SEPARATOR_2
-#endif
- )
+ while (p > name && !IS_DIR_SEPARATOR (p[-1]))
p--;
return p;
/* A warning. Use this for code which is correct according to the
relevant language specification but is likely to be buggy anyway. */
void
-warning (const char *msgid, ...)
+warning (int opt, const char *msgid, ...)
+{
+ diagnostic_info diagnostic;
+ va_list ap;
+
+ if (opt && ! option_enabled (opt))
+ return;
+
+ va_start (ap, msgid);
+ diagnostic_set_info (&diagnostic, msgid, &ap, input_location, DK_WARNING);
+ diagnostic.option_index = opt;
+
+ report_diagnostic (&diagnostic);
+ va_end (ap);
+}
+
+void
+warning0 (const char *msgid, ...)
{
diagnostic_info diagnostic;
va_list ap;
report_diagnostic (&diagnostic);
va_end (ap);
- /* NOTREACHED */
- real_abort ();
+ gcc_unreachable ();
}
/* An internal consistency check has failed. We make no attempt to
report_diagnostic (&diagnostic);
va_end (ap);
- /* NOTREACHED */
- real_abort ();
+ gcc_unreachable ();
}
\f
/* Special case error functions. Most are implemented in terms of the
static void
error_recursion (diagnostic_context *context)
{
+ diagnostic_info diagnostic;
+
if (context->lock < 3)
pp_flush (context->printer);
fnotice (stderr,
"Internal compiler error: Error reporting routines re-entered.\n");
- fnotice (stderr, bug_report_request, bug_report_url);
- exit (FATAL_EXIT_CODE);
+
+ /* Call diagnostic_action_after_output to get the "please submit a bug
+ report" message. It only looks at the kind field of diagnostic_info. */
+ diagnostic.kind = DK_ICE;
+ diagnostic_action_after_output (context, &diagnostic);
+
+ /* Do not use gcc_unreachable here; that goes through internal_error
+ and therefore would cause infinite recursion. */
+ real_abort ();
}
/* Report an internal compiler error in a friendly manner. This is
OSDN Git Service
