move library-specific diagnostic headers into library private dirs. Reduce

redundant #includes.  Patch by Anders Johnsen!

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63271 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index fba2df13a37ad508a30143d4c29c991fcad7adae..f5bb058d0884a36a1419ebd3074fdb3e93187264 100644 (file)
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -29,6 +29,7 @@
 #include "clang/Driver/InitHeaderSearch.h"
 #include "clang/Driver/TextDiagnosticBuffer.h"
 #include "clang/Driver/TextDiagnosticPrinter.h"
+#include "clang/Driver/DriverDiagnostic.h"
 #include "clang/Analysis/PathDiagnostic.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/TranslationUnit.h"
@@ -40,7 +41,6 @@
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/DiagnosticDriver.h"
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/StringExtras.h"

diff --git a/include/clang/Basic/DiagnosticAST.h b/include/clang/AST/ASTDiagnostic.h
similarity index 82%
rename from include/clang/Basic/DiagnosticAST.h
rename to include/clang/AST/ASTDiagnostic.h
index 1a140167e6ce622d7aaa84867d741489ade32094..8adc2cd0a22b2b71394a77f4857da517382da801 100644 (file)
--- a/include/clang/Basic/DiagnosticAST.h
+++ b/include/clang/AST/ASTDiagnostic.h
@@ -10,15 +10,15 @@
 #ifndef LLVM_CLANG_DIAGNOSTICAST_H
 #define LLVM_CLANG_DIAGNOSTICAST_H
 
-#include "clang/Basic/DiagnosticAST.h"
+#include "clang/Basic/Diagnostic.h"
 
 namespace clang {
   namespace diag { 
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
-#include "DiagnosticCommonKinds.def"
+#include "clang/Basic/DiagnosticCommonKinds.def"
 #define ASTSTART
-#include "DiagnosticASTKinds.def"
+#include "clang/Basic/DiagnosticASTKinds.def"
       NUM_BUILTIN_AST_DIAGNOSTICS
     };
   }  // end namespace diag

diff --git a/include/clang/Basic/DiagnosticAnalysis.h b/include/clang/Analysis/AnalysisDiagnostic.h
similarity index 87%
rename from include/clang/Basic/DiagnosticAnalysis.h
rename to include/clang/Analysis/AnalysisDiagnostic.h
index 9dc008ec138f31ca7c5fa7566c2c96ecdc1f4992..75d39e1d036b2b65f4911fab998b3ed71aec0ad8 100644 (file)
--- a/include/clang/Basic/DiagnosticAnalysis.h
+++ b/include/clang/Analysis/AnalysisDiagnostic.h
@@ -16,9 +16,9 @@ namespace clang {
   namespace diag { 
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
-#include "DiagnosticCommonKinds.def"
+#include "clang/Basic/DiagnosticCommonKinds.def"
 #define ANALYSISSTART
-#include "DiagnosticAnalysisKinds.def"
+#include "clang/Basic/DiagnosticAnalysisKinds.def"
       NUM_BUILTIN_ANALYSIS_DIAGNOSTICS
     };
   }  // end namespace diag

