projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[X86][Haswell][SchedModel] Add architecture specific scheduling models.
[oota-llvm.git]
/
lib
/
TableGen
/
Error.cpp
diff --git
a/lib/TableGen/Error.cpp
b/lib/TableGen/Error.cpp
index ad98fba9baf6c2991138c303a868872157fed9cb..8d9ae20dd52eda1a6dc0b0c24a1f0b870553f0b5 100644
(file)
--- a/
lib/TableGen/Error.cpp
+++ b/
lib/TableGen/Error.cpp
@@
-15,15
+15,20
@@
#include "llvm/TableGen/Error.h"
#include "llvm/ADT/Twine.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/TableGen/Error.h"
#include "llvm/ADT/Twine.h"
#include "llvm/Support/raw_ostream.h"
-
#include <cstdlib>
namespace llvm {
SourceMgr SrcMgr;
#include <cstdlib>
namespace llvm {
SourceMgr SrcMgr;
+unsigned ErrorsPrinted = 0;
static void PrintMessage(ArrayRef<SMLoc> Loc, SourceMgr::DiagKind Kind,
const Twine &Msg) {
static void PrintMessage(ArrayRef<SMLoc> Loc, SourceMgr::DiagKind Kind,
const Twine &Msg) {
+ // Count the total number of errors printed.
+ // This is used to exit with an error code if there were any errors.
+ if (Kind == SourceMgr::DK_Error)
+ ++ErrorsPrinted;
+
SMLoc NullLoc;
if (Loc.empty())
Loc = NullLoc;
SMLoc NullLoc;
if (Loc.empty())
Loc = NullLoc;
@@
-45,10
+50,6
@@
void PrintWarning(const Twine &Msg) {
errs() << "warning:" << Msg << "\n";
}
errs() << "warning:" << Msg << "\n";
}
-void PrintWarning(const TGError &Warning) {
- PrintWarning(Warning.getLoc(), Warning.getMessage());
-}
-
void PrintError(ArrayRef<SMLoc> ErrorLoc, const Twine &Msg) {
PrintMessage(ErrorLoc, SourceMgr::DK_Error, Msg);
}
void PrintError(ArrayRef<SMLoc> ErrorLoc, const Twine &Msg) {
PrintMessage(ErrorLoc, SourceMgr::DK_Error, Msg);
}
@@
-61,16
+62,12
@@
void PrintError(const Twine &Msg) {
errs() << "error:" << Msg << "\n";
}
errs() << "error:" << Msg << "\n";
}
-void PrintError(const TGError &Error) {
- PrintError(Error.getLoc(), Error.getMessage());
-}
-
-void PrintFatalError(const std::string &Msg) {
- PrintError(Twine(Msg));
+void PrintFatalError(const Twine &Msg) {
+ PrintError(Msg);
std::exit(1);
}
std::exit(1);
}
-void PrintFatalError(ArrayRef<SMLoc> ErrorLoc, const
std::string
&Msg) {
+void PrintFatalError(ArrayRef<SMLoc> ErrorLoc, const
Twine
&Msg) {
PrintError(ErrorLoc, Msg);
std::exit(1);
}
PrintError(ErrorLoc, Msg);
std::exit(1);
}