diff options
Diffstat (limited to 'lib')
42 files changed, 132 insertions, 49 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index 43b45612b9..66261045a5 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticAST.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 490aef2467..3947803ee8 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticAnalysis.h" #include "clang/AST/ASTContext.h" #include "clang/Analysis/FlowSensitive/DataflowSolver.h" #include "llvm/Support/Compiler.h" diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp index 2271095b59..ee0345b18d 100644 --- a/lib/Basic/Diagnostic.cpp +++ b/lib/Basic/Diagnostic.cpp @@ -36,29 +36,99 @@ enum { class_mask = 0x07 }; +namespace clang { + namespace diag { + enum _kind{ +#define DIAG(ENUM,FLAGS,DESC) ENUM, +#define LEXSTART +#define PARSESTART +#define ASTSTART +#define SEMASTART +#define ANALYSISSTART +#include "clang/Basic/DiagnosticKinds.def" + NUM_BUILTIN_DIAGNOSTICS = DIAG_UPPER_LIMIT + }; + } +} + /// DiagnosticFlags - A set of flags, or'd together, that describe the /// diagnostic. -static unsigned char DiagnosticFlags[] = { #define DIAG(ENUM,FLAGS,DESC) FLAGS, -#include "clang/Basic/DiagnosticKinds.def" +static unsigned char DiagnosticFlagsCommon[] = { +#include "clang/Basic/DiagnosticCommonKinds.def" + 0 +}; +static unsigned char DiagnosticFlagsLex[] = { +#include "clang/Basic/DiagnosticLexKinds.def" + 0 +}; +static unsigned char DiagnosticFlagsParse[] = { +#include "clang/Basic/DiagnosticParseKinds.def" + 0 +}; +static unsigned char DiagnosticFlagsAST[] = { +#include "clang/Basic/DiagnosticASTKinds.def" + 0 +}; +static unsigned char DiagnosticFlagsSema[] = { +#include "clang/Basic/DiagnosticSemaKinds.def" + 0 +}; +static unsigned char DiagnosticFlagsAnalysis[] = { +#include "clang/Basic/DiagnosticAnalysisKinds.def" 0 }; +#undef DIAG /// getDiagClass - Return the class field of the diagnostic. /// static unsigned getBuiltinDiagClass(unsigned DiagID) { assert(DiagID < diag::NUM_BUILTIN_DIAGNOSTICS && "Diagnostic ID out of range!"); - return DiagnosticFlags[DiagID] & class_mask; + unsigned res; + if (DiagID < DIAG_START_LEX) + res = DiagnosticFlagsCommon[DiagID]; + else if (DiagID < DIAG_START_PARSE) + res = DiagnosticFlagsLex[DiagID - DIAG_START_LEX - 1]; + else if (DiagID < DIAG_START_AST) + res = DiagnosticFlagsParse[DiagID - DIAG_START_PARSE - 1]; + else if (DiagID < DIAG_START_SEMA) + res = DiagnosticFlagsAST[DiagID - DIAG_START_AST - 1]; + else if (DiagID < DIAG_START_ANALYSIS) + res = DiagnosticFlagsSema[DiagID - DIAG_START_SEMA - 1]; + else + res = DiagnosticFlagsAnalysis[DiagID - DIAG_START_ANALYSIS - 1]; + return res & class_mask; } /// DiagnosticText - An english message to print for the diagnostic. These /// should be localized. -static const char * const DiagnosticText[] = { #define DIAG(ENUM,FLAGS,DESC) DESC, -#include "clang/Basic/DiagnosticKinds.def" +static const char * const DiagnosticTextCommon[] = { +#include "clang/Basic/DiagnosticCommonKinds.def" + 0 +}; +static const char * const DiagnosticTextLex[] = { +#include "clang/Basic/DiagnosticLexKinds.def" + 0 +}; +static const char * const DiagnosticTextParse[] = { +#include "clang/Basic/DiagnosticParseKinds.def" 0 }; +static const char * const DiagnosticTextAST[] = { +#include "clang/Basic/DiagnosticASTKinds.def" + 0 +}; +static const char * const DiagnosticTextSema[] = { +#include "clang/Basic/DiagnosticSemaKinds.def" + 0 +}; +static const char * const DiagnosticTextAnalysis[] = { +#include "clang/Basic/DiagnosticAnalysisKinds.def" + 0 +}; +#undef DIAG //===----------------------------------------------------------------------===// // Custom Diagnostic information @@ -170,9 +240,22 @@ bool Diagnostic::isBuiltinNoteWarningOrExtension(unsigned DiagID) { /// issue. const char *Diagnostic::getDescription(unsigned DiagID) const { if (DiagID < diag::NUM_BUILTIN_DIAGNOSTICS) - return DiagnosticText[DiagID]; - else - return CustomDiagInfo->getDescription(DiagID); + { + if (DiagID < DIAG_START_LEX) + return DiagnosticTextCommon[DiagID]; + else if (DiagID < DIAG_START_PARSE) + return DiagnosticTextLex[DiagID - DIAG_START_LEX - 1]; + else if (DiagID < DIAG_START_AST) + return DiagnosticTextParse[DiagID - DIAG_START_PARSE - 1]; + else if (DiagID < DIAG_START_SEMA) + return DiagnosticTextAST[DiagID - DIAG_START_AST - 1]; + else if (DiagID < DIAG_START_ANALYSIS) + return DiagnosticTextSema[DiagID - DIAG_START_SEMA - 1]; + else if (DiagID < DIAG_UPPER_LIMIT) + return DiagnosticTextAnalysis[DiagID - DIAG_START_ANALYSIS - 1]; + } + + return CustomDiagInfo->getDescription(DiagID); } /// getDiagnosticLevel - Based on the way the client configured the Diagnostic diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp index 986dd13d5d..2bf9300e91 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticLex.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 76c90e4ed0..b06f9a4cf2 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticLex.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 7a805f349f..63086ad274 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticLex.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 d277ec9dd4..0ddd229220 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticLex.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 86f93e407a..73d677fe15 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticLex.h" #include "llvm/ADT/APSInt.h" using namespace clang; diff --git a/lib/Lex/PPLexerChange.cpp b/lib/Lex/PPLexerChange.cpp index e425f6b737..f00283bfbd 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticLex.h" #include "clang/Basic/SourceManager.h" #include "llvm/Support/MemoryBuffer.h" diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index a517b1d4f5..fb7d22a581 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticLex.h" #include <ctime> using namespace clang; diff --git a/lib/Lex/Pragma.cpp b/lib/Lex/Pragma.cpp index a80ba6bd1f..ad467630b1 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticLex.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 48fdd68ab9..c265c2c75d 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticLex.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 e98afccbba..f75ce429c6 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticLex.h" #include "clang/Basic/SourceManager.h" using namespace clang; diff --git a/lib/Lex/TokenLexer.cpp b/lib/Lex/TokenLexer.cpp index 40f6640cd7..eaa49f36b9 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticLex.h" #include "llvm/ADT/SmallVector.h" using namespace clang; diff --git a/lib/Parse/DeclSpec.cpp b/lib/Parse/DeclSpec.cpp index 83bf36c716..f75e3ea8b8 100644 --- a/lib/Parse/DeclSpec.cpp +++ b/lib/Parse/DeclSpec.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/DeclSpec.h" -#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticParse.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 e7d44464b5..4593dcff44 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticParse.h" namespace clang { diff --git a/lib/Parse/ParseCXXInlineMethods.cpp b/lib/Parse/ParseCXXInlineMethods.cpp index 90d2f6fefc..bf9b3b2fb5 100644 --- a/lib/Parse/ParseCXXInlineMethods.cpp +++ b/lib/Parse/ParseCXXInlineMethods.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticParse.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 5a8f223488..89e0f10d74 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/Parser.h" -#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticParse.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 1041410f2a..ed4d1dffee 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/Parser.h" -#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticParse.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 945ff245fb..6a2ef36a37 100644 --- a/lib/Parse/ParseExprCXX.cpp +++ b/lib/Parse/ParseExprCXX.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticParse.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 b5d0ec05db..1e14dd6741 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticParse.h" #include "llvm/ADT/SmallString.h" using namespace clang; diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp index 1c94dbb6aa..2cbb56417b 100644 --- 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/Diagnostic.h" +#include "clang/Basic/DiagnosticParse.h" #include "llvm/ADT/SmallVector.h" using namespace clang; diff --git a/lib/Parse/ParsePragma.cpp b/lib/Parse/ParsePragma.cpp index 40f0f652d9..279038c37e 100644 --- a/lib/Parse/ParsePragma.cpp +++ b/lib/Parse/ParsePragma.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "ParsePragma.h" -#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticParse.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 ed5e22401e..ea54e7ed30 100644 --- a/lib/Parse/ParseTemplate.cpp +++ b/lib/Parse/ParseTemplate.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/Parser.h" -#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticParse.h" #include "clang/Parse/DeclSpec.h" #include "clang/Parse/Scope.h" diff --git a/lib/Parse/ParseTentative.cpp b/lib/Parse/ParseTentative.cpp index e7914cccea..5b242d82e7 100644 --- a/lib/Parse/ParseTentative.cpp +++ b/lib/Parse/ParseTentative.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/Parser.h" -#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticParse.h" using namespace clang; /// isCXXDeclarationStatement - C++-specialized function that disambiguates diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp index 7e1cef950f..0e1b22202c 100644 --- a/lib/Parse/Parser.cpp +++ b/lib/Parse/Parser.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/Parser.h" -#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticParse.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 7e61bbd14c..4f659b6beb 100644 --- a/lib/Sema/Sema.cpp +++ b/lib/Sema/Sema.cpp @@ -17,7 +17,7 @@ #include "clang/AST/DeclObjC.h" #include "clang/AST/Expr.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Basic/Diagnostic.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 0adea514d0..5e67084353 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -21,7 +21,7 @@ #include "clang/AST/DeclBase.h" #include "clang/AST/Expr.h" #include "clang/Parse/Action.h" -#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticSema.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 699f890807..357dcd7b60 100644 --- a/lib/Sema/SemaCXXScopeSpec.cpp +++ b/lib/Sema/SemaCXXScopeSpec.cpp @@ -14,7 +14,7 @@ #include "Sema.h"
#include "clang/AST/ASTContext.h"
#include "clang/Parse/DeclSpec.h"
-#include "clang/Basic/Diagnostic.h"
+#include "clang/Basic/DiagnosticSema.h"
#include "llvm/ADT/STLExtras.h"
using namespace clang;
diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp index 9a60861bc2..5b15a1a5be 100644 --- a/lib/Sema/SemaChecking.cpp +++ b/lib/Sema/SemaChecking.cpp @@ -18,7 +18,7 @@ #include "clang/AST/ExprCXX.h" #include "clang/AST/ExprObjC.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Basic/Diagnostic.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 9f308842d9..41ecf13563 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -18,7 +18,7 @@ #include "clang/AST/DeclObjC.h" #include "clang/AST/ExprCXX.h" #include "clang/Parse/DeclSpec.h" -#include "clang/Basic/Diagnostic.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 f444c71e4f..c87483dd0c 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -15,7 +15,7 @@ #include "clang/AST/ASTContext.h" #include "clang/AST/DeclObjC.h" #include "clang/AST/Expr.h" -#include "clang/Basic/Diagnostic.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 d5d83be87d..14a481eb71 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -18,7 +18,7 @@ #include "clang/AST/TypeOrdering.h" #include "clang/AST/StmtVisitor.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Basic/Diagnostic.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 2653887646..b636e29945 100644 --- a/lib/Sema/SemaDeclObjC.cpp +++ b/lib/Sema/SemaDeclObjC.cpp @@ -14,7 +14,7 @@ #include "Sema.h" #include "clang/AST/ASTContext.h" #include "clang/AST/DeclObjC.h" -#include "clang/Basic/Diagnostic.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 9e80946b43..48d62729dc 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -18,7 +18,7 @@ #include "clang/AST/ExprObjC.h" #include "clang/Lex/Preprocessor.h" #include "clang/Lex/LiteralSupport.h" -#include "clang/Basic/Diagnostic.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 04e37d1ebf..ee40a30ff1 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/ |