diff --git a/include/clang/Basic/DiagnosticDriver.h b/include/clang/Basic/DiagnosticDriver.h
deleted file mode 100644 (file)
index 60cdfcd..0000000
--- a/include/clang/Basic/DiagnosticDriver.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//===--- DiagnosticDriver.h - Diagnostics for the driver --------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_DIAGNOSTICDRIVER_H
-#define LLVM_CLANG_DIAGNOSTICDRIVER_H
-
-#include "clang/Basic/Diagnostic.h"
-
-namespace clang {
-  namespace diag { 
-    enum {
-#define DIAG(ENUM,FLAGS,DESC) ENUM,
-#include "DiagnosticCommonKinds.def"
-      NUM_BUILTIN_DRIVER_DIAGNOSTICS
-    };
-  }  // end namespace diag
-}  // end namespace clang
-
-#endif
-#ifndef LLVM_CLANG_DIAGNOSTICDRIVER_H
-#define LLVM_CLANG_DIAGNOSTICDRIVER_H
-
-#include "clang/Basic/Diagnostic.h"
-
-namespace clang {
-  namespace diag { 
-    enum {
-#define DIAG(ENUM,FLAGS,DESC) ENUM,
-#include "DiagnosticCommonKinds.def"
-      NUM_BUILTIN_DRIVER_DIAGNOSTICS
-    };
-  }  // end namespace diag
-}  // end namespace clang
-
-#endif
-#ifndef LLVM_CLANG_DIAGNOSTICDRIVER_H
-#define LLVM_CLANG_DIAGNOSTICDRIVER_H
-
-#include "clang/Basic/Diagnostic.h"
-
-namespace clang {
-  namespace diag { 
-    enum {
-#define DIAG(ENUM,FLAGS,DESC) ENUM,
-#include "DiagnosticCommonKinds.def"
-      NUM_BUILTIN_DRIVER_DIAGNOSTICS
-    };
-  }  // end namespace diag
-}  // end namespace clang
-
-#endif

diff --git a/include/clang/Driver/DriverDiagnostic.h b/include/clang/Driver/DriverDiagnostic.h
new file mode 100644 (file)
index 0000000..4afe5b2
--- /dev/null
+++ b/include/clang/Driver/DriverDiagnostic.h
@@ -0,0 +1,26 @@
+//===--- DiagnosticDriver.h - Diagnostics for the driver --------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_CLANG_DIAGNOSTICDRIVER_H
+#define LLVM_CLANG_DIAGNOSTICDRIVER_H
+
+#include "clang/Basic/Diagnostic.h"
+
+namespace clang {
+  namespace diag { 
+    enum {
+#define DIAG(ENUM,FLAGS,DESC) ENUM,
+#include "clang/Basic/DiagnosticCommonKinds.def"
+      NUM_BUILTIN_DRIVER_DIAGNOSTICS
+    };
+  }  // end namespace diag
+}  // end namespace clang
+
+#endif
+

diff --git a/include/clang/Basic/DiagnosticLex.h b/include/clang/Lex/LexDiagnostic.h
similarity index 87%
rename from include/clang/Basic/DiagnosticLex.h
rename to include/clang/Lex/LexDiagnostic.h
index 5430b730fb1cd63a7a308ada3c217e62f535ac8c..3d285cd6b5ca21dabd646d4fd854530178acdaf0 100644 (file)
--- a/include/clang/Basic/DiagnosticLex.h
+++ b/include/clang/Lex/LexDiagnostic.h
@@ -16,9 +16,9 @@ namespace clang {
   namespace diag { 
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
-#include "DiagnosticCommonKinds.def"
+#include "clang/Basic/DiagnosticCommonKinds.def"
 #define LEXSTART
-#include "DiagnosticLexKinds.def"
+#include "clang/Basic/DiagnosticLexKinds.def"
       NUM_BUILTIN_LEX_DIAGNOSTICS
     };
   }  // end namespace diag

diff --git a/include/clang/Basic/DiagnosticParse.h b/include/clang/Parse/ParseDiagnostic.h
similarity index 87%
rename from include/clang/Basic/DiagnosticParse.h
rename to include/clang/Parse/ParseDiagnostic.h
index 272f6ef868a440faa4edec34afc5800032a11210..12a4b2534fa6e328742b9005497974804e61f238 100644 (file)
--- a/include/clang/Basic/DiagnosticParse.h
+++ b/include/clang/Parse/ParseDiagnostic.h
@@ -16,9 +16,9 @@ namespace clang {
   namespace diag { 
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
-#include "DiagnosticCommonKinds.def"
+#include "clang/Basic/DiagnosticCommonKinds.def"
 #define PARSESTART
-#include "DiagnosticParseKinds.def"
+#include "clang/Basic/DiagnosticParseKinds.def"
       NUM_BUILTIN_PARSE_DIAGNOSTICS
     };
   }  // end namespace diag

