summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-02-05 22:56:06 +0000
committerChris Lattner <sabre@nondot.org>2009-02-05 22:56:06 +0000
commit6be3cd10732ff233711261f152ea025a0bacf442 (patch)
tree991ab2df6a978b59df01683444ecfa6e2a5cb6cd
parent9d6c4408d1daccd1dcc2884083755a04973818b8 (diff)
downloadbcm5719-llvm-6be3cd10732ff233711261f152ea025a0bacf442.tar.gz
bcm5719-llvm-6be3cd10732ff233711261f152ea025a0bacf442.zip
allow mapping errors to fatal.
llvm-svn: 63896
-rw-r--r--clang/include/clang/Basic/Diagnostic.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/include/clang/Basic/Diagnostic.h b/clang/include/clang/Basic/Diagnostic.h
index 46a83143448..90b9e2ca31d 100644
--- a/clang/include/clang/Basic/Diagnostic.h
+++ b/clang/include/clang/Basic/Diagnostic.h
@@ -164,7 +164,8 @@ public:
void setDiagnosticMapping(diag::kind Diag, diag::Mapping Map) {
assert(Diag < diag::DIAG_UPPER_LIMIT &&
"Can only map builtin diagnostics");
- assert(isBuiltinNoteWarningOrExtension(Diag) && "Cannot map errors!");
+ assert((isBuiltinNoteWarningOrExtension(Diag) || Map == diag::MAP_FATAL) &&
+ "Cannot map errors!");
unsigned char &Slot = DiagMappings[Diag/2];
unsigned Bits = (Diag & 1)*4;
Slot &= ~(7 << Bits);
OpenPOWER on IntegriCloud