diagnostics: fix overload of emit_diagnostic [PR117109]

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>

diff --git a/gcc/diagnostic-format-sarif.cc b/gcc/diagnostic-format-sarif.cc
index f053dec19205ee3f15d4559b11aada5519aba0e9..70832513b6d9778a637820c4dc97349b6b1b5239 100644 (file)
--- a/gcc/diagnostic-format-sarif.cc
+++ b/gcc/diagnostic-format-sarif.cc
@@ -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));

diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc
index 9647e1382dd1d7efbf4d373b65cdf224084f4d4e..41656a607b819ff45dff6e39d9e7f3cce104d4d1 100644 (file)
--- a/gcc/diagnostic.cc
+++ b/gcc/diagnostic.cc
@@ -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 ();
 

diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h
index 7ca9607707d258850063aa254122a2f72f82666b..83d73d2c4b70c0e142c91865e2bc4ba97c6c6646 100644 (file)
--- a/gcc/diagnostic.h
+++ b/gcc/diagnostic.h
@@ -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 *);