2006-06-18 13:43:12 +08:00
|
|
|
//===--- Diagnostic.cpp - C Language Family Diagnostic Handling -----------===//
|
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
2007-12-30 03:59:25 +08:00
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
2006-06-18 13:43:12 +08:00
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
|
|
|
// This file implements the Diagnostic-related interfaces.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
2013-02-09 06:30:41 +08:00
|
|
|
#include "clang/Basic/CharInfo.h"
|
2010-04-13 03:54:17 +08:00
|
|
|
#include "clang/Basic/Diagnostic.h"
|
2012-10-24 06:26:28 +08:00
|
|
|
#include "clang/Basic/DiagnosticOptions.h"
|
2008-11-19 15:32:16 +08:00
|
|
|
#include "clang/Basic/IdentifierTable.h"
|
2010-04-13 03:54:17 +08:00
|
|
|
#include "clang/Basic/PartialDiagnostic.h"
|
2012-02-04 21:45:25 +08:00
|
|
|
#include "llvm/ADT/SmallString.h"
|
2012-09-22 09:24:42 +08:00
|
|
|
#include "llvm/ADT/StringExtras.h"
|
2011-03-22 02:40:07 +08:00
|
|
|
#include "llvm/Support/CrashRecoveryContext.h"
|
2015-01-08 09:27:03 +08:00
|
|
|
#include "llvm/Support/Locale.h"
|
2012-12-04 17:13:33 +08:00
|
|
|
#include "llvm/Support/raw_ostream.h"
|
2011-03-22 02:40:07 +08:00
|
|
|
|
2006-06-18 13:43:12 +08:00
|
|
|
using namespace clang;
|
|
|
|
|
2015-06-25 06:02:08 +08:00
|
|
|
const DiagnosticBuilder &clang::operator<<(const DiagnosticBuilder &DB,
|
|
|
|
DiagNullabilityKind nullability) {
|
|
|
|
StringRef string;
|
|
|
|
switch (nullability.first) {
|
|
|
|
case NullabilityKind::NonNull:
|
|
|
|
string = nullability.second ? "'nonnull'" : "'_Nonnull'";
|
|
|
|
break;
|
|
|
|
|
|
|
|
case NullabilityKind::Nullable:
|
|
|
|
string = nullability.second ? "'nullable'" : "'_Nullable'";
|
|
|
|
break;
|
|
|
|
|
|
|
|
case NullabilityKind::Unspecified:
|
|
|
|
string = nullability.second ? "'null_unspecified'" : "'_Null_unspecified'";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
DB.AddString(string);
|
|
|
|
return DB;
|
|
|
|
}
|
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
static void DummyArgToStringFn(DiagnosticsEngine::ArgumentKind AK, intptr_t QT,
|
2014-06-12 13:32:35 +08:00
|
|
|
StringRef Modifier, StringRef Argument,
|
2014-06-12 13:32:27 +08:00
|
|
|
ArrayRef<DiagnosticsEngine::ArgumentValue> PrevArgs,
|
|
|
|
SmallVectorImpl<char> &Output,
|
|
|
|
void *Cookie,
|
|
|
|
ArrayRef<intptr_t> QualTypeVals) {
|
|
|
|
StringRef Str = "<can't format argument>";
|
|
|
|
Output.append(Str.begin(), Str.end());
|
2008-11-23 17:13:29 +08:00
|
|
|
}
|
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
DiagnosticsEngine::DiagnosticsEngine(
|
2014-11-18 07:46:02 +08:00
|
|
|
const IntrusiveRefCntPtr<DiagnosticIDs> &diags, DiagnosticOptions *DiagOpts,
|
|
|
|
DiagnosticConsumer *client, bool ShouldOwnClient)
|
|
|
|
: Diags(diags), DiagOpts(DiagOpts), Client(nullptr), SourceMgr(nullptr) {
|
|
|
|
setClient(client, ShouldOwnClient);
|
2008-11-23 17:21:17 +08:00
|
|
|
ArgToStringFn = DummyArgToStringFn;
|
2014-05-08 14:41:40 +08:00
|
|
|
ArgToStringCookie = nullptr;
|
2009-09-09 23:08:12 +08:00
|
|
|
|
2010-07-31 08:40:00 +08:00
|
|
|
AllExtensionsSilenced = 0;
|
|
|
|
IgnoreAllWarnings = false;
|
|
|
|
WarningsAsErrors = false;
|
2011-08-18 09:12:56 +08:00
|
|
|
EnableAllWarnings = false;
|
2010-07-31 08:40:00 +08:00
|
|
|
ErrorsAsFatal = false;
|
|
|
|
SuppressSystemWarnings = false;
|
|
|
|
SuppressAllDiagnostics = false;
|
2012-06-27 02:18:47 +08:00
|
|
|
ElideType = true;
|
|
|
|
PrintTemplateTree = false;
|
|
|
|
ShowColors = false;
|
2010-07-31 08:40:00 +08:00
|
|
|
ShowOverloads = Ovl_All;
|
2014-06-23 05:58:33 +08:00
|
|
|
ExtBehavior = diag::Severity::Ignored;
|
2010-07-31 08:40:00 +08:00
|
|
|
|
|
|
|
ErrorLimit = 0;
|
|
|
|
TemplateBacktraceLimit = 0;
|
2011-12-17 03:06:07 +08:00
|
|
|
ConstexprBacktraceLimit = 0;
|
2010-07-31 08:40:00 +08:00
|
|
|
|
2010-07-20 05:46:24 +08:00
|
|
|
Reset();
|
2007-12-02 09:09:57 +08:00
|
|
|
}
|
|
|
|
|
2014-12-18 04:23:11 +08:00
|
|
|
DiagnosticsEngine::~DiagnosticsEngine() {
|
|
|
|
// If we own the diagnostic client, destroy it first so that it can access the
|
|
|
|
// engine from its destructor.
|
|
|
|
setClient(nullptr);
|
|
|
|
}
|
|
|
|
|
2011-09-26 07:39:51 +08:00
|
|
|
void DiagnosticsEngine::setClient(DiagnosticConsumer *client,
|
2011-09-26 07:23:43 +08:00
|
|
|
bool ShouldOwnClient) {
|
2014-11-18 07:46:02 +08:00
|
|
|
Owner.reset(ShouldOwnClient ? client : nullptr);
|
2011-02-01 06:04:05 +08:00
|
|
|
Client = client;
|
|
|
|
}
|
2009-07-13 05:18:45 +08:00
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
void DiagnosticsEngine::pushMappings(SourceLocation Loc) {
|
2010-12-16 02:44:22 +08:00
|
|
|
DiagStateOnPushStack.push_back(GetCurDiagState());
|
2009-07-13 05:18:45 +08:00
|
|
|
}
|
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
bool DiagnosticsEngine::popMappings(SourceLocation Loc) {
|
2010-12-16 02:44:22 +08:00
|
|
|
if (DiagStateOnPushStack.empty())
|
2009-07-13 05:18:45 +08:00
|
|
|
return false;
|
|
|
|
|
2010-12-16 02:44:22 +08:00
|
|
|
if (DiagStateOnPushStack.back() != GetCurDiagState()) {
|
|
|
|
// State changed at some point between push/pop.
|
|
|
|
PushDiagStatePoint(DiagStateOnPushStack.back(), Loc);
|
|
|
|
}
|
|
|
|
DiagStateOnPushStack.pop_back();
|
2009-07-13 05:18:45 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
void DiagnosticsEngine::Reset() {
|
2010-07-20 05:46:24 +08:00
|
|
|
ErrorOccurred = false;
|
2012-12-08 06:53:48 +08:00
|
|
|
UncompilableErrorOccurred = false;
|
2010-07-20 05:46:24 +08:00
|
|
|
FatalErrorOccurred = false;
|
2011-07-07 01:40:26 +08:00
|
|
|
UnrecoverableErrorOccurred = false;
|
2010-07-20 05:46:24 +08:00
|
|
|
|
|
|
|
NumWarnings = 0;
|
|
|
|
NumErrors = 0;
|
2011-07-29 09:25:44 +08:00
|
|
|
TrapNumErrorsOccurred = 0;
|
|
|
|
TrapNumUnrecoverableErrorsOccurred = 0;
|
2011-07-07 01:40:26 +08:00
|
|
|
|
2010-07-20 05:46:24 +08:00
|
|
|
CurDiagID = ~0U;
|
2012-12-20 10:22:15 +08:00
|
|
|
LastDiagLevel = DiagnosticIDs::Ignored;
|
2010-07-20 05:46:24 +08:00
|
|
|
DelayedDiagID = 0;
|
2011-03-27 02:58:17 +08:00
|
|
|
|
|
|
|
// Clear state related to #pragma diagnostic.
|
|
|
|
DiagStates.clear();
|
|
|
|
DiagStatePoints.clear();
|
|
|
|
DiagStateOnPushStack.clear();
|
|
|
|
|
|
|
|
// Create a DiagState and DiagStatePoint representing diagnostic changes
|
|
|
|
// through command-line.
|
2015-05-30 03:42:19 +08:00
|
|
|
DiagStates.emplace_back();
|
2012-08-14 12:19:29 +08:00
|
|
|
DiagStatePoints.push_back(DiagStatePoint(&DiagStates.back(), FullSourceLoc()));
|
2010-07-20 05:46:24 +08:00
|
|
|
}
|
2006-06-18 13:43:12 +08:00
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
void DiagnosticsEngine::SetDelayedDiagnostic(unsigned DiagID, StringRef Arg1,
|
2012-02-08 07:24:49 +08:00
|
|
|
StringRef Arg2) {
|
2010-03-22 23:10:57 +08:00
|
|
|
if (DelayedDiagID)
|
|
|
|
return;
|
|
|
|
|
|
|
|
DelayedDiagID = DiagID;
|
2010-03-22 23:47:45 +08:00
|
|
|
DelayedDiagArg1 = Arg1.str();
|
|
|
|
DelayedDiagArg2 = Arg2.str();
|
2010-03-22 23:10:57 +08:00
|
|
|
}
|
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
void DiagnosticsEngine::ReportDelayed() {
|
2010-03-22 23:10:57 +08:00
|
|
|
Report(DelayedDiagID) << DelayedDiagArg1 << DelayedDiagArg2;
|
|
|
|
DelayedDiagID = 0;
|
|
|
|
DelayedDiagArg1.clear();
|
|
|
|
DelayedDiagArg2.clear();
|
|
|
|
}
|
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
DiagnosticsEngine::DiagStatePointsTy::iterator
|
|
|
|
DiagnosticsEngine::GetDiagStatePointForLoc(SourceLocation L) const {
|
2010-12-16 02:44:22 +08:00
|
|
|
assert(!DiagStatePoints.empty());
|
|
|
|
assert(DiagStatePoints.front().Loc.isInvalid() &&
|
|
|
|
"Should have created a DiagStatePoint for command-line");
|
|
|
|
|
2012-08-17 08:55:32 +08:00
|
|
|
if (!SourceMgr)
|
|
|
|
return DiagStatePoints.end() - 1;
|
|
|
|
|
2010-12-16 02:44:22 +08:00
|
|
|
FullSourceLoc Loc(L, *SourceMgr);
|
|
|
|
if (Loc.isInvalid())
|
|
|
|
return DiagStatePoints.end() - 1;
|
|
|
|
|
|
|
|
DiagStatePointsTy::iterator Pos = DiagStatePoints.end();
|
|
|
|
FullSourceLoc LastStateChangePos = DiagStatePoints.back().Loc;
|
|
|
|
if (LastStateChangePos.isValid() &&
|
|
|
|
Loc.isBeforeInTranslationUnitThan(LastStateChangePos))
|
|
|
|
Pos = std::upper_bound(DiagStatePoints.begin(), DiagStatePoints.end(),
|
2014-05-08 14:41:40 +08:00
|
|
|
DiagStatePoint(nullptr, Loc));
|
2010-12-16 02:44:22 +08:00
|
|
|
--Pos;
|
|
|
|
return Pos;
|
|
|
|
}
|
|
|
|
|
2014-06-12 19:13:52 +08:00
|
|
|
void DiagnosticsEngine::setSeverity(diag::kind Diag, diag::Severity Map,
|
|
|
|
SourceLocation L) {
|
2010-12-16 02:44:22 +08:00
|
|
|
assert(Diag < diag::DIAG_UPPER_LIMIT &&
|
|
|
|
"Can only map builtin diagnostics");
|
|
|
|
assert((Diags->isBuiltinWarningOrExtension(Diag) ||
|
2014-06-12 18:15:20 +08:00
|
|
|
(Map == diag::Severity::Fatal || Map == diag::Severity::Error)) &&
|
2010-12-16 02:44:22 +08:00
|
|
|
"Cannot map errors into warnings!");
|
|
|
|
assert(!DiagStatePoints.empty());
|
2012-08-15 06:37:22 +08:00
|
|
|
assert((L.isInvalid() || SourceMgr) && "No SourceMgr for valid location");
|
2010-12-16 02:44:22 +08:00
|
|
|
|
2012-08-15 06:37:22 +08:00
|
|
|
FullSourceLoc Loc = SourceMgr? FullSourceLoc(L, *SourceMgr) : FullSourceLoc();
|
2010-12-16 02:44:22 +08:00
|
|
|
FullSourceLoc LastStateChangePos = DiagStatePoints.back().Loc;
|
2012-02-03 09:49:51 +08:00
|
|
|
// Don't allow a mapping to a warning override an error/fatal mapping.
|
2014-06-12 18:15:20 +08:00
|
|
|
if (Map == diag::Severity::Warning) {
|
2014-06-10 17:31:37 +08:00
|
|
|
DiagnosticMapping &Info = GetCurDiagState()->getOrAddMapping(Diag);
|
2014-06-12 18:15:20 +08:00
|
|
|
if (Info.getSeverity() == diag::Severity::Error ||
|
|
|
|
Info.getSeverity() == diag::Severity::Fatal)
|
2014-06-10 17:31:37 +08:00
|
|
|
Map = Info.getSeverity();
|
2012-02-03 09:49:51 +08:00
|
|
|
}
|
2014-06-10 17:31:37 +08:00
|
|
|
DiagnosticMapping Mapping = makeUserMapping(Map, L);
|
2011-10-05 05:17:24 +08:00
|
|
|
|
2010-12-16 02:44:22 +08:00
|
|
|
// Common case; setting all the diagnostics of a group in one place.
|
|
|
|
if (Loc.isInvalid() || Loc == LastStateChangePos) {
|
2014-06-10 17:31:37 +08:00
|
|
|
GetCurDiagState()->setMapping(Diag, Mapping);
|
2010-12-16 02:44:22 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Another common case; modifying diagnostic state in a source location
|
|
|
|
// after the previous one.
|
|
|
|
if ((Loc.isValid() && LastStateChangePos.isInvalid()) ||
|
|
|
|
LastStateChangePos.isBeforeInTranslationUnitThan(Loc)) {
|
2011-04-15 13:22:18 +08:00
|
|
|
// A diagnostic pragma occurred, create a new DiagState initialized with
|
2010-12-16 02:44:22 +08:00
|
|
|
// 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);
|
2014-06-10 17:31:37 +08:00
|
|
|
GetCurDiagState()->setMapping(Diag, Mapping);
|
2010-12-16 02:44:22 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// We allow setting the diagnostic state in random source order for
|
|
|
|
// completeness but it should not be actually happening in normal practice.
|
|
|
|
|
|
|
|
DiagStatePointsTy::iterator Pos = GetDiagStatePointForLoc(Loc);
|
|
|
|
assert(Pos != DiagStatePoints.end());
|
|
|
|
|
|
|
|
// Update all diagnostic states that are active after the given location.
|
|
|
|
for (DiagStatePointsTy::iterator
|
|
|
|
I = Pos+1, E = DiagStatePoints.end(); I != E; ++I) {
|
2015-11-26 13:51:54 +08:00
|
|
|
I->State->setMapping(Diag, Mapping);
|
2010-12-16 02:44:22 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// If the location corresponds to an existing point, just update its state.
|
|
|
|
if (Pos->Loc == Loc) {
|
2015-11-26 13:51:54 +08:00
|
|
|
Pos->State->setMapping(Diag, Mapping);
|
2010-12-16 02:44:22 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create a new state/point and fit it into the vector of DiagStatePoints
|
|
|
|
// so that the vector is always ordered according to location.
|
2014-01-26 16:12:32 +08:00
|
|
|
assert(Pos->Loc.isBeforeInTranslationUnitThan(Loc));
|
2010-12-16 02:44:22 +08:00
|
|
|
DiagStates.push_back(*Pos->State);
|
|
|
|
DiagState *NewState = &DiagStates.back();
|
2015-11-26 13:51:54 +08:00
|
|
|
NewState->setMapping(Diag, Mapping);
|
2010-12-16 02:44:22 +08:00
|
|
|
DiagStatePoints.insert(Pos+1, DiagStatePoint(NewState,
|
|
|
|
FullSourceLoc(Loc, *SourceMgr)));
|
|
|
|
}
|
|
|
|
|
Use -Rblah, not -Wblah, to control remark diagnostics. This was always the
intent when we added remark support, but was never implemented in the general
case, because the first -R flags didn't need it. (-Rpass= had special handling
to accomodate its argument.)
-Rno-foo, -Reverything, and -Rno-everything can be used to turn off a remark,
or to turn on or off all remarks. Per discussion on cfe-commits, -Weverything
does not affect remarks, and -Reverything does not affect warnings or errors.
The only "real" -R flag we have right now is -Rmodule-build; that flag is
effectively renamed from -Wmodule-build to -Rmodule-build by this change.
-Wpass and -Wno-pass (and their friends) are also renamed to -Rpass and
-Rno-pass by this change; it's not completely clear whether we intended to have
a -Rpass (with no =pattern), but that is unchanged by this commit, other than
the flag name. The default pattern is effectively one which matches no passes.
In future, we may want to make the default pattern be .*, so that -Reverything
works for -Rpass properly.
llvm-svn: 215046
2014-08-07 08:24:21 +08:00
|
|
|
bool DiagnosticsEngine::setSeverityForGroup(diag::Flavor Flavor,
|
|
|
|
StringRef Group, diag::Severity Map,
|
2014-06-12 19:13:52 +08:00
|
|
|
SourceLocation Loc) {
|
2011-09-29 09:47:16 +08:00
|
|
|
// Get the diagnostics in this group.
|
2014-08-12 00:05:54 +08:00
|
|
|
SmallVector<diag::kind, 256> GroupDiags;
|
Use -Rblah, not -Wblah, to control remark diagnostics. This was always the
intent when we added remark support, but was never implemented in the general
case, because the first -R flags didn't need it. (-Rpass= had special handling
to accomodate its argument.)
-Rno-foo, -Reverything, and -Rno-everything can be used to turn off a remark,
or to turn on or off all remarks. Per discussion on cfe-commits, -Weverything
does not affect remarks, and -Reverything does not affect warnings or errors.
The only "real" -R flag we have right now is -Rmodule-build; that flag is
effectively renamed from -Wmodule-build to -Rmodule-build by this change.
-Wpass and -Wno-pass (and their friends) are also renamed to -Rpass and
-Rno-pass by this change; it's not completely clear whether we intended to have
a -Rpass (with no =pattern), but that is unchanged by this commit, other than
the flag name. The default pattern is effectively one which matches no passes.
In future, we may want to make the default pattern be .*, so that -Reverything
works for -Rpass properly.
llvm-svn: 215046
2014-08-07 08:24:21 +08:00
|
|
|
if (Diags->getDiagnosticsInGroup(Flavor, Group, GroupDiags))
|
2011-09-29 09:47:16 +08:00
|
|
|
return true;
|
|
|
|
|
|
|
|
// Set the mapping.
|
2014-08-12 00:05:54 +08:00
|
|
|
for (diag::kind Diag : GroupDiags)
|
|
|
|
setSeverity(Diag, Map, Loc);
|
2011-09-29 09:47:16 +08:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2011-09-29 08:53:47 +08:00
|
|
|
bool DiagnosticsEngine::setDiagnosticGroupWarningAsError(StringRef Group,
|
|
|
|
bool Enabled) {
|
2011-09-29 09:52:06 +08:00
|
|
|
// If we are enabling this feature, just set the diagnostic mappings to map to
|
|
|
|
// errors.
|
|
|
|
if (Enabled)
|
Use -Rblah, not -Wblah, to control remark diagnostics. This was always the
intent when we added remark support, but was never implemented in the general
case, because the first -R flags didn't need it. (-Rpass= had special handling
to accomodate its argument.)
-Rno-foo, -Reverything, and -Rno-everything can be used to turn off a remark,
or to turn on or off all remarks. Per discussion on cfe-commits, -Weverything
does not affect remarks, and -Reverything does not affect warnings or errors.
The only "real" -R flag we have right now is -Rmodule-build; that flag is
effectively renamed from -Wmodule-build to -Rmodule-build by this change.
-Wpass and -Wno-pass (and their friends) are also renamed to -Rpass and
-Rno-pass by this change; it's not completely clear whether we intended to have
a -Rpass (with no =pattern), but that is unchanged by this commit, other than
the flag name. The default pattern is effectively one which matches no passes.
In future, we may want to make the default pattern be .*, so that -Reverything
works for -Rpass properly.
llvm-svn: 215046
2014-08-07 08:24:21 +08:00
|
|
|
return setSeverityForGroup(diag::Flavor::WarningOrError, Group,
|
|
|
|
diag::Severity::Error);
|
2011-09-29 09:52:06 +08:00
|
|
|
|
|
|
|
// Otherwise, we want to set the diagnostic mapping's "no Werror" bit, and
|
|
|
|
// potentially downgrade anything already mapped to be a warning.
|
|
|
|
|
|
|
|
// Get the diagnostics in this group.
|
2013-01-13 03:30:44 +08:00
|
|
|
SmallVector<diag::kind, 8> GroupDiags;
|
Use -Rblah, not -Wblah, to control remark diagnostics. This was always the
intent when we added remark support, but was never implemented in the general
case, because the first -R flags didn't need it. (-Rpass= had special handling
to accomodate its argument.)
-Rno-foo, -Reverything, and -Rno-everything can be used to turn off a remark,
or to turn on or off all remarks. Per discussion on cfe-commits, -Weverything
does not affect remarks, and -Reverything does not affect warnings or errors.
The only "real" -R flag we have right now is -Rmodule-build; that flag is
effectively renamed from -Wmodule-build to -Rmodule-build by this change.
-Wpass and -Wno-pass (and their friends) are also renamed to -Rpass and
-Rno-pass by this change; it's not completely clear whether we intended to have
a -Rpass (with no =pattern), but that is unchanged by this commit, other than
the flag name. The default pattern is effectively one which matches no passes.
In future, we may want to make the default pattern be .*, so that -Reverything
works for -Rpass properly.
llvm-svn: 215046
2014-08-07 08:24:21 +08:00
|
|
|
if (Diags->getDiagnosticsInGroup(diag::Flavor::WarningOrError, Group,
|
|
|
|
GroupDiags))
|
2011-09-29 09:52:06 +08:00
|
|
|
return true;
|
|
|
|
|
|
|
|
// Perform the mapping change.
|
2015-11-26 13:10:07 +08:00
|
|
|
for (diag::kind Diag : GroupDiags) {
|
|
|
|
DiagnosticMapping &Info = GetCurDiagState()->getOrAddMapping(Diag);
|
2011-09-29 09:52:06 +08:00
|
|
|
|
2014-06-12 18:15:20 +08:00
|
|
|
if (Info.getSeverity() == diag::Severity::Error ||
|
|
|
|
Info.getSeverity() == diag::Severity::Fatal)
|
|
|
|
Info.setSeverity(diag::Severity::Warning);
|
2011-09-29 09:58:05 +08:00
|
|
|
|
2011-09-29 09:52:06 +08:00
|
|
|
Info.setNoWarningAsError(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
2011-09-29 08:53:47 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
bool DiagnosticsEngine::setDiagnosticGroupErrorAsFatal(StringRef Group,
|
|
|
|
bool Enabled) {
|
2011-09-29 09:52:06 +08:00
|
|
|
// If we are enabling this feature, just set the diagnostic mappings to map to
|
|
|
|
// fatal errors.
|
|
|
|
if (Enabled)
|
Use -Rblah, not -Wblah, to control remark diagnostics. This was always the
intent when we added remark support, but was never implemented in the general
case, because the first -R flags didn't need it. (-Rpass= had special handling
to accomodate its argument.)
-Rno-foo, -Reverything, and -Rno-everything can be used to turn off a remark,
or to turn on or off all remarks. Per discussion on cfe-commits, -Weverything
does not affect remarks, and -Reverything does not affect warnings or errors.
The only "real" -R flag we have right now is -Rmodule-build; that flag is
effectively renamed from -Wmodule-build to -Rmodule-build by this change.
-Wpass and -Wno-pass (and their friends) are also renamed to -Rpass and
-Rno-pass by this change; it's not completely clear whether we intended to have
a -Rpass (with no =pattern), but that is unchanged by this commit, other than
the flag name. The default pattern is effectively one which matches no passes.
In future, we may want to make the default pattern be .*, so that -Reverything
works for -Rpass properly.
llvm-svn: 215046
2014-08-07 08:24:21 +08:00
|
|
|
return setSeverityForGroup(diag::Flavor::WarningOrError, Group,
|
|
|
|
diag::Severity::Fatal);
|
2011-09-29 09:52:06 +08:00
|
|
|
|
|
|
|
// Otherwise, we want to set the diagnostic mapping's "no Werror" bit, and
|
|
|
|
// potentially downgrade anything already mapped to be an error.
|
|
|
|
|
|
|
|
// Get the diagnostics in this group.
|
2013-01-13 03:30:44 +08:00
|
|
|
SmallVector<diag::kind, 8> GroupDiags;
|
Use -Rblah, not -Wblah, to control remark diagnostics. This was always the
intent when we added remark support, but was never implemented in the general
case, because the first -R flags didn't need it. (-Rpass= had special handling
to accomodate its argument.)
-Rno-foo, -Reverything, and -Rno-everything can be used to turn off a remark,
or to turn on or off all remarks. Per discussion on cfe-commits, -Weverything
does not affect remarks, and -Reverything does not affect warnings or errors.
The only "real" -R flag we have right now is -Rmodule-build; that flag is
effectively renamed from -Wmodule-build to -Rmodule-build by this change.
-Wpass and -Wno-pass (and their friends) are also renamed to -Rpass and
-Rno-pass by this change; it's not completely clear whether we intended to have
a -Rpass (with no =pattern), but that is unchanged by this commit, other than
the flag name. The default pattern is effectively one which matches no passes.
In future, we may want to make the default pattern be .*, so that -Reverything
works for -Rpass properly.
llvm-svn: 215046
2014-08-07 08:24:21 +08:00
|
|
|
if (Diags->getDiagnosticsInGroup(diag::Flavor::WarningOrError, Group,
|
|
|
|
GroupDiags))
|
2011-09-29 09:52:06 +08:00
|
|
|
return true;
|
|
|
|
|
|
|
|
// Perform the mapping change.
|
2015-11-26 13:10:07 +08:00
|
|
|
for (diag::kind Diag : GroupDiags) {
|
|
|
|
DiagnosticMapping &Info = GetCurDiagState()->getOrAddMapping(Diag);
|
2011-09-29 09:52:06 +08:00
|
|
|
|
2014-06-12 18:15:20 +08:00
|
|
|
if (Info.getSeverity() == diag::Severity::Fatal)
|
|
|
|
Info.setSeverity(diag::Severity::Error);
|
2011-09-29 09:58:05 +08:00
|
|
|
|
2011-09-29 09:52:06 +08:00
|
|
|
Info.setNoErrorAsFatal(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
2011-09-29 08:53:47 +08:00
|
|
|
}
|
|
|
|
|
Use -Rblah, not -Wblah, to control remark diagnostics. This was always the
intent when we added remark support, but was never implemented in the general
case, because the first -R flags didn't need it. (-Rpass= had special handling
to accomodate its argument.)
-Rno-foo, -Reverything, and -Rno-everything can be used to turn off a remark,
or to turn on or off all remarks. Per discussion on cfe-commits, -Weverything
does not affect remarks, and -Reverything does not affect warnings or errors.
The only "real" -R flag we have right now is -Rmodule-build; that flag is
effectively renamed from -Wmodule-build to -Rmodule-build by this change.
-Wpass and -Wno-pass (and their friends) are also renamed to -Rpass and
-Rno-pass by this change; it's not completely clear whether we intended to have
a -Rpass (with no =pattern), but that is unchanged by this commit, other than
the flag name. The default pattern is effectively one which matches no passes.
In future, we may want to make the default pattern be .*, so that -Reverything
works for -Rpass properly.
llvm-svn: 215046
2014-08-07 08:24:21 +08:00
|
|
|
void DiagnosticsEngine::setSeverityForAll(diag::Flavor Flavor,
|
|
|
|
diag::Severity Map,
|
2014-06-12 19:13:52 +08:00
|
|
|
SourceLocation Loc) {
|
2012-01-27 14:15:43 +08:00
|
|
|
// Get all the diagnostics.
|
2013-01-13 03:30:44 +08:00
|
|
|
SmallVector<diag::kind, 64> AllDiags;
|
Use -Rblah, not -Wblah, to control remark diagnostics. This was always the
intent when we added remark support, but was never implemented in the general
case, because the first -R flags didn't need it. (-Rpass= had special handling
to accomodate its argument.)
-Rno-foo, -Reverything, and -Rno-everything can be used to turn off a remark,
or to turn on or off all remarks. Per discussion on cfe-commits, -Weverything
does not affect remarks, and -Reverything does not affect warnings or errors.
The only "real" -R flag we have right now is -Rmodule-build; that flag is
effectively renamed from -Wmodule-build to -Rmodule-build by this change.
-Wpass and -Wno-pass (and their friends) are also renamed to -Rpass and
-Rno-pass by this change; it's not completely clear whether we intended to have
a -Rpass (with no =pattern), but that is unchanged by this commit, other than
the flag name. The default pattern is effectively one which matches no passes.
In future, we may want to make the default pattern be .*, so that -Reverything
works for -Rpass properly.
llvm-svn: 215046
2014-08-07 08:24:21 +08:00
|
|
|
Diags->getAllDiagnostics(Flavor, AllDiags);
|
2012-01-27 14:15:43 +08:00
|
|
|
|
|
|
|
// Set the mapping.
|
2015-11-26 13:10:07 +08:00
|
|
|
for (diag::kind Diag : AllDiags)
|
|
|
|
if (Diags->isBuiltinWarningOrExtension(Diag))
|
|
|
|
setSeverity(Diag, Map, Loc);
|
2012-01-27 14:15:43 +08:00
|
|
|
}
|
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
void DiagnosticsEngine::Report(const StoredDiagnostic &storedDiag) {
|
2011-05-05 15:54:59 +08:00
|
|
|
assert(CurDiagID == ~0U && "Multiple diagnostics in flight at once!");
|
|
|
|
|
|
|
|
CurDiagLoc = storedDiag.getLocation();
|
|
|
|
CurDiagID = storedDiag.getID();
|
|
|
|
NumDiagArgs = 0;
|
|
|
|
|
2014-05-23 03:56:11 +08:00
|
|
|
DiagRanges.clear();
|
2015-06-12 23:31:50 +08:00
|
|
|
DiagRanges.append(storedDiag.range_begin(), storedDiag.range_end());
|
2011-05-05 15:54:59 +08:00
|
|
|
|
2014-05-23 03:56:11 +08:00
|
|
|
DiagFixItHints.clear();
|
2015-06-12 23:31:50 +08:00
|
|
|
DiagFixItHints.append(storedDiag.fixit_begin(), storedDiag.fixit_end());
|
2011-05-05 15:54:59 +08:00
|
|
|
|
2011-09-26 07:39:51 +08:00
|
|
|
assert(Client && "DiagnosticConsumer not set!");
|
2011-05-05 15:54:59 +08:00
|
|
|
Level DiagLevel = storedDiag.getLevel();
|
2011-09-26 09:18:08 +08:00
|
|
|
Diagnostic Info(this, storedDiag.getMessage());
|
2011-05-05 15:54:59 +08:00
|
|
|
Client->HandleDiagnostic(DiagLevel, Info);
|
|
|
|
if (Client->IncludeInDiagnosticCounts()) {
|
2011-09-26 07:23:43 +08:00
|
|
|
if (DiagLevel == DiagnosticsEngine::Warning)
|
2011-05-05 15:54:59 +08:00
|
|
|
++NumWarnings;
|
|
|
|
}
|
|
|
|
|
|
|
|
CurDiagID = ~0U;
|
|
|
|
}
|
|
|
|
|
2012-07-12 00:50:36 +08:00
|
|
|
bool DiagnosticsEngine::EmitCurrentDiagnostic(bool Force) {
|
|
|
|
assert(getClient() && "DiagnosticClient not set!");
|
|
|
|
|
|
|
|
bool Emitted;
|
|
|
|
if (Force) {
|
|
|
|
Diagnostic Info(this);
|
|
|
|
|
|
|
|
// Figure out the diagnostic level of this message.
|
|
|
|
DiagnosticIDs::Level DiagLevel
|
|
|
|
= Diags->getDiagnosticLevel(Info.getID(), Info.getLocation(), *this);
|
|
|
|
|
|
|
|
Emitted = (DiagLevel != DiagnosticIDs::Ignored);
|
|
|
|
if (Emitted) {
|
|
|
|
// Emit the diagnostic regardless of suppression level.
|
|
|
|
Diags->EmitDiag(*this, DiagLevel);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// Process the diagnostic, sending the accumulated information to the
|
|
|
|
// DiagnosticConsumer.
|
|
|
|
Emitted = ProcessDiag();
|
|
|
|
}
|
2010-03-22 23:10:57 +08:00
|
|
|
|
|
|
|
// Clear out the current diagnostic object.
|
2012-03-14 05:02:14 +08:00
|
|
|
unsigned DiagID = CurDiagID;
|
|
|
|
Clear();
|
2010-03-22 23:10:57 +08:00
|
|
|
|
|
|
|
// If there was a delayed diagnostic, emit it now.
|
2012-07-12 00:50:36 +08:00
|
|
|
if (!Force && DelayedDiagID && DelayedDiagID != DiagID)
|
2012-03-14 05:02:14 +08:00
|
|
|
ReportDelayed();
|
2010-03-22 23:10:57 +08:00
|
|
|
|
|
|
|
return Emitted;
|
|
|
|
}
|
|
|
|
|
2008-08-11 03:59:06 +08:00
|
|
|
|
2015-10-20 21:23:58 +08:00
|
|
|
DiagnosticConsumer::~DiagnosticConsumer() {}
|
2008-08-11 03:59:06 +08:00
|
|
|
|
2011-09-26 07:39:51 +08:00
|
|
|
void DiagnosticConsumer::HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
|
2011-09-26 09:18:08 +08:00
|
|
|
const Diagnostic &Info) {
|
2010-11-19 04:06:46 +08:00
|
|
|
if (!IncludeInDiagnosticCounts())
|
|
|
|
return;
|
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
if (DiagLevel == DiagnosticsEngine::Warning)
|
2010-11-19 04:06:46 +08:00
|
|
|
++NumWarnings;
|
2011-09-26 07:23:43 +08:00
|
|
|
else if (DiagLevel >= DiagnosticsEngine::Error)
|
2010-11-19 04:06:46 +08:00
|
|
|
++NumErrors;
|
|
|
|
}
|
2008-11-19 14:51:40 +08:00
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
/// ModifierIs - Return true if the specified modifier matches specified string.
|
|
|
|
template <std::size_t StrLen>
|
|
|
|
static bool ModifierIs(const char *Modifier, unsigned ModifierLen,
|
|
|
|
const char (&Str)[StrLen]) {
|
|
|
|
return StrLen-1 == ModifierLen && !memcmp(Modifier, Str, StrLen-1);
|
|
|
|
}
|
|
|
|
|
2010-01-15 04:11:39 +08:00
|
|
|
/// ScanForward - Scans forward, looking for the given character, skipping
|
|
|
|
/// nested clauses and escaped characters.
|
|
|
|
static const char *ScanFormat(const char *I, const char *E, char Target) {
|
|
|
|
unsigned Depth = 0;
|
|
|
|
|
|
|
|
for ( ; I != E; ++I) {
|
|
|
|
if (Depth == 0 && *I == Target) return I;
|
|
|
|
if (Depth != 0 && *I == '}') Depth--;
|
|
|
|
|
|
|
|
if (*I == '%') {
|
|
|
|
I++;
|
|
|
|
if (I == E) break;
|
|
|
|
|
|
|
|
// Escaped characters get implicitly skipped here.
|
|
|
|
|
|
|
|
// Format specifier.
|
2013-02-09 06:30:41 +08:00
|
|
|
if (!isDigit(*I) && !isPunctuation(*I)) {
|
|
|
|
for (I++; I != E && !isDigit(*I) && *I != '{'; I++) ;
|
2010-01-15 04:11:39 +08:00
|
|
|
if (I == E) break;
|
|
|
|
if (*I == '{')
|
|
|
|
Depth++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return E;
|
|
|
|
}
|
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
/// HandleSelectModifier - Handle the integer 'select' modifier. This is used
|
|
|
|
/// like this: %select{foo|bar|baz}2. This means that the integer argument
|
|
|
|
/// "%2" has a value from 0-2. If the value is 0, the diagnostic prints 'foo'.
|
|
|
|
/// If the value is 1, it prints 'bar'. If it has the value 2, it prints 'baz'.
|
|
|
|
/// This is very useful for certain classes of variant diagnostics.
|
2011-09-26 09:18:08 +08:00
|
|
|
static void HandleSelectModifier(const Diagnostic &DInfo, unsigned ValNo,
|
2008-11-21 15:50:02 +08:00
|
|
|
const char *Argument, unsigned ArgumentLen,
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVectorImpl<char> &OutStr) {
|
2008-11-21 15:50:02 +08:00
|
|
|
const char *ArgumentEnd = Argument+ArgumentLen;
|
2009-09-09 23:08:12 +08:00
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
// Skip over 'ValNo' |'s.
|
|
|
|
while (ValNo) {
|
2010-01-15 04:11:39 +08:00
|
|
|
const char *NextVal = ScanFormat(Argument, ArgumentEnd, '|');
|
2008-11-21 15:50:02 +08:00
|
|
|
assert(NextVal != ArgumentEnd && "Value for integer select modifier was"
|
|
|
|
" larger than the number of options in the diagnostic string!");
|
|
|
|
Argument = NextVal+1; // Skip this string.
|
|
|
|
--ValNo;
|
|
|
|
}
|
2009-09-09 23:08:12 +08:00
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
// Get the end of the value. This is either the } or the |.
|
2010-01-15 04:11:39 +08:00
|
|
|
const char *EndPtr = ScanFormat(Argument, ArgumentEnd, '|');
|
2010-01-14 07:58:20 +08:00
|
|
|
|
|
|
|
// Recursively format the result of the select clause into the output string.
|
|
|
|
DInfo.FormatDiagnostic(Argument, EndPtr, OutStr);
|
2008-11-21 15:50:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/// HandleIntegerSModifier - Handle the integer 's' modifier. This adds the
|
|
|
|
/// letter 's' to the string if the value is not 1. This is used in cases like
|
|
|
|
/// this: "you idiot, you have %4 parameter%s4!".
|
|
|
|
static void HandleIntegerSModifier(unsigned ValNo,
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVectorImpl<char> &OutStr) {
|
2008-11-21 15:50:02 +08:00
|
|
|
if (ValNo != 1)
|
|
|
|
OutStr.push_back('s');
|
|
|
|
}
|
|
|
|
|
2010-01-14 08:50:32 +08:00
|
|
|
/// HandleOrdinalModifier - Handle the integer 'ord' modifier. This
|
|
|
|
/// prints the ordinal form of the given integer, with 1 corresponding
|
|
|
|
/// to the first ordinal. Currently this is hard-coded to use the
|
|
|
|
/// English form.
|
|
|
|
static void HandleOrdinalModifier(unsigned ValNo,
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVectorImpl<char> &OutStr) {
|
2010-01-14 08:50:32 +08:00
|
|
|
assert(ValNo != 0 && "ValNo must be strictly positive!");
|
|
|
|
|
|
|
|
llvm::raw_svector_ostream Out(OutStr);
|
|
|
|
|
|
|
|
// We could use text forms for the first N ordinals, but the numeric
|
|
|
|
// forms are actually nicer in diagnostics because they stand out.
|
2012-09-22 09:24:42 +08:00
|
|
|
Out << ValNo << llvm::getOrdinalSuffix(ValNo);
|
2010-01-14 08:50:32 +08:00
|
|
|
}
|
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
|
2008-11-22 21:44:36 +08:00
|
|
|
/// PluralNumber - Parse an unsigned integer and advance Start.
|
2009-04-16 01:13:42 +08:00
|
|
|
static unsigned PluralNumber(const char *&Start, const char *End) {
|
2008-11-22 21:44:36 +08:00
|
|
|
// Programming 101: Parse a decimal number :-)
|
|
|
|
unsigned Val = 0;
|
|
|
|
while (Start != End && *Start >= '0' && *Start <= '9') {
|
|
|
|
Val *= 10;
|
|
|
|
Val += *Start - '0';
|
|
|
|
++Start;
|
|
|
|
}
|
|
|
|
return Val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// TestPluralRange - Test if Val is in the parsed range. Modifies Start.
|
2009-04-16 01:13:42 +08:00
|
|
|
static bool TestPluralRange(unsigned Val, const char *&Start, const char *End) {
|
2008-11-22 21:44:36 +08:00
|
|
|
if (*Start != '[') {
|
|
|
|
unsigned Ref = PluralNumber(Start, End);
|
|
|
|
return Ref == Val;
|
|
|
|
}
|
|
|
|
|
|
|
|
++Start;
|
|
|
|
unsigned Low = PluralNumber(Start, End);
|
|
|
|
assert(*Start == ',' && "Bad plural expression syntax: expected ,");
|
|
|
|
++Start;
|
|
|
|
unsigned High = PluralNumber(Start, End);
|
|
|
|
assert(*Start == ']' && "Bad plural expression syntax: expected )");
|
|
|
|
++Start;
|
|
|
|
return Low <= Val && Val <= High;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// EvalPluralExpr - Actual expression evaluator for HandlePluralModifier.
|
2009-04-16 01:13:42 +08:00
|
|
|
static bool EvalPluralExpr(unsigned ValNo, const char *Start, const char *End) {
|
2008-11-22 21:44:36 +08:00
|
|
|
// Empty condition?
|
|
|
|
if (*Start == ':')
|
|
|
|
return true;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
char C = *Start;
|
|
|
|
if (C == '%') {
|
|
|
|
// Modulo expression
|
|
|
|
++Start;
|
|
|
|
unsigned Arg = PluralNumber(Start, End);
|
|
|
|
assert(*Start == '=' && "Bad plural expression syntax: expected =");
|
|
|
|
++Start;
|
|
|
|
unsigned ValMod = ValNo % Arg;
|
|
|
|
if (TestPluralRange(ValMod, Start, End))
|
|
|
|
return true;
|
|
|
|
} else {
|
2008-11-27 15:28:14 +08:00
|
|
|
assert((C == '[' || (C >= '0' && C <= '9')) &&
|
2008-11-22 21:44:36 +08:00
|
|
|
"Bad plural expression syntax: unexpected character");
|
|
|
|
// Range expression
|
|
|
|
if (TestPluralRange(ValNo, Start, End))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Scan for next or-expr part.
|
|
|
|
Start = std::find(Start, End, ',');
|
2009-09-09 23:08:12 +08:00
|
|
|
if (Start == End)
|
2008-11-22 21:44:36 +08:00
|
|
|
break;
|
|
|
|
++Start;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// HandlePluralModifier - Handle the integer 'plural' modifier. This is used
|
|
|
|
/// for complex plural forms, or in languages where all plurals are complex.
|
|
|
|
/// The syntax is: %plural{cond1:form1|cond2:form2|:form3}, where condn are
|
|
|
|
/// conditions that are tested in order, the form corresponding to the first
|
|
|
|
/// that applies being emitted. The empty condition is always true, making the
|
|
|
|
/// last form a default case.
|
|
|
|
/// Conditions are simple boolean expressions, where n is the number argument.
|
|
|
|
/// Here are the rules.
|
|
|
|
/// condition := expression | empty
|
|
|
|
/// empty := -> always true
|
|
|
|
/// expression := numeric [',' expression] -> logical or
|
|
|
|
/// numeric := range -> true if n in range
|
|
|
|
/// | '%' number '=' range -> true if n % number in range
|
|
|
|
/// range := number
|
|
|
|
/// | '[' number ',' number ']' -> ranges are inclusive both ends
|
|
|
|
///
|
|
|
|
/// Here are some examples from the GNU gettext manual written in this form:
|
|
|
|
/// English:
|
|
|
|
/// {1:form0|:form1}
|
|
|
|
/// Latvian:
|
|
|
|
/// {0:form2|%100=11,%10=0,%10=[2,9]:form1|:form0}
|
|
|
|
/// Gaeilge:
|
|
|
|
/// {1:form0|2:form1|:form2}
|
|
|
|
/// Romanian:
|
|
|
|
/// {1:form0|0,%100=[1,19]:form1|:form2}
|
|
|
|
/// Lithuanian:
|
|
|
|
/// {%10=0,%100=[10,19]:form2|%10=1:form0|:form1}
|
|
|
|
/// Russian (requires repeated form):
|
|
|
|
/// {%100=[11,14]:form2|%10=1:form0|%10=[2,4]:form1|:form2}
|
|
|
|
/// Slovak
|
|
|
|
/// {1:form0|[2,4]:form1|:form2}
|
|
|
|
/// Polish (requires repeated form):
|
|
|
|
/// {1:form0|%100=[10,20]:form2|%10=[2,4]:form1|:form2}
|
2011-09-26 09:18:08 +08:00
|
|
|
static void HandlePluralModifier(const Diagnostic &DInfo, unsigned ValNo,
|
2008-11-22 21:44:36 +08:00
|
|
|
const char *Argument, unsigned ArgumentLen,
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVectorImpl<char> &OutStr) {
|
2008-11-22 21:44:36 +08:00
|
|
|
const char *ArgumentEnd = Argument + ArgumentLen;
|
|
|
|
while (1) {
|
|
|
|
assert(Argument < ArgumentEnd && "Plural expression didn't match.");
|
|
|
|
const char *ExprEnd = Argument;
|
|
|
|
while (*ExprEnd != ':') {
|
|
|
|
assert(ExprEnd != ArgumentEnd && "Plural missing expression end");
|
|
|
|
++ExprEnd;
|
|
|
|
}
|
|
|
|
if (EvalPluralExpr(ValNo, Argument, ExprEnd)) {
|
|
|
|
Argument = ExprEnd + 1;
|
2010-01-15 04:11:39 +08:00
|
|
|
ExprEnd = ScanFormat(Argument, ArgumentEnd, '|');
|
2010-10-14 09:55:31 +08:00
|
|
|
|
|
|
|
// Recursively format the result of the plural clause into the
|
|
|
|
// output string.
|
|
|
|
DInfo.FormatDiagnostic(Argument, ExprEnd, OutStr);
|
2008-11-22 21:44:36 +08:00
|
|
|
return;
|
|
|
|
}
|
2010-01-15 04:11:39 +08:00
|
|
|
Argument = ScanFormat(Argument, ArgumentEnd - 1, '|') + 1;
|
2008-11-22 21:44:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-06 20:54:18 +08:00
|
|
|
/// \brief Returns the friendly description for a token kind that will appear
|
|
|
|
/// without quotes in diagnostic messages. These strings may be translatable in
|
|
|
|
/// future.
|
|
|
|
static const char *getTokenDescForDiagnostic(tok::TokenKind Kind) {
|
2013-12-24 17:48:30 +08:00
|
|
|
switch (Kind) {
|
|
|
|
case tok::identifier:
|
|
|
|
return "identifier";
|
|
|
|
default:
|
2014-05-08 14:41:40 +08:00
|
|
|
return nullptr;
|
2013-12-24 17:48:30 +08:00
|
|
|
}
|
|
|
|
}
|
2008-11-22 21:44:36 +08:00
|
|
|
|
2008-11-19 14:51:40 +08:00
|
|
|
/// FormatDiagnostic - Format this diagnostic into a string, substituting the
|
|
|
|
/// formal arguments into the %0 slots. The result is appended onto the Str
|
|
|
|
/// array.
|
2011-09-26 09:18:08 +08:00
|
|
|
void Diagnostic::
|
2011-07-23 18:55:15 +08:00
|
|
|
FormatDiagnostic(SmallVectorImpl<char> &OutStr) const {
|
2011-05-05 15:54:59 +08:00
|
|
|
if (!StoredDiagMessage.empty()) {
|
|
|
|
OutStr.append(StoredDiagMessage.begin(), StoredDiagMessage.end());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-07-23 18:55:15 +08:00
|
|
|
StringRef Diag =
|
2011-05-25 13:05:01 +08:00
|
|
|
getDiags()->getDiagnosticIDs()->getDescription(getID());
|
2009-09-09 23:08:12 +08:00
|
|
|
|
2011-05-25 13:05:01 +08:00
|
|
|
FormatDiagnostic(Diag.begin(), Diag.end(), OutStr);
|
2010-01-14 07:58:20 +08:00
|
|
|
}
|
|
|
|
|
2011-09-26 09:18:08 +08:00
|
|
|
void Diagnostic::
|
2010-01-14 07:58:20 +08:00
|
|
|
FormatDiagnostic(const char *DiagStr, const char *DiagEnd,
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVectorImpl<char> &OutStr) const {
|
2010-01-14 07:58:20 +08:00
|
|
|
|
2015-01-08 09:27:03 +08:00
|
|
|
// When the diagnostic string is only "%0", the entire string is being given
|
|
|
|
// by an outside source. Remove unprintable characters from this string
|
|
|
|
// and skip all the other string processing.
|
2015-01-17 08:56:10 +08:00
|
|
|
if (DiagEnd - DiagStr == 2 &&
|
|
|
|
StringRef(DiagStr, DiagEnd - DiagStr).equals("%0") &&
|
2015-01-08 09:27:03 +08:00
|
|
|
getArgKind(0) == DiagnosticsEngine::ak_std_string) {
|
|
|
|
const std::string &S = getArgStdStr(0);
|
|
|
|
for (char c : S) {
|
|
|
|
if (llvm::sys::locale::isPrint(c) || c == '\t') {
|
|
|
|
OutStr.push_back(c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-10-20 13:25:22 +08:00
|
|
|
/// FormattedArgs - Keep track of all of the arguments formatted by
|
|
|
|
/// ConvertArgToString and pass them into subsequent calls to
|
|
|
|
/// ConvertArgToString, allowing the implementation to avoid redundancies in
|
|
|
|
/// obvious cases.
|
2011-09-26 07:23:43 +08:00
|
|
|
SmallVector<DiagnosticsEngine::ArgumentValue, 8> FormattedArgs;
|
2011-07-12 01:49:21 +08:00
|
|
|
|
|
|
|
/// QualTypeVals - Pass a vector of arrays so that QualType names can be
|
|
|
|
/// compared to see if more information is needed to be printed.
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVector<intptr_t, 2> QualTypeVals;
|
2012-06-27 02:18:47 +08:00
|
|
|
SmallVector<char, 64> Tree;
|
|
|
|
|
2011-07-12 01:49:21 +08:00
|
|
|
for (unsigned i = 0, e = getNumArgs(); i < e; ++i)
|
2011-09-26 07:23:43 +08:00
|
|
|
if (getArgKind(i) == DiagnosticsEngine::ak_qualtype)
|
2011-07-12 01:49:21 +08:00
|
|
|
QualTypeVals.push_back(getRawArg(i));
|
|
|
|
|
2008-11-19 14:51:40 +08:00
|
|
|
while (DiagStr != DiagEnd) {
|
|
|
|
if (DiagStr[0] != '%') {
|
|
|
|
// Append non-%0 substrings to Str if we have one.
|
|
|
|
const char *StrEnd = std::find(DiagStr, DiagEnd, '%');
|
|
|
|
OutStr.append(DiagStr, StrEnd);
|
|
|
|
DiagStr = StrEnd;
|
2008-11-21 15:50:02 +08:00
|
|
|
continue;
|
2013-02-09 06:30:41 +08:00
|
|
|
} else if (isPunctuation(DiagStr[1])) {
|
2010-01-15 04:11:39 +08:00
|
|
|
OutStr.push_back(DiagStr[1]); // %% -> %.
|
2008-11-19 14:51:40 +08:00
|
|
|
DiagStr += 2;
|
2008-11-21 15:50:02 +08:00
|
|
|
continue;
|
|
|
|
}
|
2009-09-09 23:08:12 +08:00
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
// Skip the %.
|
|
|
|
++DiagStr;
|
2009-09-09 23:08:12 +08:00
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
// This must be a placeholder for a diagnostic argument. The format for a
|
|
|
|
// placeholder is one of "%0", "%modifier0", or "%modifier{arguments}0".
|
|
|
|
// The digit is a number from 0-9 indicating which argument this comes from.
|
|
|
|
// The modifier is a string of digits from the set [-a-z]+, arguments is a
|
|
|
|
// brace enclosed string.
|
2014-05-08 14:41:40 +08:00
|
|
|
const char *Modifier = nullptr, *Argument = nullptr;
|
2008-11-21 15:50:02 +08:00
|
|
|
unsigned ModifierLen = 0, ArgumentLen = 0;
|
2009-09-09 23:08:12 +08:00
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
// Check to see if we have a modifier. If so eat it.
|
2013-02-09 06:30:41 +08:00
|
|
|
if (!isDigit(DiagStr[0])) {
|
2008-11-21 15:50:02 +08:00
|
|
|
Modifier = DiagStr;
|
|
|
|
while (DiagStr[0] == '-' ||
|
|
|
|
(DiagStr[0] >= 'a' && DiagStr[0] <= 'z'))
|
|
|
|
++DiagStr;
|
|
|
|
ModifierLen = DiagStr-Modifier;
|
2008-11-19 14:51:40 +08:00
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
// If we have an argument, get it next.
|
|
|
|
if (DiagStr[0] == '{') {
|
|
|
|
++DiagStr; // Skip {.
|
|
|
|
Argument = DiagStr;
|
2009-09-09 23:08:12 +08:00
|
|
|
|
2010-01-15 04:11:39 +08:00
|
|
|
DiagStr = ScanFormat(DiagStr, DiagEnd, '}');
|
|
|
|
assert(DiagStr != DiagEnd && "Mismatched {}'s in diagnostic string!");
|
2008-11-21 15:50:02 +08:00
|
|
|
ArgumentLen = DiagStr-Argument;
|
|
|
|
++DiagStr; // Skip }.
|
2008-11-19 14:51:40 +08:00
|
|
|
}
|
2008-11-21 15:50:02 +08:00
|
|
|
}
|
2009-09-09 23:08:12 +08:00
|
|
|
|
2013-02-09 06:30:41 +08:00
|
|
|
assert(isDigit(*DiagStr) && "Invalid format for argument in diagnostic");
|
2008-11-23 17:13:29 +08:00
|
|
|
unsigned ArgNo = *DiagStr++ - '0';
|
2008-11-21 15:50:02 +08:00
|
|
|
|
2012-06-27 02:18:47 +08:00
|
|
|
// Only used for type diffing.
|
|
|
|
unsigned ArgNo2 = ArgNo;
|
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
DiagnosticsEngine::ArgumentKind Kind = getArgKind(ArgNo);
|
2013-01-31 04:04:31 +08:00
|
|
|
if (ModifierIs(Modifier, ModifierLen, "diff")) {
|
2013-02-09 06:30:41 +08:00
|
|
|
assert(*DiagStr == ',' && isDigit(*(DiagStr + 1)) &&
|
2012-06-27 02:18:47 +08:00
|
|
|
"Invalid format for diff modifier");
|
|
|
|
++DiagStr; // Comma.
|
|
|
|
ArgNo2 = *DiagStr++ - '0';
|
2013-01-31 04:04:31 +08:00
|
|
|
DiagnosticsEngine::ArgumentKind Kind2 = getArgKind(ArgNo2);
|
|
|
|
if (Kind == DiagnosticsEngine::ak_qualtype &&
|
|
|
|
Kind2 == DiagnosticsEngine::ak_qualtype)
|
|
|
|
Kind = DiagnosticsEngine::ak_qualtype_pair;
|
|
|
|
else {
|
|
|
|
// %diff only supports QualTypes. For other kinds of arguments,
|
|
|
|
// use the default printing. For example, if the modifier is:
|
|
|
|
// "%diff{compare $ to $|other text}1,2"
|
|
|
|
// treat it as:
|
|
|
|
// "compare %1 to %2"
|
|
|
|
const char *Pipe = ScanFormat(Argument, Argument + ArgumentLen, '|');
|
|
|
|
const char *FirstDollar = ScanFormat(Argument, Pipe, '$');
|
|
|
|
const char *SecondDollar = ScanFormat(FirstDollar + 1, Pipe, '$');
|
2013-01-31 06:03:24 +08:00
|
|
|
const char ArgStr1[] = { '%', static_cast<char>('0' + ArgNo) };
|
|
|
|
const char ArgStr2[] = { '%', static_cast<char>('0' + ArgNo2) };
|
2013-01-31 04:04:31 +08:00
|
|
|
FormatDiagnostic(Argument, FirstDollar, OutStr);
|
|
|
|
FormatDiagnostic(ArgStr1, ArgStr1 + 2, OutStr);
|
|
|
|
FormatDiagnostic(FirstDollar + 1, SecondDollar, OutStr);
|
|
|
|
FormatDiagnostic(ArgStr2, ArgStr2 + 2, OutStr);
|
|
|
|
FormatDiagnostic(SecondDollar + 1, Pipe, OutStr);
|
|
|
|
continue;
|
|
|
|
}
|
2012-06-27 02:18:47 +08:00
|
|
|
}
|
2009-10-20 13:25:22 +08:00
|
|
|
|
|
|
|
switch (Kind) {
|
2008-11-24 05:45:46 +08:00
|
|
|
// ---- STRINGS ----
|
2011-09-26 07:23:43 +08:00
|
|
|
case DiagnosticsEngine::ak_std_string: {
|
2008-11-23 17:13:29 +08:00
|
|
|
const std::string &S = getArgStdStr(ArgNo);
|
2008-11-21 15:50:02 +08:00
|
|
|
assert(ModifierLen == 0 && "No modifiers for strings yet");
|
|
|
|
OutStr.append(S.begin(), S.end());
|
|
|
|
break;
|
|
|
|
}
|
2011-09-26 07:23:43 +08:00
|
|
|
case DiagnosticsEngine::ak_c_string: {
|
2008-11-23 17:13:29 +08:00
|
|
|
const char *S = getArgCStr(ArgNo);
|
2008-11-21 15:50:02 +08:00
|
|
|
assert(ModifierLen == 0 && "No modifiers for strings yet");
|
2009-04-20 14:13:16 +08:00
|
|
|
|
|
|
|
// Don't crash if get passed a null pointer by accident.
|
|
|
|
if (!S)
|
|
|
|
S = "(null)";
|
2009-09-09 23:08:12 +08:00
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
OutStr.append(S, S + strlen(S));
|
|
|
|
break;
|
|
|
|
}
|
2008-11-24 05:45:46 +08:00
|
|
|
// ---- INTEGERS ----
|
2011-09-26 07:23:43 +08:00
|
|
|
case DiagnosticsEngine::ak_sint: {
|
2008-11-23 17:13:29 +08:00
|
|
|
int Val = getArgSInt(ArgNo);
|
2009-09-09 23:08:12 +08:00
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
if (ModifierIs(Modifier, ModifierLen, "select")) {
|
2010-10-14 09:55:31 +08:00
|
|
|
HandleSelectModifier(*this, (unsigned)Val, Argument, ArgumentLen,
|
|
|
|
OutStr);
|
2008-11-21 15:50:02 +08:00
|
|
|
} else if (ModifierIs(Modifier, ModifierLen, "s")) {
|
|
|
|
HandleIntegerSModifier(Val, OutStr);
|
2008-11-22 21:44:36 +08:00
|
|
|
} else if (ModifierIs(Modifier, ModifierLen, "plural")) {
|
2010-10-14 09:55:31 +08:00
|
|
|
HandlePluralModifier(*this, (unsigned)Val, Argument, ArgumentLen,
|
|
|
|
OutStr);
|
2010-01-14 08:50:32 +08:00
|
|
|
} else if (ModifierIs(Modifier, ModifierLen, "ordinal")) {
|
|
|
|
HandleOrdinalModifier((unsigned)Val, OutStr);
|
2008-11-21 15:50:02 +08:00
|
|
|
} else {
|
|
|
|
assert(ModifierLen == 0 && "Unknown integer modifier");
|
2009-10-18 02:12:14 +08:00
|
|
|
llvm::raw_svector_ostream(OutStr) << Val;
|
2008-11-19 15:22:31 +08:00
|
|
|
}
|
2008-11-21 15:50:02 +08:00
|
|
|
break;
|
|
|
|
}
|
2011-09-26 07:23:43 +08:00
|
|
|
case DiagnosticsEngine::ak_uint: {
|
2008-11-23 17:13:29 +08:00
|
|
|
unsigned Val = getArgUInt(ArgNo);
|
2009-09-09 23:08:12 +08:00
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
if (ModifierIs(Modifier, ModifierLen, "select")) {
|
2010-01-14 07:58:20 +08:00
|
|
|
HandleSelectModifier(*this, Val, Argument, ArgumentLen, OutStr);
|
2008-11-21 15:50:02 +08:00
|
|
|
} else if (ModifierIs(Modifier, ModifierLen, "s")) {
|
|
|
|
HandleIntegerSModifier(Val, OutStr);
|
2008-11-22 21:44:36 +08:00
|
|
|
} else if (ModifierIs(Modifier, ModifierLen, "plural")) {
|
2010-10-14 09:55:31 +08:00
|
|
|
HandlePluralModifier(*this, (unsigned)Val, Argument, ArgumentLen,
|
|
|
|
OutStr);
|
2010-01-14 08:50:32 +08:00
|
|
|
} else if (ModifierIs(Modifier, ModifierLen, "ordinal")) {
|
|
|
|
HandleOrdinalModifier(Val, OutStr);
|
2008-11-21 15:50:02 +08:00
|
|
|
} else {
|
|
|
|
assert(ModifierLen == 0 && "Unknown integer modifier");
|
2009-10-18 02:12:14 +08:00
|
|
|
llvm::raw_svector_ostream(OutStr) << Val;
|
2008-11-19 15:22:31 +08:00
|
|
|
}
|
2008-11-23 17:13:29 +08:00
|
|
|
break;
|
2008-11-21 15:50:02 +08:00
|
|
|
}
|
2013-12-24 17:48:30 +08:00
|
|
|
// ---- TOKEN SPELLINGS ----
|
|
|
|
case DiagnosticsEngine::ak_tokenkind: {
|
|
|
|
tok::TokenKind Kind = static_cast<tok::TokenKind>(getRawArg(ArgNo));
|
|
|
|
assert(ModifierLen == 0 && "No modifiers for token kinds yet");
|
|
|
|
|
|
|
|
llvm::raw_svector_ostream Out(OutStr);
|
2014-01-06 20:54:18 +08:00
|
|
|
if (const char *S = tok::getPunctuatorSpelling(Kind))
|
|
|
|
// Quoted token spelling for punctuators.
|
|
|
|
Out << '\'' << S << '\'';
|
|
|
|
else if (const char *S = tok::getKeywordSpelling(Kind))
|
|
|
|
// Unquoted token spelling for keywords.
|
|
|
|
Out << S;
|
|
|
|
else if (const char *S = getTokenDescForDiagnostic(Kind))
|
2013-12-24 17:48:30 +08:00
|
|
|
// Unquoted translatable token name.
|
|
|
|
Out << S;
|
|
|
|
else if (const char *S = tok::getTokenName(Kind))
|
|
|
|
// Debug name, shouldn't appear in user-facing diagnostics.
|
|
|
|
Out << '<' << S << '>';
|
|
|
|
else
|
|
|
|
Out << "(null)";
|
|
|
|
break;
|
|
|
|
}
|
2008-11-24 05:45:46 +08:00
|
|
|
// ---- NAMES and TYPES ----
|
2011-09-26 07:23:43 +08:00
|
|
|
case DiagnosticsEngine::ak_identifierinfo: {
|
2008-11-24 05:45:46 +08:00
|
|
|
const IdentifierInfo *II = getArgIdentifier(ArgNo);
|
|
|
|
assert(ModifierLen == 0 && "No modifiers for strings yet");
|
2009-04-20 14:13:16 +08:00
|
|
|
|
|
|
|
// Don't crash if get passed a null pointer by accident.
|
|
|
|
if (!II) {
|
|
|
|
const char *S = "(null)";
|
|
|
|
OutStr.append(S, S + strlen(S));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-10-19 05:17:35 +08:00
|
|
|
llvm::raw_svector_ostream(OutStr) << '\'' << II->getName() << '\'';
|
2008-11-24 05:45:46 +08:00
|
|
|
break;
|
|
|
|
}
|
2011-09-26 07:23:43 +08:00
|
|
|
case DiagnosticsEngine::ak_qualtype:
|
|
|
|
case DiagnosticsEngine::ak_declarationname:
|
|
|
|
case DiagnosticsEngine::ak_nameddecl:
|
|
|
|
case DiagnosticsEngine::ak_nestednamespec:
|
|
|
|
case DiagnosticsEngine::ak_declcontext:
|
2013-12-27 02:30:57 +08:00
|
|
|
case DiagnosticsEngine::ak_attr:
|
2009-10-20 13:25:22 +08:00
|
|
|
getDiags()->ConvertArgToString(Kind, getRawArg(ArgNo),
|
2014-06-12 13:32:35 +08:00
|
|
|
StringRef(Modifier, ModifierLen),
|
|
|
|
StringRef(Argument, ArgumentLen),
|
2014-06-12 13:32:27 +08:00
|
|
|
FormattedArgs,
|
2011-07-12 01:49:21 +08:00
|
|
|
OutStr, QualTypeVals);
|
2008-11-23 17:13:29 +08:00
|
|
|
break;
|
2012-06-27 02:18:47 +08:00
|
|
|
case DiagnosticsEngine::ak_qualtype_pair:
|
|
|
|
// Create a struct with all the info needed for printing.
|
|
|
|
TemplateDiffTypes TDT;
|
|
|
|
TDT.FromType = getRawArg(ArgNo);
|
|
|
|
TDT.ToType = getRawArg(ArgNo2);
|
|
|
|
TDT.ElideType = getDiags()->ElideType;
|
|
|
|
TDT.ShowColors = getDiags()->ShowColors;
|
2012-07-10 09:46:04 +08:00
|
|
|
TDT.TemplateDiffUsed = false;
|
2012-06-27 02:18:47 +08:00
|
|
|
intptr_t val = reinterpret_cast<intptr_t>(&TDT);
|
|
|
|
|
2012-06-30 05:12:16 +08:00
|
|
|
const char *ArgumentEnd = Argument + ArgumentLen;
|
|
|
|
const char *Pipe = ScanFormat(Argument, ArgumentEnd, '|');
|
|
|
|
|
2012-07-14 05:18:32 +08:00
|
|
|
// Print the tree. If this diagnostic already has a tree, skip the
|
|
|
|
// second tree.
|
|
|
|
if (getDiags()->PrintTemplateTree && Tree.empty()) {
|
2012-06-27 02:18:47 +08:00
|
|
|
TDT.PrintFromType = true;
|
|
|
|
TDT.PrintTree = true;
|
|
|
|
getDiags()->ConvertArgToString(Kind, val,
|
2014-06-12 13:32:35 +08:00
|
|
|
StringRef(Modifier, ModifierLen),
|
|
|
|
StringRef(Argument, ArgumentLen),
|
2014-06-12 13:32:27 +08:00
|
|
|
FormattedArgs,
|
2012-06-27 02:18:47 +08:00
|
|
|
Tree, QualTypeVals);
|
|
|
|
// If there is no tree information, fall back to regular printing.
|
2012-06-30 05:12:16 +08:00
|
|
|
if (!Tree.empty()) {
|
|
|
|
FormatDiagnostic(Pipe + 1, ArgumentEnd, OutStr);
|
2012-06-27 02:18:47 +08:00
|
|
|
break;
|
2012-06-30 05:12:16 +08:00
|
|
|
}
|
2012-06-27 02:18:47 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Non-tree printing, also the fall-back when tree printing fails.
|
|
|
|
// The fall-back is triggered when the types compared are not templates.
|
2012-06-30 05:12:16 +08:00
|
|
|
const char *FirstDollar = ScanFormat(Argument, ArgumentEnd, '$');
|
|
|
|
const char *SecondDollar = ScanFormat(FirstDollar + 1, ArgumentEnd, '$');
|
2012-06-27 02:18:47 +08:00
|
|
|
|
|
|
|
// Append before text
|
2012-06-30 05:12:16 +08:00
|
|
|
FormatDiagnostic(Argument, FirstDollar, OutStr);
|
2012-06-27 02:18:47 +08:00
|
|
|
|
|
|
|
// Append first type
|
|
|
|
TDT.PrintTree = false;
|
|
|
|
TDT.PrintFromType = true;
|
|
|
|
getDiags()->ConvertArgToString(Kind, val,
|
2014-06-12 13:32:35 +08:00
|
|
|
StringRef(Modifier, ModifierLen),
|
|
|
|
StringRef(Argument, ArgumentLen),
|
2014-06-12 13:32:27 +08:00
|
|
|
FormattedArgs,
|
2012-06-27 02:18:47 +08:00
|
|
|
OutStr, QualTypeVals);
|
2012-07-10 09:46:04 +08:00
|
|
|
if (!TDT.TemplateDiffUsed)
|
|
|
|
FormattedArgs.push_back(std::make_pair(DiagnosticsEngine::ak_qualtype,
|
|
|
|
TDT.FromType));
|
|
|
|
|
2012-06-27 02:18:47 +08:00
|
|
|
// Append middle text
|
2012-06-30 05:12:16 +08:00
|
|
|
FormatDiagnostic(FirstDollar + 1, SecondDollar, OutStr);
|
2012-06-27 02:18:47 +08:00
|
|
|
|
|
|
|
// Append second type
|
|
|
|
TDT.PrintFromType = false;
|
|
|
|
getDiags()->ConvertArgToString(Kind, val,
|
2014-06-12 13:32:35 +08:00
|
|
|
StringRef(Modifier, ModifierLen),
|
|
|
|
StringRef(Argument, ArgumentLen),
|
2014-06-12 13:32:27 +08:00
|
|
|
FormattedArgs,
|
2012-06-27 02:18:47 +08:00
|
|
|
OutStr, QualTypeVals);
|
2012-07-10 09:46:04 +08:00
|
|
|
if (!TDT.TemplateDiffUsed)
|
|
|
|
FormattedArgs.push_back(std::make_pair(DiagnosticsEngine::ak_qualtype,
|
|
|
|
TDT.ToType));
|
|
|
|
|
2012-06-27 02:18:47 +08:00
|
|
|
// Append end text
|
2012-06-30 05:12:16 +08:00
|
|
|
FormatDiagnostic(SecondDollar + 1, Pipe, OutStr);
|
2012-06-27 02:18:47 +08:00
|
|
|
break;
|
2008-08-11 03:59:06 +08:00
|
|
|
}
|
2009-10-20 13:25:22 +08:00
|
|
|
|
|
|
|
// Remember this argument info for subsequent formatting operations. Turn
|
|
|
|
// std::strings into a null terminated string to make it be the same case as
|
|
|
|
// all the other ones.
|
2012-06-27 02:18:47 +08:00
|
|
|
if (Kind == DiagnosticsEngine::ak_qualtype_pair)
|
|
|
|
continue;
|
|
|
|
else if (Kind != DiagnosticsEngine::ak_std_string)
|
2009-10-20 13:25:22 +08:00
|
|
|
FormattedArgs.push_back(std::make_pair(Kind, getRawArg(ArgNo)));
|
|
|
|
else
|
2011-09-26 07:23:43 +08:00
|
|
|
FormattedArgs.push_back(std::make_pair(DiagnosticsEngine::ak_c_string,
|
2009-10-20 13:25:22 +08:00
|
|
|
(intptr_t)getArgStdStr(ArgNo).c_str()));
|
|
|
|
|
2008-08-11 03:59:06 +08:00
|
|
|
}
|
2012-06-27 02:18:47 +08:00
|
|
|
|
|
|
|
// Append the type tree to the end of the diagnostics.
|
|
|
|
OutStr.append(Tree.begin(), Tree.end());
|
2008-08-11 03:59:06 +08:00
|
|
|
}
|
2009-01-24 04:28:53 +08:00
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
StoredDiagnostic::StoredDiagnostic(DiagnosticsEngine::Level Level, unsigned ID,
|
2011-07-23 18:55:15 +08:00
|
|
|
StringRef Message)
|
2010-11-20 01:36:51 +08:00
|
|
|
: ID(ID), Level(Level), Loc(), Message(Message) { }
|
2010-02-19 02:08:43 +08:00
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
StoredDiagnostic::StoredDiagnostic(DiagnosticsEngine::Level Level,
|
2011-09-26 09:18:08 +08:00
|
|
|
const Diagnostic &Info)
|
2010-11-20 00:18:16 +08:00
|
|
|
: ID(Info.getID()), Level(Level)
|
|
|
|
{
|
2010-11-19 04:06:41 +08:00
|
|
|
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());
|
2012-02-05 10:13:05 +08:00
|
|
|
SmallString<64> Message;
|
2010-02-19 02:08:43 +08:00
|
|
|
Info.FormatDiagnostic(Message);
|
|
|
|
this->Message.assign(Message.begin(), Message.end());
|
2015-02-18 00:48:30 +08:00
|
|
|
this->Ranges.assign(Info.getRanges().begin(), Info.getRanges().end());
|
|
|
|
this->FixIts.assign(Info.getFixItHints().begin(), Info.getFixItHints().end());
|
2010-02-19 02:08:43 +08:00
|
|
|
}
|
|
|
|
|
2011-09-26 07:23:43 +08:00
|
|
|
StoredDiagnostic::StoredDiagnostic(DiagnosticsEngine::Level Level, unsigned ID,
|
2011-07-23 18:55:15 +08:00
|
|
|
StringRef Message, FullSourceLoc Loc,
|
2011-07-24 01:14:25 +08:00
|
|
|
ArrayRef<CharSourceRange> Ranges,
|
2013-02-25 03:08:10 +08:00
|
|
|
ArrayRef<FixItHint> FixIts)
|
|
|
|
: ID(ID), Level(Level), Loc(Loc), Message(Message),
|
|
|
|
Ranges(Ranges.begin(), Ranges.end()), FixIts(FixIts.begin(), FixIts.end())
|
Revamp the SourceManager to separate the representation of parsed
source locations from source locations loaded from an AST/PCH file.
Previously, loading an AST/PCH file involved carefully pre-allocating
space at the beginning of the source manager for the source locations
and FileIDs that correspond to the prefix, and then appending the
source locations/FileIDs used for parsing the remaining translation
unit. This design forced us into loading PCH files early, as a prefix,
whic has become a rather significant limitation.
This patch splits the SourceManager space into two parts: for source
location "addresses", the lower values (growing upward) are used to
describe parsed code, while upper values (growing downward) are used
for source locations loaded from AST/PCH files. Similarly, positive
FileIDs are used to describe parsed code while negative FileIDs are
used to file/macro locations loaded from AST/PCH files. As a result,
we can load PCH/AST files even during parsing, making various
improvemnts in the future possible, e.g., teaching #include <foo.h> to
look for and load <foo.h.gch> if it happens to be already available.
This patch was originally written by Sebastian Redl, then brought
forward to the modern age by Jonathan Turner, and finally
polished/finished by me to be committed.
llvm-svn: 135484
2011-07-20 00:10:42 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2009-01-24 04:28:53 +08:00
|
|
|
/// IncludeInDiagnosticCounts - This method (whose default implementation
|
|
|
|
/// returns true) indicates whether the diagnostics handled by this
|
2011-09-26 07:39:51 +08:00
|
|
|
/// DiagnosticConsumer should be included in the number of diagnostics
|
2011-09-26 07:23:43 +08:00
|
|
|
/// reported by DiagnosticsEngine.
|
2011-09-26 07:39:51 +08:00
|
|
|
bool DiagnosticConsumer::IncludeInDiagnosticCounts() const { return true; }
|
2010-03-30 07:34:08 +08:00
|
|
|
|
2011-12-20 10:48:34 +08:00
|
|
|
void IgnoringDiagConsumer::anchor() { }
|
|
|
|
|
2015-10-20 21:23:58 +08:00
|
|
|
ForwardingDiagnosticConsumer::~ForwardingDiagnosticConsumer() {}
|
2013-05-04 06:58:43 +08:00
|
|
|
|
|
|
|
void ForwardingDiagnosticConsumer::HandleDiagnostic(
|
|
|
|
DiagnosticsEngine::Level DiagLevel,
|
|
|
|
const Diagnostic &Info) {
|
|
|
|
Target.HandleDiagnostic(DiagLevel, Info);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ForwardingDiagnosticConsumer::clear() {
|
|
|
|
DiagnosticConsumer::clear();
|
|
|
|
Target.clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool ForwardingDiagnosticConsumer::IncludeInDiagnosticCounts() const {
|
|
|
|
return Target.IncludeInDiagnosticCounts();
|
|
|
|
}
|
|
|
|
|
2012-02-08 06:29:24 +08:00
|
|
|
PartialDiagnostic::StorageAllocator::StorageAllocator() {
|
2010-03-30 07:34:08 +08:00
|
|
|
for (unsigned I = 0; I != NumCached; ++I)
|
|
|
|
FreeList[I] = Cached + I;
|
|
|
|
NumFreeListEntries = NumCached;
|
|
|
|
}
|
|
|
|
|
2012-02-08 06:29:24 +08:00
|
|
|
PartialDiagnostic::StorageAllocator::~StorageAllocator() {
|
2012-02-08 07:24:49 +08:00
|
|
|
// Don't assert if we are in a CrashRecovery context, as this invariant may
|
|
|
|
// be invalidated during a crash.
|
|
|
|
assert((NumFreeListEntries == NumCached ||
|
|
|
|
llvm::CrashRecoveryContext::isRecoveringFromCrash()) &&
|
|
|
|
"A partial is on the lamb");
|
2010-03-30 07:34:08 +08:00
|
|
|
}
|