diagnostics: use diagnostic.h in fewer places

No functional change intended.

gcc/ChangeLog:
	* diagnostics/buffering.cc: Drop include of "diagnostic.h".
	* diagnostics/buffering.h: Likewise.
	* diagnostics/context.h (diagnostics::metadata): Add forward decl.
	* diagnostics/html-sink.cc: Drop include of "diagnostic.h".
	* diagnostics/lazy-paths.cc: Likewise.
	* diagnostics/macro-unwinding.cc: Likewise.
	* diagnostics/macro-unwinding.h (diagnostics:diagnostic_info): Add
	forward decl.
	* diagnostics/option-classifier.h: Include
	"diagnostics/option-id.h" and "diagnostics/kinds.h".
	(diagnostics:diagnostic_info): Add forward decl.
	* diagnostics/output-spec.cc: Drop include of "diagnostic.h".
	* diagnostics/paths-output.cc: Likewise.
	* diagnostics/paths.cc: Likewise.
	* diagnostics/sarif-sink.cc: Likewise.
	* diagnostics/selftest-context.cc: Likewise.
	* diagnostics/selftest-paths.cc: Likewise.
	* diagnostics/source-printing-options.h: Include
	"rich-location.h".
	* diagnostics/text-sink.cc: Drop include of "diagnostic.h".

Signed-off-by: David Malcolm <dmalcolm@redhat.com>

diff --git a/gcc/diagnostics/buffering.cc b/gcc/diagnostics/buffering.cc
index b09d1c2cc1570899cd3ae19d0dea67ca6ce15d91..019c9927c6d2ae005f8a1701adfdfddcdafcbfe1 100644 (file)
--- a/gcc/diagnostics/buffering.cc
+++ b/gcc/diagnostics/buffering.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/buffering.h"
 #include "diagnostics/sink.h"
 #include "diagnostics/dumping.h"

diff --git a/gcc/diagnostics/buffering.h b/gcc/diagnostics/buffering.h
index 9b86fee90fe853265ff69ce4beffd575cc14ca84..24a57e4a5f9a62fa5fad4796bfa251c41e85d8b5 100644 (file)
--- a/gcc/diagnostics/buffering.h
+++ b/gcc/diagnostics/buffering.h
@@ -21,7 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_DIAGNOSTICS_BUFFERING_H
 #define GCC_DIAGNOSTICS_BUFFERING_H
 