diff --git a/include/clang/Basic/DiagnosticSema.h b/include/clang/Sema/SemaDiagnostic.h
similarity index 87%
rename from include/clang/Basic/DiagnosticSema.h
rename to include/clang/Sema/SemaDiagnostic.h
index c0644a1d37e706a2250dae575286a371b78a28f0..52fa696218dbb30c3dc050e6539bb9d37376bdec 100644 (file)
--- a/include/clang/Basic/DiagnosticSema.h
+++ b/include/clang/Sema/SemaDiagnostic.h
@@ -16,9 +16,9 @@ namespace clang {
   namespace diag { 
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
-#include "DiagnosticCommonKinds.def"
+#include "clang/Basic/DiagnosticCommonKinds.def"
 #define SEMASTART
-#include "DiagnosticSemaKinds.def"
+#include "clang/Basic/DiagnosticSemaKinds.def"
       NUM_BUILTIN_SEMA_DIAGNOSTICS
     };
   }  // end namespace diag

diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index c444a199f6c37cb89827b4649c53690e731d9fd7..f07df0a187ebc4d37e293b6d0c9279ada9d71641 100644 (file)
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -15,7 +15,7 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/RecordLayout.h"
 #include "clang/AST/StmtVisitor.h"
-#include "clang/Basic/DiagnosticAST.h"
+#include "clang/AST/ASTDiagnostic.h"
 #include "clang/Basic/TargetInfo.h"
 #include "llvm/Support/Compiler.h"
 using namespace clang;

diff --git a/lib/Analysis/UninitializedValues.cpp b/lib/Analysis/UninitializedValues.cpp
index 3947803ee888098a51a6d5e00ebd9b1c5f738207..9ff99f1fa1fcf2168b404914309ae29d0a9d3bae 100644 (file)
--- a/lib/Analysis/UninitializedValues.cpp
+++ b/lib/Analysis/UninitializedValues.cpp
@@ -14,7 +14,7 @@
 #include "clang/Analysis/Analyses/UninitializedValues.h"
 #include "clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h"
 #include "clang/Analysis/LocalCheckers.h"
-#include "clang/Basic/DiagnosticAnalysis.h"
+#include "clang/Analysis/AnalysisDiagnostic.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/Analysis/FlowSensitive/DataflowSolver.h"
 #include "llvm/Support/Compiler.h"

diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp
index 2bf9300e91689dd906a4b4411d5fe9d5cc13c6d9..72715c9eedaaf629677d4727be3dc50f06d06f45 100644 (file)
--- a/lib/Lex/Lexer.cpp
+++ b/lib/Lex/Lexer.cpp
@@ -26,7 +26,7 @@
 
 #include "clang/Lex/Lexer.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Basic/DiagnosticLex.h"
+#include "clang/Lex/LexDiagnostic.h"
 #include "clang/Basic/SourceManager.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/MemoryBuffer.h"

diff --git a/lib/Lex/LiteralSupport.cpp b/lib/Lex/LiteralSupport.cpp
index b06f9a4cf29c9c15a545b774f233196b47b9ef98..93b653aae6f29a80ebd369bc87b2ef1cac07a763 100644 (file)
--- a/lib/Lex/LiteralSupport.cpp
+++ b/lib/Lex/LiteralSupport.cpp
@@ -14,7 +14,7 @@
 
 #include "clang/Lex/LiteralSupport.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Basic/DiagnosticLex.h"
+#include "clang/Lex/LexDiagnostic.h"
 #include "clang/Basic/TargetInfo.h"
 #include "llvm/ADT/StringExtras.h"
 using namespace clang;

diff --git a/lib/Lex/MacroArgs.cpp b/lib/Lex/MacroArgs.cpp
index 63086ad274730040c12b1cde176cad3667db4ad7..2646a61e51af271f07c247de54e1f3bbe9054303 100644 (file)
--- a/lib/Lex/MacroArgs.cpp
+++ b/lib/Lex/MacroArgs.cpp
@@ -14,7 +14,7 @@
 #include "MacroArgs.h"
 #include "clang/Lex/MacroInfo.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Basic/DiagnosticLex.h"
