diff options
Diffstat (limited to 'contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp')
| -rw-r--r-- | contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp | 914 |
1 files changed, 137 insertions, 777 deletions
diff --git a/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp b/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp index d8095f4..31e3331 100644 --- a/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp +++ b/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp @@ -11,227 +11,13 @@ // //===----------------------------------------------------------------------===// -#include "clang/AST/ASTDiagnostic.h" -#include "clang/Analysis/AnalysisDiagnostic.h" #include "clang/Basic/Diagnostic.h" -#include "clang/Basic/FileManager.h" #include "clang/Basic/IdentifierTable.h" #include "clang/Basic/PartialDiagnostic.h" -#include "clang/Basic/SourceLocation.h" -#include "clang/Basic/SourceManager.h" -#include "clang/Driver/DriverDiagnostic.h" -#include "clang/Frontend/FrontendDiagnostic.h" -#include "clang/Lex/LexDiagnostic.h" -#include "clang/Parse/ParseDiagnostic.h" -#include "clang/Sema/SemaDiagnostic.h" #include "llvm/ADT/SmallVector.h" -#include "llvm/ADT/StringExtras.h" -#include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" - -#include <vector> -#include <map> -#include <cstring> using namespace clang; -//===----------------------------------------------------------------------===// -// Builtin Diagnostic information -//===----------------------------------------------------------------------===// - -namespace { - -// Diagnostic classes. -enum { - CLASS_NOTE = 0x01, - CLASS_WARNING = 0x02, - CLASS_EXTENSION = 0x03, - CLASS_ERROR = 0x04 -}; - -struct StaticDiagInfoRec { - unsigned short DiagID; - unsigned Mapping : 3; - unsigned Class : 3; - bool SFINAE : 1; - unsigned Category : 5; - - const char *Description; - const char *OptionGroup; - - bool operator<(const StaticDiagInfoRec &RHS) const { - return DiagID < RHS.DiagID; - } -}; - -} - -static const StaticDiagInfoRec StaticDiagInfo[] = { -#define DIAG(ENUM,CLASS,DEFAULT_MAPPING,DESC,GROUP,SFINAE, CATEGORY) \ - { diag::ENUM, DEFAULT_MAPPING, CLASS, SFINAE, CATEGORY, DESC, GROUP }, -#include "clang/Basic/DiagnosticCommonKinds.inc" -#include "clang/Basic/DiagnosticDriverKinds.inc" -#include "clang/Basic/DiagnosticFrontendKinds.inc" -#include "clang/Basic/DiagnosticLexKinds.inc" -#include "clang/Basic/DiagnosticParseKinds.inc" -#include "clang/Basic/DiagnosticASTKinds.inc" -#include "clang/Basic/DiagnosticSemaKinds.inc" -#include "clang/Basic/DiagnosticAnalysisKinds.inc" - { 0, 0, 0, 0, 0, 0, 0} -}; -#undef DIAG - -/// GetDiagInfo - Return the StaticDiagInfoRec entry for the specified DiagID, -/// or null if the ID is invalid. -static const StaticDiagInfoRec *GetDiagInfo(unsigned DiagID) { - unsigned NumDiagEntries = sizeof(StaticDiagInfo)/sizeof(StaticDiagInfo[0])-1; - - // If assertions are enabled, verify that the StaticDiagInfo array is sorted. -#ifndef NDEBUG - static bool IsFirst = true; - if (IsFirst) { - for (unsigned i = 1; i != NumDiagEntries; ++i) { - assert(StaticDiagInfo[i-1].DiagID != StaticDiagInfo[i].DiagID && - "Diag ID conflict, the enums at the start of clang::diag (in " - "Diagnostic.h) probably need to be increased"); - - assert(StaticDiagInfo[i-1] < StaticDiagInfo[i] && - "Improperly sorted diag info"); - } - IsFirst = false; - } -#endif - - // Search the diagnostic table with a binary search. - StaticDiagInfoRec Find = { DiagID, 0, 0, 0, 0, 0, 0 }; - - const StaticDiagInfoRec *Found = - std::lower_bound(StaticDiagInfo, StaticDiagInfo + NumDiagEntries, Find); - if (Found == StaticDiagInfo + NumDiagEntries || - Found->DiagID != DiagID) - return 0; - - return Found; -} - -static unsigned GetDefaultDiagMapping(unsigned DiagID) { - if (const StaticDiagInfoRec *Info = GetDiagInfo(DiagID)) - return Info->Mapping; - return diag::MAP_FATAL; -} - -/// getWarningOptionForDiag - Return the lowest-level warning option that -/// enables the specified diagnostic. If there is no -Wfoo flag that controls -/// the diagnostic, this returns null. -const char *Diagnostic::getWarningOptionForDiag(unsigned DiagID) { - if (const StaticDiagInfoRec *Info = GetDiagInfo(DiagID)) - return Info->OptionGroup; - return 0; -} - -/// getWarningOptionForDiag - Return the category number that a specified -/// DiagID belongs to, or 0 if no category. -unsigned Diagnostic::getCategoryNumberForDiag(unsigned DiagID) { - if (const StaticDiagInfoRec *Info = GetDiagInfo(DiagID)) - return Info->Category; - return 0; -} - -/// getCategoryNameFromID - Given a category ID, return the name of the -/// category, an empty string if CategoryID is zero, or null if CategoryID is -/// invalid. -const char *Diagnostic::getCategoryNameFromID(unsigned CategoryID) { - // Second the table of options, sorted by name for fast binary lookup. - static const char *CategoryNameTable[] = { -#define GET_CATEGORY_TABLE -#define CATEGORY(X) X, -#include "clang/Basic/DiagnosticGroups.inc" -#undef GET_CATEGORY_TABLE - "<<END>>" - }; - static const size_t CategoryNameTableSize = - sizeof(CategoryNameTable) / sizeof(CategoryNameTable[0])-1; - - if (CategoryID >= CategoryNameTableSize) return 0; - return CategoryNameTable[CategoryID]; -} - - - -Diagnostic::SFINAEResponse -Diagnostic::getDiagnosticSFINAEResponse(unsigned DiagID) { - if (const StaticDiagInfoRec *Info = GetDiagInfo(DiagID)) { - if (!Info->SFINAE) - return SFINAE_Report; - - if (Info->Class == CLASS_ERROR) - return SFINAE_SubstitutionFailure; - - // Suppress notes, warnings, and extensions; - return SFINAE_Suppress; - } - - return SFINAE_Report; -} - -/// getDiagClass - Return the class field of the diagnostic. -/// -static unsigned getBuiltinDiagClass(unsigned DiagID) { - if (const StaticDiagInfoRec *Info = GetDiagInfo(DiagID)) - return Info->Class; - return ~0U; -} - -//===----------------------------------------------------------------------===// -// Custom Diagnostic information -//===----------------------------------------------------------------------===// - -namespace clang { - namespace diag { - class CustomDiagInfo { - typedef std::pair<Diagnostic::Level, std::string> DiagDesc; - std::vector<DiagDesc> DiagInfo; - std::map<DiagDesc, unsigned> DiagIDs; - public: - - /// getDescription - Return the description of the specified custom - /// diagnostic. - const char *getDescription(unsigned DiagID) const { - assert(this && DiagID-DIAG_UPPER_LIMIT < DiagInfo.size() && - "Invalid diagnosic ID"); - return DiagInfo[DiagID-DIAG_UPPER_LIMIT].second.c_str(); - } - - /// getLevel - Return the level of the specified custom diagnostic. - Diagnostic::Level getLevel(unsigned DiagID) const { - assert(this && DiagID-DIAG_UPPER_LIMIT < DiagInfo.size() && - "Invalid diagnosic ID"); - return DiagInfo[DiagID-DIAG_UPPER_LIMIT].first; - } - - unsigned getOrCreateDiagID(Diagnostic::Level L, llvm::StringRef Message, - Diagnostic &Diags) { - DiagDesc D(L, Message); - // Check to see if it already exists. - std::map<DiagDesc, unsigned>::iterator I = DiagIDs.lower_bound(D); - if (I != DiagIDs.end() && I->first == D) - return I->second; - - // If not, assign a new ID. - unsigned ID = DiagInfo.size()+DIAG_UPPER_LIMIT; - DiagIDs.insert(std::make_pair(D, ID)); - DiagInfo.push_back(D); - return ID; - } - }; - - } // end diag namespace -} // end clang namespace - - -//===----------------------------------------------------------------------===// -// Common Diagnostic implementation -//===----------------------------------------------------------------------===// - static void DummyArgToStringFn(Diagnostic::ArgumentKind AK, intptr_t QT, const char *Modifier, unsigned ML, const char *Argument, unsigned ArgLen, @@ -244,7 +30,10 @@ static void DummyArgToStringFn(Diagnostic::ArgumentKind AK, intptr_t QT, } -Diagnostic::Diagnostic(DiagnosticClient *client) : Client(client) { +Diagnostic::Diagnostic(const llvm::IntrusiveRefCntPtr<DiagnosticIDs> &diags, + DiagnosticClient *client, bool ShouldOwnClient) + : Diags(diags), Client(client), OwnsDiagClient(ShouldOwnClient), + SourceMgr(0) { ArgToStringFn = DummyArgToStringFn; ArgToStringCookie = 0; @@ -259,72 +48,41 @@ Diagnostic::Diagnostic(DiagnosticClient *client) : Client(client) { ErrorLimit = 0; TemplateBacktraceLimit = 0; - CustomDiagInfo = 0; - // Set all mappings to 'unset'. - DiagMappingsStack.clear(); - DiagMappingsStack.push_back(DiagMappings()); + // Create a DiagState and DiagStatePoint representing diagnostic changes + // through command-line. + DiagStates.push_back(DiagState()); + PushDiagStatePoint(&DiagStates.back(), SourceLocation()); Reset(); } Diagnostic::~Diagnostic() { - delete CustomDiagInfo; -} - - -void Diagnostic::pushMappings() { - // Avoids undefined behavior when the stack has to resize. - DiagMappingsStack.reserve(DiagMappingsStack.size() + 1); - DiagMappingsStack.push_back(DiagMappingsStack.back()); -} - -bool Diagnostic::popMappings() { - if (DiagMappingsStack.size() == 1) - return false; - - DiagMappingsStack.pop_back(); - return true; -} - -/// getCustomDiagID - Return an ID for a diagnostic with the specified message -/// and level. If this is the first request for this diagnosic, it is -/// registered and created, otherwise the existing ID is returned. -unsigned Diagnostic::getCustomDiagID(Level L, llvm::StringRef Message) { - if (CustomDiagInfo == 0) - CustomDiagInfo = new diag::CustomDiagInfo(); - return CustomDiagInfo->getOrCreateDiagID(L, Message, *this); + if (OwnsDiagClient) + delete Client; } - -/// isBuiltinWarningOrExtension - Return true if the unmapped diagnostic -/// level of the specified diagnostic ID is a Warning or Extension. -/// This only works on builtin diagnostics, not custom ones, and is not legal to -/// call on NOTEs. -bool Diagnostic::isBuiltinWarningOrExtension(unsigned DiagID) { - return DiagID < diag::DIAG_UPPER_LIMIT && - getBuiltinDiagClass(DiagID) != CLASS_ERROR; +void Diagnostic::setClient(DiagnosticClient *client, bool ShouldOwnClient) { + if (OwnsDiagClient && Client) + delete Client; + + Client = client; + OwnsDiagClient = ShouldOwnClient; } -/// \brief Determine whether the given built-in diagnostic ID is a -/// Note. -bool Diagnostic::isBuiltinNote(unsigned DiagID) { - return DiagID < diag::DIAG_UPPER_LIMIT && - getBuiltinDiagClass(DiagID) == CLASS_NOTE; +void Diagnostic::pushMappings(SourceLocation Loc) { + DiagStateOnPushStack.push_back(GetCurDiagState()); } -/// isBuiltinExtensionDiag - Determine whether the given built-in diagnostic -/// ID is for an extension of some sort. This also returns EnabledByDefault, -/// which is set to indicate whether the diagnostic is ignored by default (in -/// which case -pedantic enables it) or treated as a warning/error by default. -/// -bool Diagnostic::isBuiltinExtensionDiag(unsigned DiagID, - bool &EnabledByDefault) { - if (DiagID >= diag::DIAG_UPPER_LIMIT || - getBuiltinDiagClass(DiagID) != CLASS_EXTENSION) +bool Diagnostic::popMappings(SourceLocation Loc) { + if (DiagStateOnPushStack.empty()) return false; - - EnabledByDefault = GetDefaultDiagMapping(DiagID) != diag::MAP_IGNORE; + + if (DiagStateOnPushStack.back() != GetCurDiagState()) { + // State changed at some point between push/pop. + PushDiagStatePoint(DiagStateOnPushStack.back(), Loc); + } + DiagStateOnPushStack.pop_back(); return true; } @@ -336,18 +94,14 @@ void Diagnostic::Reset() { NumErrors = 0; NumErrorsSuppressed = 0; CurDiagID = ~0U; - LastDiagLevel = Ignored; + // Set LastDiagLevel to an "unset" state. If we set it to 'Ignored', notes + // using a Diagnostic associated to a translation unit that follow + // diagnostics from a Diagnostic associated to anoter t.u. will not be + // displayed. + LastDiagLevel = (DiagnosticIDs::Level)-1; DelayedDiagID = 0; } -/// getDescription - Given a diagnostic ID, return a description of the -/// issue. -const char *Diagnostic::getDescription(unsigned DiagID) const { - if (const StaticDiagInfoRec *Info = GetDiagInfo(DiagID)) - return Info->Description; - return CustomDiagInfo->getDescription(DiagID); -} - void Diagnostic::SetDelayedDiagnostic(unsigned DiagID, llvm::StringRef Arg1, llvm::StringRef Arg2) { if (DelayedDiagID) @@ -365,264 +119,96 @@ void Diagnostic::ReportDelayed() { DelayedDiagArg2.clear(); } -/// getDiagnosticLevel - Based on the way the client configured the Diagnostic -/// object, classify the specified diagnostic ID into a Level, consumable by -/// the DiagnosticClient. -Diagnostic::Level Diagnostic::getDiagnosticLevel(unsigned DiagID) const { - // Handle custom diagnostics, which cannot be mapped. - if (DiagID >= diag::DIAG_UPPER_LIMIT) - return CustomDiagInfo->getLevel(DiagID); - - unsigned DiagClass = getBuiltinDiagClass(DiagID); - assert(DiagClass != CLASS_NOTE && "Cannot get diagnostic level of a note!"); - return getDiagnosticLevel(DiagID, DiagClass); -} - -/// getDiagnosticLevel - Based on the way the client configured the Diagnostic -/// object, classify the specified diagnostic ID into a Level, consumable by -/// the DiagnosticClient. -Diagnostic::Level -Diagnostic::getDiagnosticLevel(unsigned DiagID, unsigned DiagClass) const { - // Specific non-error diagnostics may be mapped to various levels from ignored - // to error. Errors can only be mapped to fatal. - Diagnostic::Level Result = Diagnostic::Fatal; - - // Get the mapping information, if unset, compute it lazily. - unsigned MappingInfo = getDiagnosticMappingInfo((diag::kind)DiagID); - if (MappingInfo == 0) { - MappingInfo = GetDefaultDiagMapping(DiagID); - setDiagnosticMappingInternal(DiagID, MappingInfo, false); - } - - switch (MappingInfo & 7) { - default: assert(0 && "Unknown mapping!"); - case diag::MAP_IGNORE: - // Ignore this, unless this is an extension diagnostic and we're mapping - // them onto warnings or errors. - if (!isBuiltinExtensionDiag(DiagID) || // Not an extension - ExtBehavior == Ext_Ignore || // Extensions ignored anyway - (MappingInfo & 8) != 0) // User explicitly mapped it. - return Diagnostic::Ignored; - Result = Diagnostic::Warning; - if (ExtBehavior == Ext_Error) Result = Diagnostic::Error; - if (Result == Diagnostic::Error && ErrorsAsFatal) - Result = Diagnostic::Fatal; - break; - case diag::MAP_ERROR: - Result = Diagnostic::Error; - if (ErrorsAsFatal) - Result = Diagnostic::Fatal; - break; - case diag::MAP_FATAL: - Result = Diagnostic::Fatal; - break; - case diag::MAP_WARNING: - // If warnings are globally mapped to ignore or error, do it. - if (IgnoreAllWarnings) - return Diagnostic::Ignored; - - Result = Diagnostic::Warning; - - // If this is an extension diagnostic and we're in -pedantic-error mode, and - // if the user didn't explicitly map it, upgrade to an error. - if (ExtBehavior == Ext_Error && - (MappingInfo & 8) == 0 && - isBuiltinExtensionDiag(DiagID)) - Result = Diagnostic::Error; - - if (WarningsAsErrors) - Result = Diagnostic::Error; - if (Result == Diagnostic::Error && ErrorsAsFatal) - Result = Diagnostic::Fatal; - break; - - case diag::MAP_WARNING_NO_WERROR: - // Diagnostics specified with -Wno-error=foo should be set to warnings, but - // not be adjusted by -Werror or -pedantic-errors. - Result = Diagnostic::Warning; - - // If warnings are globally mapped to ignore or error, do it. - if (IgnoreAllWarnings) - return Diagnostic::Ignored; - - break; - - case diag::MAP_ERROR_NO_WFATAL: - // Diagnostics specified as -Wno-fatal-error=foo should be errors, but - // unaffected by -Wfatal-errors. - Result = Diagnostic::Error; - break; - } - - // Okay, we're about to return this as a "diagnostic to emit" one last check: - // if this is any sort of extension warning, and if we're in an __extension__ - // block, silence it. - if (AllExtensionsSilenced && isBuiltinExtensionDiag(DiagID)) - return Diagnostic::Ignored; - - return Result; -} - -struct WarningOption { - const char *Name; - const short *Members; - const short *SubGroups; -}; - -#define GET_DIAG_ARRAYS -#include "clang/Basic/DiagnosticGroups.inc" -#undef GET_DIAG_ARRAYS - -// Second the table of options, sorted by name for fast binary lookup. -static const WarningOption OptionTable[] = { -#define GET_DIAG_TABLE -#include "clang/Basic/DiagnosticGroups.inc" -#undef GET_DIAG_TABLE -}; -static const size_t OptionTableSize = -sizeof(OptionTable) / sizeof(OptionTable[0]); - -static bool WarningOptionCompare(const WarningOption &LHS, - const WarningOption &RHS) { - return strcmp(LHS.Name, RHS.Name) < 0; -} - -static void MapGroupMembers(const WarningOption *Group, diag::Mapping Mapping, - Diagnostic &Diags) { - // Option exists, poke all the members of its diagnostic set. - if (const short *Member = Group->Members) { - for (; *Member != -1; ++Member) - Diags.setDiagnosticMapping(*Member, Mapping); - } +Diagnostic::DiagStatePointsTy::iterator +Diagnostic::GetDiagStatePointForLoc(SourceLocation L) const { + assert(!DiagStatePoints.empty()); + assert(DiagStatePoints.front().Loc.isInvalid() && + "Should have created a DiagStatePoint for command-line"); - // Enable/disable all subgroups along with this one. - if (const short *SubGroups = Group->SubGroups) { - for (; *SubGroups != (short)-1; ++SubGroups) - MapGroupMembers(&OptionTable[(short)*SubGroups], Mapping, Diags); - } -} + FullSourceLoc Loc(L, *SourceMgr); + if (Loc.isInvalid()) + return DiagStatePoints.end() - 1; -/// setDiagnosticGroupMapping - Change an entire diagnostic group (e.g. -/// "unknown-pragmas" to have the specified mapping. This returns true and -/// ignores the request if "Group" was unknown, false otherwise. -bool Diagnostic::setDiagnosticGroupMapping(const char *Group, - diag::Mapping Map) { - - WarningOption Key = { Group, 0, 0 }; - const WarningOption *Found = - std::lower_bound(OptionTable, OptionTable + OptionTableSize, Key, - WarningOptionCompare); - if (Found == OptionTable + OptionTableSize || - strcmp(Found->Name, Group) != 0) - return true; // Option not found. - - MapGroupMembers(Found, Map, *this); - return false; + DiagStatePointsTy::iterator Pos = DiagStatePoints.end(); + FullSourceLoc LastStateChangePos = DiagStatePoints.back().Loc; + if (LastStateChangePos.isValid() && + Loc.isBeforeInTranslationUnitThan(LastStateChangePos)) + Pos = std::upper_bound(DiagStatePoints.begin(), DiagStatePoints.end(), + DiagStatePoint(0, Loc)); + --Pos; + return Pos; } - -/// ProcessDiag - This is the method used to report a diagnostic that is -/// finally fully formed. -bool Diagnostic::ProcessDiag() { - DiagnosticInfo Info(this); - - if (SuppressAllDiagnostics) - return false; - - // Figure out the diagnostic level of this message. - Diagnostic::Level DiagLevel; - unsigned DiagID = Info.getID(); - - // ShouldEmitInSystemHeader - True if this diagnostic should be produced even - // in a system header. - bool ShouldEmitInSystemHeader; - - if (DiagID >= diag::DIAG_UPPER_LIMIT) { - // Handle custom diagnostics, which cannot be mapped. - DiagLevel = CustomDiagInfo->getLevel(DiagID); - - // Custom diagnostics always are emitted in system headers. - ShouldEmitInSystemHeader = true; - } else { - // Get the class of the diagnostic. If this is a NOTE, map it onto whatever - // the diagnostic level was for the previous diagnostic so that it is - // filtered the same as the previous diagnostic. - unsigned DiagClass = getBuiltinDiagClass(DiagID); - if (DiagClass == CLASS_NOTE) { - DiagLevel = Diagnostic::Note; - ShouldEmitInSystemHeader = false; // extra consideration is needed - } else { - // If this is not an error and we are in a system header, we ignore it. - // Check the original Diag ID here, because we also want to ignore - // extensions and warnings in -Werror and -pedantic-errors modes, which - // *map* warnings/extensions to errors. - ShouldEmitInSystemHeader = DiagClass == CLASS_ERROR; - - DiagLevel = getDiagnosticLevel(DiagID, DiagClass); - } - } - - if (DiagLevel != Diagnostic::Note) { - // Record that a fatal error occurred only when we see a second - // non-note diagnostic. This allows notes to be attached to the - // fatal error, but suppresses any diagnostics that follow those - // notes. - if (LastDiagLevel == Diagnostic::Fatal) - FatalErrorOccurred = true; - - LastDiagLevel = DiagLevel; +/// \brief This allows the client to specify that certain +/// warnings are ignored. Notes can never be mapped, errors can only be +/// mapped to fatal, and WARNINGs and EXTENSIONs can be mapped arbitrarily. +/// +/// \param The source location that this change of diagnostic state should +/// take affect. It can be null if we are setting the latest state. +void Diagnostic::setDiagnosticMapping(diag::kind Diag, diag::Mapping Map, + SourceLocation L) { + assert(Diag < diag::DIAG_UPPER_LIMIT && + "Can only map builtin diagnostics"); + assert((Diags->isBuiltinWarningOrExtension(Diag) || + (Map == diag::MAP_FATAL || Map == diag::MAP_ERROR)) && + "Cannot map errors into warnings!"); + assert(!DiagStatePoints.empty()); + + bool isPragma = L.isValid(); + FullSourceLoc Loc(L, *SourceMgr); + FullSourceLoc LastStateChangePos = DiagStatePoints.back().Loc; + + // Common case; setting all the diagnostics of a group in one place. + if (Loc.isInvalid() || Loc == LastStateChangePos) { + setDiagnosticMappingInternal(Diag, Map, GetCurDiagState(), true, isPragma); + return; } - // If a fatal error has already been emitted, silence all subsequent - // diagnostics. - if (FatalErrorOccurred) { - if (DiagLevel >= Diagnostic::Error && Client->IncludeInDiagnosticCounts()) { - ++NumErrors; - ++NumErrorsSuppressed; - } - - return false; + // Another common case; modifying diagnostic state in a source location + // after the previous one. + if ((Loc.isValid() && LastStateChangePos.isInvalid()) || + LastStateChangePos.isBeforeInTranslationUnitThan(Loc)) { + // A diagnostic pragma occured, create a new DiagState initialized with + // the current one and a new DiagStatePoint to record at which location + // the new state became active. + DiagStates.push_back(*GetCurDiagState()); + PushDiagStatePoint(&DiagStates.back(), Loc); + setDiagnosticMappingInternal(Diag, Map, GetCurDiagState(), true, isPragma); + return; } - // If the client doesn't care about this message, don't issue it. If this is - // a note and the last real diagnostic was ignored, ignore it too. - if (DiagLevel == Diagnostic::Ignored || - (DiagLevel == Diagnostic::Note && LastDiagLevel == Diagnostic::Ignored)) - return false; - - // If this diagnostic is in a system header and is not a clang error, suppress - // it. - if (SuppressSystemWarnings && !ShouldEmitInSystemHeader && - Info.getLocation().isValid() && - Info.getLocation().getInstantiationLoc().isInSystemHeader() && - (DiagLevel != Diagnostic::Note || LastDiagLevel == Diagnostic::Ignored)) { - LastDiagLevel = Diagnostic::Ignored; - return false; - } + // We allow setting the diagnostic state in random source order for + // completeness but it should not be actually happening in normal practice. - if (DiagLevel >= Diagnostic::Error) { - if (Client->IncludeInDiagnosticCounts()) { - ErrorOccurred = true; - ++NumErrors; - } + DiagStatePointsTy::iterator Pos = GetDiagStatePointForLoc(Loc); + assert(Pos != DiagStatePoints.end()); - // If we've emitted a lot of errors, emit a fatal error after it to stop a - // flood of bogus errors. - if (ErrorLimit && NumErrors >= ErrorLimit && - DiagLevel == Diagnostic::Error) - SetDelayedDiagnostic(diag::fatal_too_many_errors); + // Update all diagnostic states that are active after the given location. + for (DiagStatePointsTy::iterator + I = Pos+1, E = DiagStatePoints.end(); I != E; ++I) { + setDiagnosticMappingInternal(Diag, Map, I->State, true, isPragma); } - // Finally, report it. - Client->HandleDiagnostic(DiagLevel, Info); - if (Client->IncludeInDiagnosticCounts()) { - if (DiagLevel == Diagnostic::Warning) - ++NumWarnings; + // If the location corresponds to an existing point, just update its state. + if (Pos->Loc == Loc) { + setDiagnosticMappingInternal(Diag, Map, Pos->State, true, isPragma); + return; } - CurDiagID = ~0U; + // Create a new state/point and fit it into the vector of DiagStatePoints + // so that the vector is always ordered according to location. + Pos->Loc.isBeforeInTranslationUnitThan(Loc); + DiagStates.push_back(*Pos->State); + DiagState *NewState = &DiagStates.back(); + setDiagnosticMappingInternal(Diag, Map, NewState, true, isPragma); + DiagStatePoints.insert(Pos+1, DiagStatePoint(NewState, + FullSourceLoc(Loc, *SourceMgr))); +} - return true; +void DiagnosticBuilder::FlushCounts() { + DiagObj->NumDiagArgs = NumArgs; + DiagObj->NumDiagRanges = NumRanges; + DiagObj->NumFixItHints = NumFixItHints; } bool DiagnosticBuilder::Emit() { @@ -632,9 +218,7 @@ bool DiagnosticBuilder::Emit() { // When emitting diagnostics, we set the final argument count into // the Diagnostic object. - DiagObj->NumDiagArgs = NumArgs; - DiagObj->NumDiagRanges = NumRanges; - DiagObj->NumFixItHints = NumFixItHints; + FlushCounts(); // Process the diagnostic, sending the accumulated information to the // DiagnosticClient. @@ -657,6 +241,16 @@ bool DiagnosticBuilder::Emit() { DiagnosticClient::~DiagnosticClient() {} +void DiagnosticClient::HandleDiagnostic(Diagnostic::Level DiagLevel, + const DiagnosticInfo &Info) { + if (!IncludeInDiagnosticCounts()) + return; + + if (DiagLevel == Diagnostic::Warning) + ++NumWarnings; + else if (DiagLevel >= Diagnostic::Error) + ++NumErrors; +} /// ModifierIs - Return true if the specified modifier matches specified string. template <std::size_t StrLen> @@ -855,7 +449,7 @@ static bool EvalPluralExpr(unsigned ValNo, const char *Start, const char *End) { /// {1:form0|[2,4]:form1|:form2} /// Polish (requires repeated form): /// {1:form0|%100=[10,20]:form2|%10=[2,4]:form1|:form2} -static void HandlePluralModifier(unsigned ValNo, +static void HandlePluralModifier(const DiagnosticInfo &DInfo, unsigned ValNo, const char *Argument, unsigned ArgumentLen, llvm::SmallVectorImpl<char> &OutStr) { const char *ArgumentEnd = Argument + ArgumentLen; @@ -869,7 +463,10 @@ static void HandlePluralModifier(unsigned ValNo, if (EvalPluralExpr(ValNo, Argument, ExprEnd)) { Argument = ExprEnd + 1; ExprEnd = ScanFormat(Argument, ArgumentEnd, '|'); - OutStr.append(Argument, ExprEnd); + + // Recursively format the result of the plural clause into the + // output string. + DInfo.FormatDiagnostic(Argument, ExprEnd, OutStr); return; } Argument = ScanFormat(Argument, ArgumentEnd - 1, '|') + 1; @@ -882,7 +479,7 @@ static void HandlePluralModifier(unsigned ValNo, /// array. void DiagnosticInfo:: FormatDiagnostic(llvm::SmallVectorImpl<char> &OutStr) const { - const char *DiagStr = getDiags()->getDescription(getID()); + const char *DiagStr = getDiags()->getDiagnosticIDs()->getDescription(getID()); const char *DiagEnd = DiagStr+strlen(DiagStr); FormatDiagnostic(DiagStr, DiagEnd, OutStr); @@ -971,11 +568,13 @@ FormatDiagnostic(const char *DiagStr, const char *DiagEnd, int Val = getArgSInt(ArgNo); if (ModifierIs(Modifier, ModifierLen, "select")) { - HandleSelectModifier(*this, (unsigned)Val, Argument, ArgumentLen, OutStr); + HandleSelectModifier(*this, (unsigned)Val, Argument, ArgumentLen, + OutStr); } else if (ModifierIs(Modifier, ModifierLen, "s")) { HandleIntegerSModifier(Val, OutStr); } else if (ModifierIs(Modifier, ModifierLen, "plural")) { - HandlePluralModifier((unsigned)Val, Argument, ArgumentLen, OutStr); + HandlePluralModifier(*this, (unsigned)Val, Argument, ArgumentLen, + OutStr); } else if (ModifierIs(Modifier, ModifierLen, "ordinal")) { HandleOrdinalModifier((unsigned)Val, OutStr); } else { @@ -992,7 +591,8 @@ FormatDiagnostic(const char *DiagStr, const char *DiagEnd, } else if (ModifierIs(Modifier, ModifierLen, "s")) { HandleIntegerSModifier(Val, OutStr); } else if (ModifierIs(Modifier, ModifierLen, "plural")) { - HandlePluralModifier((unsigned)Val, Argument, ArgumentLen, OutStr); + HandlePluralModifier(*this, (unsigned)Val, Argument, ArgumentLen, + OutStr); } else if (ModifierIs(Modifier, ModifierLen, "ordinal")) { HandleOrdinalModifier(Val, OutStr); } else { @@ -1043,13 +643,18 @@ FormatDiagnostic(const char *DiagStr, const char *DiagEnd, StoredDiagnostic::StoredDiagnostic() { } -StoredDiagnostic::StoredDiagnostic(Diagnostic::Level Level, +StoredDiagnostic::StoredDiagnostic(Diagnostic::Level Level, unsigned ID, llvm::StringRef Message) - : Level(Level), Loc(), Message(Message) { } + : ID(ID), Level(Level), Loc(), Message(Message) { } StoredDiagnostic::StoredDiagnostic(Diagnostic::Level Level, const DiagnosticInfo &Info) - : Level(Level), Loc(Info.getLocation()) { + : ID(Info.getID()), Level(Level) +{ + assert((Info.getLocation().isInvalid() || Info.hasSourceManager()) && + "Valid source location without setting a source manager for diagnostic"); + if (Info.getLocation().isValid()) + Loc = FullSourceLoc(Info.getLocation(), Info.getSourceManager()); llvm::SmallString<64> Message; Info.FormatDiagnostic(Message); this->Message.assign(Message.begin(), Message.end()); @@ -1065,251 +670,6 @@ StoredDiagnostic::StoredDiagnostic(Diagnostic::Level Level, StoredDiagnostic::~StoredDiagnostic() { } -static void WriteUnsigned(llvm::raw_ostream &OS, unsigned Value) { - OS.write((const char *)&Value, sizeof(unsigned)); -} - -static void WriteString(llvm::raw_ostream &OS, llvm::StringRef String) { - WriteUnsigned(OS, String.size()); - OS.write(String.data(), String.size()); -} - -static void WriteSourceLocation(llvm::raw_ostream &OS, - SourceManager *SM, - SourceLocation Location) { - if (!SM || Location.isInvalid()) { - // If we don't have a source manager or this location is invalid, - // just write an invalid location. - WriteUnsigned(OS, 0); - WriteUnsigned(OS, 0); - WriteUnsigned(OS, 0); - return; - } - - Location = SM->getInstantiationLoc(Location); - std::pair<FileID, unsigned> Decomposed = SM->getDecomposedLoc(Location); - - const FileEntry *FE = SM->getFileEntryForID(Decomposed.first); - if (FE) - WriteString(OS, FE->getName()); - else { - // Fallback to using the buffer name when there is no entry. - WriteString(OS, SM->getBuffer(Decomposed.first)->getBufferIdentifier()); - } - - WriteUnsigned(OS, SM->getLineNumber(Decomposed.first, Decomposed.second)); - WriteUnsigned(OS, SM->getColumnNumber(Decomposed.first, Decomposed.second)); -} - -void StoredDiagnostic::Serialize(llvm::raw_ostream &OS) const { - SourceManager *SM = 0; - if (getLocation().isValid()) - SM = &const_cast<SourceManager &>(getLocation().getManager()); - - // Write a short header to help identify diagnostics. - OS << (char)0x06 << (char)0x07; - - // Write the diagnostic level and location. - WriteUnsigned(OS, (unsigned)Level); - WriteSourceLocation(OS, SM, getLocation()); - - // Write the diagnostic message. - llvm::SmallString<64> Message; - WriteString(OS, getMessage()); - - // Count the number of ranges that don't point into macros, since - // only simple file ranges serialize well. - unsigned NumNonMacroRanges = 0; - for (range_iterator R = range_begin(), REnd = range_end(); R != REnd; ++R) { - if (R->getBegin().isMacroID() || R->getEnd().isMacroID()) - continue; - - ++NumNonMacroRanges; - } - - // Write the ranges. - WriteUnsigned(OS, NumNonMacroRanges); - if (NumNonMacroRanges) { - for (range_iterator R = range_begin(), REnd = range_end(); R != REnd; ++R) { - if (R->getBegin().isMacroID() || R->getEnd().isMacroID()) - continue; - - WriteSourceLocation(OS, SM, R->getBegin()); - WriteSourceLocation(OS, SM, R->getEnd()); - WriteUnsigned(OS, R->isTokenRange()); - } - } - - // Determine if all of the fix-its involve rewrites with simple file - // locations (not in macro instantiations). If so, we can write - // fix-it information. - unsigned NumFixIts = 0; - for (fixit_iterator F = fixit_begin(), FEnd = fixit_end(); F != FEnd; ++F) { - if (F->RemoveRange.isValid() && - (F->RemoveRange.getBegin().isMacroID() || - F->RemoveRange.getEnd().isMacroID())) { - NumFixIts = 0; - break; - } - - ++NumFixIts; - } - - // Write the fix-its. - WriteUnsigned(OS, NumFixIts); - for (fixit_iterator F = fixit_begin(), FEnd = fixit_end(); F != FEnd; ++F) { - WriteSourceLocation(OS, SM, F->RemoveRange.getBegin()); - WriteSourceLocation(OS, SM, F->RemoveRange.getEnd()); - WriteUnsigned(OS, F->RemoveRange.isTokenRange()); - WriteString(OS, F->CodeToInsert); - } -} - -static bool ReadUnsigned(const char *&Memory, const char *MemoryEnd, - unsigned &Value) { - if (Memory + sizeof(unsigned) > MemoryEnd) - return true; - - memmove(&Value, Memory, sizeof(unsigned)); - Memory += sizeof(unsigned); - return false; -} - -static bool ReadSourceLocation(FileManager &FM, SourceManager &SM, - const char *&Memory, const char *MemoryEnd, - SourceLocation &Location) { - // Read the filename. - unsigned FileNameLen = 0; - if (ReadUnsigned(Memory, MemoryEnd, FileNameLen) || - Memory + FileNameLen > MemoryEnd) - return true; - - llvm::StringRef FileName(Memory, FileNameLen); - Memory += FileNameLen; - - // Read the line, column. - unsigned Line = 0, Column = 0; - if (ReadUnsigned(Memory, MemoryEnd, Line) || - ReadUnsigned(Memory, MemoryEnd, Column)) - return true; - - if (FileName.empty()) { - Location = SourceLocation(); - return false; - } - - const FileEntry *File = FM.getFile(FileName); - if (!File) - return true; - - // Make sure that this file has an entry in the source manager. - if (!SM.hasFileInfo(File)) - SM.createFileID(File, SourceLocation(), SrcMgr::C_User); - - Location = SM.getLocation(File, Line, Column); - return false; -} - -StoredDiagnostic -StoredDiagnostic::Deserialize(FileManager &FM, SourceManager &SM, - const char *&Memory, const char *MemoryEnd) { - while (true) { - if (Memory == MemoryEnd) - return StoredDiagnostic(); - - if (*Memory != 0x06) { - ++Memory; - continue; - } - - ++Memory; - if (Memory == MemoryEnd) - return StoredDiagnostic(); - - if (*Memory != 0x07) { - ++Memory; - continue; - } - - // We found the header. We're done. - ++Memory; - break; - } - - // Read the severity level. - unsigned Level = 0; - if (ReadUnsigned(Memory, MemoryEnd, Level) || Level > Diagnostic::Fatal) - return StoredDiagnostic(); - - // Read the source location. - SourceLocation Location; - if (ReadSourceLocation(FM, SM, Memory, MemoryEnd, Location)) - return StoredDiagnostic(); - - // Read the diagnostic text. - if (Memory == MemoryEnd) - return StoredDiagnostic(); - - unsigned MessageLen = 0; - if (ReadUnsigned(Memory, MemoryEnd, MessageLen) || - Memory + MessageLen > MemoryEnd) - return StoredDiagnostic(); - - llvm::StringRef Message(Memory, MessageLen); - Memory += MessageLen; - - - // At this point, we have enough information to form a diagnostic. Do so. - StoredDiagnostic Diag; - Diag.Level = (Diagnostic::Level)Level; - Diag.Loc = FullSourceLoc(Location, SM); - Diag.Message = Message; - if (Memory == MemoryEnd) - return Diag; - - // Read the source ranges. - unsigned NumSourceRanges = 0; - if (ReadUnsigned(Memory, MemoryEnd, NumSourceRanges)) - return Diag; - for (unsigned I = 0; I != NumSourceRanges; ++I) { - SourceLocation Begin, End; - unsigned IsTokenRange; - if (ReadSourceLocation(FM, SM, Memory, MemoryEnd, Begin) || - ReadSourceLocation(FM, SM, Memory, MemoryEnd, End) || - ReadUnsigned(Memory, MemoryEnd, IsTokenRange)) - return Diag; - - Diag.Ranges.push_back(CharSourceRange(SourceRange(Begin, End), - IsTokenRange)); - } - - // Read the fix-it hints. - unsigned NumFixIts = 0; - if (ReadUnsigned(Memory, MemoryEnd, NumFixIts)) - return Diag; - for (unsigned I = 0; I != NumFixIts; ++I) { - SourceLocation RemoveBegin, RemoveEnd; - unsigned InsertLen = 0, RemoveIsTokenRange; - if (ReadSourceLocation(FM, SM, Memory, MemoryEnd, RemoveBegin) || - ReadSourceLocation(FM, SM, Memory, MemoryEnd, RemoveEnd) || - ReadUnsigned(Memory, MemoryEnd, RemoveIsTokenRange) || - ReadUnsigned(Memory, MemoryEnd, InsertLen) || - Memory + InsertLen > MemoryEnd) { - Diag.FixIts.clear(); - return Diag; - } - - FixItHint Hint; - Hint.RemoveRange = CharSourceRange(SourceRange(RemoveBegin, RemoveEnd), - RemoveIsTokenRange); - Hint.CodeToInsert.assign(Memory, Memory + InsertLen); - Memory += InsertLen; - Diag.FixIts.push_back(Hint); - } - - return Diag; -} - /// IncludeInDiagnosticCounts - This method (whose default implementation /// returns true) indicates whether the diagnostics handled by this /// DiagnosticClient should be included in the number of diagnostics |