-#include "diagnostic.h"
+#include "diagnostics/counters.h"
 
 namespace diagnostics {
 

diff --git a/gcc/diagnostics/context.h b/gcc/diagnostics/context.h
index 9464f6adb6c909a4a0f0b78684e822fcdcb94f90..7d7c87250be252f13c3c007d16828ac0df6b3f0a 100644 (file)
--- a/gcc/diagnostics/context.h
+++ b/gcc/diagnostics/context.h
@@ -47,6 +47,7 @@ namespace diagnostics {
   class diagram;
   class sink;
     class text_sink;
+  class metadata;
 
   class source_effect_info;
 

diff --git a/gcc/diagnostics/html-sink.cc b/gcc/diagnostics/html-sink.cc
index 64dcefeedaad03aa0f6c950a6847c16990fcd77b..d3fb107e61454ca4a456b202f396ab9efa67dbf3 100644 (file)
--- a/gcc/diagnostics/html-sink.cc
+++ b/gcc/diagnostics/html-sink.cc
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/metadata.h"
 #include "diagnostics/sink.h"
 #include "diagnostics/html-sink.h"

diff --git a/gcc/diagnostics/lazy-paths.cc b/gcc/diagnostics/lazy-paths.cc
index f246eea94205d155e66fa9c46fd4ca55ee6ec7e6..d25f8fb378148b7f645f1ac7f3250115f6b0616b 100644 (file)
--- a/gcc/diagnostics/lazy-paths.cc
+++ b/gcc/diagnostics/lazy-paths.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/lazy-paths.h"
 #include "selftest.h"
 #include "diagnostics/selftest-context.h"

diff --git a/gcc/diagnostics/macro-unwinding.cc b/gcc/diagnostics/macro-unwinding.cc
index 66bad1c32a75bcddded14e75adf63856bf681669..fb4ee65f42448392d6ec6f01ad39241f7fd87724 100644 (file)
--- a/gcc/diagnostics/macro-unwinding.cc
+++ b/gcc/diagnostics/macro-unwinding.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
-#include "diagnostic.h"
 #include "diagnostics/macro-unwinding.h"
 #include "diagnostics/text-sink.h"
 #include "intl.h"

diff --git a/gcc/diagnostics/macro-unwinding.h b/gcc/diagnostics/macro-unwinding.h
index 1f28d584c2586360338fa5aad646ef94246fe540..1df8715e2bd95bc813c956751a1c3e65d8519708 100644 (file)
--- a/gcc/diagnostics/macro-unwinding.h
+++ b/gcc/diagnostics/macro-unwinding.h
@@ -22,6 +22,8 @@ along with GCC; see the file COPYING3.  If not see
 
 namespace diagnostics {
 
+struct diagnostic_info;
+
 extern void virt_loc_aware_text_finalizer (text_sink &,
                                           const diagnostic_info *);
 

diff --git a/gcc/diagnostics/option-classifier.h b/gcc/diagnostics/option-classifier.h
index 3b16c740b7eaab386a6ddaedd7c39c3024b0f4d6..9457fe8d133562e9e729be2f7bf8be2d24e90e8c 100644 (file)
--- a/gcc/diagnostics/option-classifier.h
+++ b/gcc/diagnostics/option-classifier.h
@@ -20,10 +20,14 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_DIAGNOSTICS_OPTION_CLASSIFIER_H
 #define GCC_DIAGNOSTICS_OPTION_CLASSIFIER_H
 
+#include "diagnostics/option-id.h"
+#include "diagnostics/kinds.h"
+
 namespace diagnostics {
 
 /*  Forward declarations.  */
 class context;
+struct diagnostic_info;
 
 /* A stack of sets of classifications: each entry in the stack is
    a mapping from option index to diagnostic severity that can be changed

diff --git a/gcc/diagnostics/output-spec.cc b/gcc/diagnostics/output-spec.cc
index e25d25a9a9a46af225dc1a69fa1d6a36e2d36d4c..8ec638a83bf1bfb369aacea0bd375d2313d3d4fe 100644 (file)
--- a/gcc/diagnostics/output-spec.cc
+++ b/gcc/diagnostics/output-spec.cc
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "version.h"
 #include "intl.h"
-#include "diagnostic.h"
 #include "diagnostics/color.h"
 #include "diagnostics/sink.h"
 #include "diagnostics/html-sink.h"

diff --git a/gcc/diagnostics/paths-output.cc b/gcc/diagnostics/paths-output.cc
index a3ac9a0519ac9eaed8c0fd1c61fcd70bec237885..2c97bf40679e586346281efa5543830a587a6390 100644 (file)
--- a/gcc/diagnostics/paths-output.cc
+++ b/gcc/diagnostics/paths-output.cc
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/macro-unwinding.h"
 #include "intl.h"
 #include "diagnostics/paths.h"

diff --git a/gcc/diagnostics/paths.cc b/gcc/diagnostics/paths.cc
index bc769c45766e55ffa7997b1c42ca581280329dd4..824b810cb3bf517ffd6788e179cc35a964a8a372 100644 (file)
--- a/gcc/diagnostics/paths.cc
+++ b/gcc/diagnostics/paths.cc
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/paths.h"
 #include "diagnostics/state-graphs.h"
 

diff --git a/gcc/diagnostics/sarif-sink.cc b/gcc/diagnostics/sarif-sink.cc
index bc121388bb87d2810838c7556b67239603152d3a..144040e9dfb10f3d3fd0f22e9e09760ad582c0ef 100644 (file)
--- a/gcc/diagnostics/sarif-sink.cc
+++ b/gcc/diagnostics/sarif-sink.cc
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/metadata.h"
 #include "diagnostics/digraphs.h"
 #include "diagnostics/state-graphs.h"

diff --git a/gcc/diagnostics/selftest-context.cc b/gcc/diagnostics/selftest-context.cc
index 2b6dd0b331fb4a192f03e8c17d17e7e7545ccb85..2eced4d3cd85db2d623447313b25dbabb1e44be8 100644 (file)
--- a/gcc/diagnostics/selftest-context.cc
+++ b/gcc/diagnostics/selftest-context.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/sink.h"
 #include "selftest.h"
 #include "diagnostics/selftest-context.h"

diff --git a/gcc/diagnostics/selftest-paths.cc b/gcc/diagnostics/selftest-paths.cc
index 56ce7ffcae14825834687684f64d2935141605d7..e28d18a6370f68dfca7b10547212c51689cc0448 100644 (file)
--- a/gcc/diagnostics/selftest-paths.cc
+++ b/gcc/diagnostics/selftest-paths.cc
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "version.h"
-#include "diagnostic.h"
 #include "diagnostics/selftest-paths.h"
 
 #if CHECKING_P

diff --git a/gcc/diagnostics/source-printing-options.h b/gcc/diagnostics/source-printing-options.h
index 362b691c90c620adf75aa14d96eff4335910c685..842a3e77d20c385cfe4729040aeb0857e26b0235 100644 (file)
--- a/gcc/diagnostics/source-printing-options.h
+++ b/gcc/diagnostics/source-printing-options.h
@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_DIAGNOSTICS_SOURCE_PRINTING_OPTIONS_H
 #define GCC_DIAGNOSTICS_SOURCE_PRINTING_OPTIONS_H
 
+#include "rich-location.h"
+
 namespace diagnostics {
 
 /* A bundle of options relating to printing the user's source code

diff --git a/gcc/diagnostics/text-sink.cc b/gcc/diagnostics/text-sink.cc
index d4cfb89347f49c6f4efc5a421ca2a9eddcd5eb4a..f9a2bffb2630e2e86297f2e72d390978139e7e36 100644 (file)
--- a/gcc/diagnostics/text-sink.cc
+++ b/gcc/diagnostics/text-sink.cc
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "version.h"
 #include "intl.h"
-#include "diagnostic.h"
 #include "diagnostics/color.h"
 #include "diagnostics/url.h"
 #include "diagnostics/metadata.h"