+#include "clang/Lex/LexDiagnostic.h"
 using namespace clang;
 
 /// MacroArgs ctor function - This destroys the vector passed in.

diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp
index 0ddd2292209fdaef2a0c912c9ff9477c3b166b27..1ff469b8258ec594ce04095e443b28c41fadd4ce 100644 (file)
--- a/lib/Lex/PPDirectives.cpp
+++ b/lib/Lex/PPDirectives.cpp
@@ -15,7 +15,7 @@
 #include "clang/Lex/LiteralSupport.h"
 #include "clang/Lex/HeaderSearch.h"
 #include "clang/Lex/MacroInfo.h"
-#include "clang/Basic/DiagnosticLex.h"
+#include "clang/Lex/LexDiagnostic.h"
 #include "clang/Basic/SourceManager.h"
 #include "llvm/ADT/APInt.h"
 using namespace clang;

diff --git a/lib/Lex/PPExpressions.cpp b/lib/Lex/PPExpressions.cpp
index 73d677fe15b0545163013a12936dd41d00d96dbb..3cba06f46034dcba20ad9ab17d295dc0348cdd9a 100644 (file)
--- a/lib/Lex/PPExpressions.cpp
+++ b/lib/Lex/PPExpressions.cpp
@@ -20,7 +20,7 @@
 #include "clang/Lex/MacroInfo.h"
 #include "clang/Lex/LiteralSupport.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/DiagnosticLex.h"
+#include "clang/Lex/LexDiagnostic.h"
 #include "llvm/ADT/APSInt.h"
 using namespace clang;
 

diff --git a/lib/Lex/PPLexerChange.cpp b/lib/Lex/PPLexerChange.cpp
index f00283bfbda90ce24413baa418b9033c9c925ab8..3e02fbd63892c7363ec4addffac9679e5797d97f 100644 (file)
--- a/lib/Lex/PPLexerChange.cpp
+++ b/lib/Lex/PPLexerChange.cpp
@@ -15,7 +15,7 @@
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Lex/HeaderSearch.h"
 #include "clang/Lex/MacroInfo.h"
-#include "clang/Basic/DiagnosticLex.h"
+#include "clang/Lex/LexDiagnostic.h"
 #include "clang/Basic/SourceManager.h"
 #include "llvm/Support/MemoryBuffer.h"
 

diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp
index fb7d22a5813e9ba633dd3faf25860a2659579505..776754372d3d06f92542b4fd1fdb4cf45867043b 100644 (file)
--- a/lib/Lex/PPMacroExpansion.cpp
+++ b/lib/Lex/PPMacroExpansion.cpp
@@ -17,7 +17,7 @@
 #include "clang/Lex/MacroInfo.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/FileManager.h"
-#include "clang/Basic/DiagnosticLex.h"
+#include "clang/Lex/LexDiagnostic.h"
 #include <ctime>
 using namespace clang;
 

diff --git a/lib/Lex/Pragma.cpp b/lib/Lex/Pragma.cpp
index ad467630b163a3d61bf7c923f3c692029c27db12..87410f9ff4ab907071983067cdc916af342f8ad2 100644 (file)
--- a/lib/Lex/Pragma.cpp
+++ b/lib/Lex/Pragma.cpp
@@ -16,7 +16,7 @@
 #include "clang/Lex/HeaderSearch.h"
 #include "clang/Lex/LiteralSupport.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Basic/DiagnosticLex.h"
+#include "clang/Lex/LexDiagnostic.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/SourceManager.h"
 using namespace clang;

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index c265c2c75d4b72b24152fe52e540adf0e5c2b6e0..3861e7d320ee76d1e06f0b0dfe257feb9535f418 100644 (file)
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -30,7 +30,7 @@
 #include "clang/Lex/MacroInfo.h"
 #include "clang/Lex/Pragma.h"
 #include "clang/Lex/ScratchBuffer.h"
-#include "clang/Basic/DiagnosticLex.h"
+#include "clang/Lex/LexDiagnostic.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/TargetInfo.h"
 #include "llvm/ADT/APFloat.h"

