procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

diagnostics: fix overload of emit_diagnostic [PR117109]

Browse source 
I accidentally broke "make gcc.pot" in r15-4081 by adding
a member function diagnostic_context::emit_diagnostic with a
gmsgid in a different position to the existing emit_diagnostic
functions, which exgettext's parser can't handle.

Fixed thusly.

gcc/ChangeLog:
	PR bootstrap/117109
	* diagnostic-format-sarif.cc
	(diagnostic_output_format_init_sarif_file): Rename
	diagnostic_context::emit_diagnostic to
	diagnostic_context::emit_diagnostic_with_group.
	* diagnostic.cc (diagnostic_context::emit_diagnostic): Rename
	to...
	(diagnostic_context::emit_diagnostic_with_group): ...this.
	(diagnostic_context::emit_diagnostic_va): Rename to...
	(diagnostic_context::emit_diagnostic_with_group_va): ...this.
	* diagnostic.h (diagnostic_context::emit_diagnostic): Rename to...
	(diagnostic_context::emit_diagnostic_with_group): ...this.
	(diagnostic_context::emit_diagnostic_va): Rename to...
	(diagnostic_context::emit_diagnostic_with_group_va): ...this.

Signed-off-by: David Malcolm <dmalcolm@redhat.com>
This commit is contained in:
David Malcolm 2024-10-14 19:22:46 -04:00
parent 2c08ddd3fd
commit 23e7b70252
3 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gcc/diagnostic-format-sarif.cc
View file

@ -3435,8 +3435,9 @@ diagnostic_output_format_init_sarif_file (diagnostic_context &context,
if (!base_file_name)
{
rich_location richloc (line_maps, UNKNOWN_LOCATION);
context.emit_diagnostic (DK_ERROR, richloc, nullptr, 0,
"unable to determine filename for SARIF output");
context.emit_diagnostic_with_group
(DK_ERROR, richloc, nullptr, 0,
"unable to determine filename for SARIF output");
return;
}
@ -3447,9 +3448,10 @@ diagnostic_output_format_init_sarif_file (diagnostic_context &context,
if (!outf)
{
rich_location richloc (line_maps, UNKNOWN_LOCATION);
context.emit_diagnostic (DK_ERROR, richloc, nullptr, 0,
"unable to open %qs for SARIF output: %m",
filename.get ());
context.emit_diagnostic_with_group
(DK_ERROR, richloc, nullptr, 0,
"unable to open %qs for SARIF output: %m",
filename.get ());
return;
}
diagnostic_output_file output_file (outf, true, std::move (filename));

26
gcc/diagnostic.cc
View file

@ -1160,18 +1160,19 @@ diagnostic_context::warning_enabled_at (location_t loc,
/* Emit a diagnostic within a diagnostic group on this context. */
bool
diagnostic_context::emit_diagnostic (diagnostic_t kind,
rich_location &richloc,
const diagnostic_metadata *metadata,
diagnostic_option_id option_id,
const char *gmsgid, ...)
diagnostic_context::
emit_diagnostic_with_group (diagnostic_t kind,
rich_location &richloc,
const diagnostic_metadata *metadata,
diagnostic_option_id option_id,
const char *gmsgid, ...)
{
begin_group ();
va_list ap;
va_start (ap, gmsgid);
bool ret = emit_diagnostic_va (kind, richloc, metadata, option_id,
gmsgid, &ap);
bool ret = emit_diagnostic_with_group_va (kind, richloc, metadata, option_id,
gmsgid, &ap);
va_end (ap);
end_group ();
@ -1182,11 +1183,12 @@ diagnostic_context::emit_diagnostic (diagnostic_t kind,
/* As above, but taking a va_list *. */
bool
diagnostic_context::emit_diagnostic_va (diagnostic_t kind,
rich_location &richloc,
const diagnostic_metadata *metadata,
diagnostic_option_id option_id,
const char *gmsgid, va_list *ap)
diagnostic_context::
emit_diagnostic_with_group_va (diagnostic_t kind,
rich_location &richloc,
const diagnostic_metadata *metadata,
diagnostic_option_id option_id,
const char *gmsgid, va_list *ap)
{
begin_group ();

20
gcc/diagnostic.h
View file

@ -505,17 +505,17 @@ public:
return m_option_classifier.option_unspecified_p (option_id);
}
bool emit_diagnostic (diagnostic_t kind,
rich_location &richloc,
const diagnostic_metadata *metadata,
diagnostic_option_id option_id,
const char *gmsgid, ...)
bool emit_diagnostic_with_group (diagnostic_t kind,
rich_location &richloc,
const diagnostic_metadata *metadata,
diagnostic_option_id option_id,
const char *gmsgid, ...)
ATTRIBUTE_GCC_DIAG(6,7);
bool emit_diagnostic_va (diagnostic_t kind,
rich_location &richloc,
const diagnostic_metadata *metadata,
diagnostic_option_id option_id,
const char *gmsgid, va_list *ap)
bool emit_diagnostic_with_group_va (diagnostic_t kind,
rich_location &richloc,
const diagnostic_metadata *metadata,
diagnostic_option_id option_id,
const char *gmsgid, va_list *ap)
ATTRIBUTE_GCC_DIAG(6,0);
bool report_diagnostic (diagnostic_info *);