summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorShantonu Sen <ssen@apple.com>2009-08-14 04:07:15 +0000
committerShantonu Sen <ssen@apple.com>2009-08-14 04:07:15 +0000
commit4a7b937c4b7602fb658e1b0b247d3c611e9cfc1c (patch)
treee4afa9cd4644c2c6ced128766f0d4ef914974fde /clang
parent80d484e7cc0ba2ab722597aa0b47fee389381500 (diff)
downloadbcm5719-llvm-4a7b937c4b7602fb658e1b0b247d3c611e9cfc1c.tar.gz
bcm5719-llvm-4a7b937c4b7602fb658e1b0b247d3c611e9cfc1c.zip
PR4715
-Wno-error disables WarningsAsErrors instead of mistakenly being treated like -Werror llvm-svn: 78987
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/Frontend/Warnings.cpp2
-rw-r--r--clang/test/Misc/diag-mapping2.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/clang/lib/Frontend/Warnings.cpp b/clang/lib/Frontend/Warnings.cpp
index c8fd5f6fcbc..87178e93b44 100644
--- a/clang/lib/Frontend/Warnings.cpp
+++ b/clang/lib/Frontend/Warnings.cpp
@@ -90,7 +90,7 @@ bool clang::ProcessWarningOptions(Diagnostic &Diags,
}
if (Specifier == 0) {
- Diags.setWarningsAsErrors(true);
+ Diags.setWarningsAsErrors(isPositive);
continue;
}
diff --git a/clang/test/Misc/diag-mapping2.c b/clang/test/Misc/diag-mapping2.c
index 7e0d7742a9f..c5fd7fff81f 100644
--- a/clang/test/Misc/diag-mapping2.c
+++ b/clang/test/Misc/diag-mapping2.c
@@ -12,7 +12,10 @@
// RUN: clang-cc %s -Werror=#warnings 2>&1 | grep "error:" &&
// -Wno-error= overrides -Werror. rdar://3158301
-// RUN: clang-cc %s -Werror -Wno-error=#warnings 2>&1 | grep "warning:"
+// RUN: clang-cc %s -Werror -Wno-error=#warnings 2>&1 | grep "warning:" &&
+
+// -Wno-error overrides -Werror. PR4715
+// RUN: clang-cc %s -Werror -Wno-error 2>&1 | grep "warning:"
#warning foo
OpenPOWER on IntegriCloud