diff --git a/lib/Lex/PreprocessorLexer.cpp b/lib/Lex/PreprocessorLexer.cpp
index f75ce429c65d36d48fb886115aef1ad6a28c5a4c..f9dfad9c808ec505b55e4dfefbc581636e1bc743 100644 (file)
--- a/lib/Lex/PreprocessorLexer.cpp
+++ b/lib/Lex/PreprocessorLexer.cpp
@@ -13,7 +13,7 @@
 
 #include "clang/Lex/PreprocessorLexer.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Basic/DiagnosticLex.h"
+#include "clang/Lex/LexDiagnostic.h"
 #include "clang/Basic/SourceManager.h"
 using namespace clang;
 

diff --git a/lib/Lex/TokenLexer.cpp b/lib/Lex/TokenLexer.cpp
index eaa49f36b9e2d7a2fda4248999ca382c0665747b..3ca0fcfa05de96c88ad0c9ec39c8f31bb06032cb 100644 (file)
--- a/lib/Lex/TokenLexer.cpp
+++ b/lib/Lex/TokenLexer.cpp
@@ -16,7 +16,7 @@
 #include "clang/Lex/MacroInfo.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Basic/SourceManager.h"
-#include "clang/Basic/DiagnosticLex.h"
+#include "clang/Lex/LexDiagnostic.h"
 #include "llvm/ADT/SmallVector.h"
 using namespace clang;
 

diff --git a/lib/Parse/DeclSpec.cpp b/lib/Parse/DeclSpec.cpp
index f75e3ea8b8b1ce525832189c31790fa6b995061b..32b00117683c5cca3b59c7df29b2bc6e70160984 100644 (file)
--- a/lib/Parse/DeclSpec.cpp
+++ b/lib/Parse/DeclSpec.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Parse/DeclSpec.h"
-#include "clang/Basic/DiagnosticParse.h"
+#include "clang/Parse/ParseDiagnostic.h"
 #include "clang/Basic/LangOptions.h"
 #include "llvm/ADT/STLExtras.h"
 using namespace clang;

diff --git a/lib/Parse/ExtensionRAIIObject.h b/lib/Parse/ExtensionRAIIObject.h
index 4593dcff44e7ba6e5e0390fcd0b8791b3e015b83..928d443b74cad39ee3ac48ed7a986084e2697596 100644 (file)
--- a/lib/Parse/ExtensionRAIIObject.h
+++ b/lib/Parse/ExtensionRAIIObject.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_CLANG_PARSE_EXTENSION_RAII_OBJECT_H
 #define LLVM_CLANG_PARSE_EXTENSION_RAII_OBJECT_H
 
