gcc/ChangeLog:
* diagnostic-core.h (emit_diagnostic): New overload.
(emit_diagnostic_valist): New overload.
* diagnostic.cc (emit_diagnostic): New overload.
(emit_diagnostic_valist): New overload.
Signed-off-by: David Malcolm <dmalc...@redhat.com>
---
gcc/diagnostic-core.h | 7 +++++++
gcc/diagnostic.cc | 25 +++++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/gcc/diagnostic-core.h b/gcc/diagnostic-core.h
index 286954ac2f8..53f39a110e4 100644
--- a/gcc/diagnostic-core.h
+++ b/gcc/diagnostic-core.h
@@ -114,8 +114,15 @@ extern bool emit_diagnostic (diagnostic_t, location_t, int,
const char *, ...) ATTRIBUTE_GCC_DIAG(4,5);
extern bool emit_diagnostic (diagnostic_t, rich_location *, int,
const char *, ...) ATTRIBUTE_GCC_DIAG(4,5);
+extern bool emit_diagnostic (diagnostic_t, rich_location *,
+ const diagnostic_metadata *, int,
+ const char *, ...) ATTRIBUTE_GCC_DIAG(5,6);
extern bool emit_diagnostic_valist (diagnostic_t, location_t, int, const char
*,
va_list *) ATTRIBUTE_GCC_DIAG (4,0);
+extern bool emit_diagnostic_valist (diagnostic_t, rich_location *,
+ const diagnostic_metadata *, int,
+ const char *, va_list *)
+ ATTRIBUTE_GCC_DIAG (5,0);
extern bool seen_error (void);
#ifdef BUFSIZ
diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc
index 22f7b0b6d6e..8099f585bfb 100644
--- a/gcc/diagnostic.cc
+++ b/gcc/diagnostic.cc
@@ -1769,6 +1769,21 @@ emit_diagnostic (diagnostic_t kind, rich_location
*richloc, int opt,
return ret;
}
+/* As above, but with optional metadata. */
+
+bool
+emit_diagnostic (diagnostic_t kind, rich_location *richloc,
+ const diagnostic_metadata *metadata, int opt,
+ const char *gmsgid, ...)
+{
+ auto_diagnostic_group d;
+ va_list ap;
+ va_start (ap, gmsgid);
+ bool ret = diagnostic_impl (richloc, metadata, opt, gmsgid, &ap, kind);
+ va_end (ap);
+ return ret;
+}
+
/* Wrapper around diagnostic_impl taking a va_list parameter. */
bool
@@ -1779,6 +1794,16 @@ emit_diagnostic_valist (diagnostic_t kind, location_t
location, int opt,
return diagnostic_impl (&richloc, NULL, opt, gmsgid, ap, kind);
}
+/* As above, but with optional metadata. */
+
+bool
+emit_diagnostic_valist (diagnostic_t kind, rich_location *richloc,
+ const diagnostic_metadata *metadata, int opt,
+ const char *gmsgid, va_list *ap)
+{
+ return diagnostic_impl (richloc, metadata, opt, gmsgid, ap, kind);
+}
+
/* An informative note at LOCATION. Use this for additional details on an
error
message. */
void
--
2.26.3