-#include "clang/Basic/DiagnosticParse.h"
+#include "clang/Parse/ParseDiagnostic.h"
 
 namespace clang {
 

diff --git a/lib/Parse/ParseCXXInlineMethods.cpp b/lib/Parse/ParseCXXInlineMethods.cpp
index bf9b3b2fb50a2c376973daac25778fb8d4115ea7..4aa923ca009f08ce04c1b1a66612ba982fcb4510 100644 (file)
--- a/lib/Parse/ParseCXXInlineMethods.cpp
+++ b/lib/Parse/ParseCXXInlineMethods.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Basic/DiagnosticParse.h"
+#include "clang/Parse/ParseDiagnostic.h"
 #include "clang/Parse/Parser.h"
 #include "clang/Parse/DeclSpec.h"
 #include "clang/Parse/Scope.h"

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index eb5cedd5f40e0f65f3616f37285e206802b41751..7b6d8f818522e34a47ac7d5f291c64a98014ab6c 100644 (file)
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Parse/Parser.h"
-#include "clang/Basic/DiagnosticParse.h"
+#include "clang/Parse/ParseDiagnostic.h"
 #include "clang/Parse/Scope.h"
 #include "ExtensionRAIIObject.h"
 #include "AstGuard.h"

diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 27b2d74c850308e7fcbbe94aafe6d2d0fd36f373..628331fd1d4d256150797a65f95178185714756f 100644 (file)
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Parse/Parser.h"
-#include "clang/Basic/DiagnosticParse.h"
+#include "clang/Parse/ParseDiagnostic.h"
 #include "clang/Parse/DeclSpec.h"
 #include "clang/Parse/Scope.h"
 #include "AstGuard.h"

diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp
index 6a2ef36a37e74d99c63bb5cf645299be6b5acad9..f434cfb1f719f3d58db1b8048ceb8a9f548cf48d 100644 (file)
--- a/lib/Parse/ParseExprCXX.cpp
+++ b/lib/Parse/ParseExprCXX.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Basic/DiagnosticParse.h"
+#include "clang/Parse/ParseDiagnostic.h"
 #include "clang/Parse/Parser.h"
 #include "clang/Parse/DeclSpec.h"
 #include "AstGuard.h"

diff --git a/lib/Parse/ParseInit.cpp b/lib/Parse/ParseInit.cpp
index 1e14dd6741ad2a4234348c1b5115c5440f741cf1..c654a750ddd6893406b9d7c1cc15d5787ed1b87c 100644 (file)
--- a/lib/Parse/ParseInit.cpp
+++ b/lib/Parse/ParseInit.cpp
@@ -14,7 +14,7 @@
 #include "clang/Parse/Designator.h"
 #include "clang/Parse/Parser.h"
 #include "AstGuard.h"
-#include "clang/Basic/DiagnosticParse.h"
+#include "clang/Parse/ParseDiagnostic.h"
 #include "llvm/ADT/SmallString.h"
 using namespace clang;
 

diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index 2cbb56417b418f6b04699966bdde29f81cdde7e4..5d7d7f100057090af80e0a3da1760d3b711f0b06 100644 (file)
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -15,7 +15,7 @@
 #include "clang/Parse/DeclSpec.h"
 #include "clang/Parse/Scope.h"
 #include "AstGuard.h"
-#include "clang/Basic/DiagnosticParse.h"
+#include "clang/Parse/ParseDiagnostic.h"
 #include "llvm/ADT/SmallVector.h"
 using namespace clang;
 

diff --git a/lib/Parse/ParsePragma.cpp b/lib/Parse/ParsePragma.cpp
index 279038c37ef68a8179b7010e5aeeca36b81a046f..01496b31f75f4864d7f7f245883284f434c075d8 100644 (file)
--- a/lib/Parse/ParsePragma.cpp
+++ b/lib/Parse/ParsePragma.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ParsePragma.h"
-#include "clang/Basic/DiagnosticParse.h"
+#include "clang/Parse/ParseDiagnostic.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Parse/Action.h"
 using namespace clang;

diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp
index ea54e7ed3020459e25ac37ae8b684a435ff64993..b9a55147b85cbb158500081f4da0e762d3284a42 100644 (file)
--- a/lib/Parse/ParseTemplate.cpp
+++ b/lib/Parse/ParseTemplate.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Parse/Parser.h"
-#include "clang/Basic/DiagnosticParse.h"
+#include "clang/Parse/ParseDiagnostic.h"
 #include "clang/Parse/DeclSpec.h"
 #include "clang/Parse/Scope.h"
 

diff --git a/lib/Parse/ParseTentative.cpp b/lib/Parse/ParseTentative.cpp
index 5b242d82e75491b6ec2dd9e25b4cff513b230ca1..445dd8b6eff70ebfcc5083086169442327d13bf4 100644 (file)
--- a/lib/Parse/ParseTentative.cpp
+++ b/lib/Parse/ParseTentative.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Parse/Parser.h"
-#include "clang/Basic/DiagnosticParse.h"
+#include "clang/Parse/ParseDiagnostic.h"
 using namespace clang;
 
 /// isCXXDeclarationStatement - C++-specialized function that disambiguates

diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index 33ce08ef48fa686951c2ad5f1926f1dee6d43d25..8685a599d2fd3d417f674b46ecc0dbb90d79aaee 100644 (file)
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Parse/Parser.h"
-#include "clang/Basic/DiagnosticParse.h"
+#include "clang/Parse/ParseDiagnostic.h"
 #include "clang/Parse/DeclSpec.h"
 #include "clang/Parse/Scope.h"
 #include "ExtensionRAIIObject.h"

diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index 4f659b6beb80c1f9cefdffdadaf67e1cd468cf20..604173624299e9958655d134a1e4d4f7c7e25a07 100644 (file)
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -17,7 +17,6 @@
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Expr.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Basic/DiagnosticSema.h"
 using namespace clang;
 
 /// ConvertQualTypeToStringFn - This function is used to pretty print the 

diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index f14aba6a4f5fc622917c7ec786bbc5c24dbc2698..4a81f71dea39103635fcb7616106abf97d940b81 100644 (file)
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -20,7 +20,7 @@
 #include "SemaOverload.h"
 #include "clang/AST/DeclBase.h"
 #include "clang/Parse/Action.h"
-#include "clang/Basic/DiagnosticSema.h"
+#include "clang/Sema/SemaDiagnostic.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/SmallPtrSet.h"

diff --git a/lib/Sema/SemaCXXScopeSpec.cpp b/lib/Sema/SemaCXXScopeSpec.cpp
index 357dcd7b60cf8d719a63a6466e880ff57121f555..cf93571eb231958668ab3f1b71e46103b1f840f7 100644 (file)
--- a/lib/Sema/SemaCXXScopeSpec.cpp
+++ b/lib/Sema/SemaCXXScopeSpec.cpp
@@ -14,7 +14,6 @@
 #include "Sema.h"\r
 #include "clang/AST/ASTContext.h"\r
 #include "clang/Parse/DeclSpec.h"\r
-#include "clang/Basic/DiagnosticSema.h"\r
 #include "llvm/ADT/STLExtras.h"\r
 using namespace clang;\r
 \r

diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index 5b15a1a5be56f5fe06bbd7e5653cbe0c4ad83096..92cad1029b765ff02c41d900b098e66e85c44c62 100644 (file)
--- a/lib/Sema/SemaChecking.cpp
+++ b/lib/Sema/SemaChecking.cpp
@@ -18,7 +18,6 @@
 #include "clang/AST/ExprCXX.h"
 #include "clang/AST/ExprObjC.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Basic/DiagnosticSema.h"
 #include "SemaUtil.h"
 using namespace clang;
 

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 77f99e848f19dcd78f4d2934914921749a4bc930..7572560be1952b1c7297b4e28bbab07714e76bc2 100644 (file)
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -18,7 +18,6 @@
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/ExprCXX.h"
 #include "clang/Parse/DeclSpec.h"
-#include "clang/Basic/DiagnosticSema.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Basic/SourceManager.h"
 // FIXME: layering (ideally, Sema shouldn't be dependent on Lex API's)

diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp
index c87483dd0c9502c93bf6f976f8afc786b308d901..bf4549d05bca5984d3c06ccdab0c4b9b25a5092e 100644 (file)
--- a/lib/Sema/SemaDeclAttr.cpp
+++ b/lib/Sema/SemaDeclAttr.cpp
@@ -15,7 +15,6 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Expr.h"
-#include "clang/Basic/DiagnosticSema.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Parse/DeclSpec.h"
 #include <llvm/ADT/StringExtras.h>

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index a61184f6693862805a5e3ac67e22d52a232e45fd..1870a8fdd39b8a51ed9c807a59430b856a40c898 100644 (file)
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -18,7 +18,6 @@
 #include "clang/AST/TypeOrdering.h"
 #include "clang/AST/StmtVisitor.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Basic/DiagnosticSema.h"
 #include "clang/Parse/DeclSpec.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/Compiler.h"

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index fcf9a92acab2ebf447a46296e5c9e65ca0009be0..3371e3ea6e207fa071ea27e10781aa351f05ecaf 100644 (file)
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -14,7 +14,6 @@
 #include "Sema.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclObjC.h"
-#include "clang/Basic/DiagnosticSema.h"
 #include "clang/Parse/DeclSpec.h"
 
 using namespace clang;

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 2eb4605623bb684f684bae667baee2570c319de4..5ebec0270b5020b80fdfc2c7aea830216af1d7b1 100644 (file)
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -18,7 +18,6 @@
 #include "clang/AST/ExprObjC.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Lex/LiteralSupport.h"
-#include "clang/Basic/DiagnosticSema.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Parse/DeclSpec.h"

diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 743fa12b1868f7a690342c031d6d113600bd3eb5..d0ceb97b3ae9a8a48f5caf104ec2b2e11e9da5cf 100644 (file)
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -16,7 +16,6 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/Parse/DeclSpec.h"
 #include "clang/Lex/Preprocessor.h"
-#include "clang/Basic/DiagnosticSema.h"
 #include "clang/Basic/TargetInfo.h"
 #include "llvm/ADT/STLExtras.h"
 using namespace clang;

diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp
index a19a1d16d0e67cd02598e6685916f88185018f4e..f436e61ee91232292818b9d6887c8563cd8cbd94 100644 (file)
--- a/lib/Sema/SemaExprObjC.cpp
+++ b/lib/Sema/SemaExprObjC.cpp
@@ -15,7 +15,6 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/ExprObjC.h"
-#include "clang/Basic/DiagnosticSema.h"
 using namespace clang;
 
 Sema::ExprResult Sema::ParseObjCStringLiteral(SourceLocation *AtLocs, 

diff --git a/lib/Sema/SemaInherit.cpp b/lib/Sema/SemaInherit.cpp
index 307c5275043f5fd55e23e40ca0383555ab5bae0b..cb58063d840e1738a94cfe2faa0bb9260e02b07b 100644 (file)
--- a/lib/Sema/SemaInherit.cpp
+++ b/lib/Sema/SemaInherit.cpp
@@ -19,7 +19,6 @@
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/Type.h"
 #include "clang/AST/TypeOrdering.h"
-#include "clang/Basic/DiagnosticSema.h"
 #include <algorithm>
 #include <memory>
 #include <set>

diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index bb523e179b8ac6198722badcbeb6db8d97544473..5dc57751ffb3799e902d3710ba67adbe37b81ff3 100644 (file)
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -18,7 +18,6 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprCXX.h"
-#include "clang/Basic/DiagnosticSema.h"
 #include <map>
 using namespace clang;
 

diff --git a/lib/Sema/SemaNamedCast.cpp b/lib/Sema/SemaNamedCast.cpp
index cac76b63e4ca0309f838e739e1ed246db52428ea..e2137b30012998918fa6f790111e1928a5f200a0 100644 (file)
--- a/lib/Sema/SemaNamedCast.cpp
+++ b/lib/Sema/SemaNamedCast.cpp
@@ -15,7 +15,6 @@
 #include "SemaInherit.h"
 #include "clang/AST/ExprCXX.h"
 #include "clang/AST/ASTContext.h"
-#include "clang/Basic/DiagnosticSema.h"
 #include "llvm/ADT/SmallVector.h"
 #include <set>
 using namespace clang;

diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp
index c01eceb4ba9e32c321660a01ca32bdc0c01fdcf7..cf26b90bc47745b22fe6c49c59505da2eaad2708 100644 (file)
--- a/lib/Sema/SemaStmt.cpp
+++ b/lib/Sema/SemaStmt.cpp
@@ -17,7 +17,6 @@
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Expr.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/DiagnosticSema.h"
 using namespace clang;
 
 Sema::OwningStmtResult Sema::ActOnExprStmt(ExprArg expr) {

diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index 5d54f463ea19aa1fd504ee1592883e2055e1175e..43f8baae507d0fa84676ca34f361cf71c6ba76e2 100644 (file)
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -15,7 +15,6 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Expr.h"
-#include "clang/Basic/DiagnosticSema.h"
 #include "clang/Parse/DeclSpec.h"
 using namespace clang;