[cfe-commits] r78987 - in /cfe/trunk: lib/Frontend/Warnings.cpp test/Misc/diag-mapping2.c

[Shantonu Sen]

Author: ssen
Date: Thu Aug 13 23:07:15 2009
New Revision: 78987

URL: http://llvm.org/viewvc/llvm-project?rev=78987&view=rev
Log:
PR4715

-Wno-error disables WarningsAsErrors instead of
mistakenly being treated like -Werror


Modified:
    cfe/trunk/lib/Frontend/Warnings.cpp
    cfe/trunk/test/Misc/diag-mapping2.c

Modified: cfe/trunk/lib/Frontend/Warnings.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/Warnings.cpp?rev=78987&r1=78986&r2=78987&view=diff

==============================================================================
--- cfe/trunk/lib/Frontend/Warnings.cpp (original)
+++ cfe/trunk/lib/Frontend/Warnings.cpp Thu Aug 13 23:07:15 2009
@@ -90,7 +90,7 @@
       }
       
       if (Specifier == 0) {
-        Diags.setWarningsAsErrors(true);
+        Diags.setWarningsAsErrors(isPositive);
         continue;
       }
       

Modified: cfe/trunk/test/Misc/diag-mapping2.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/diag-mapping2.c?rev=78987&r1=78986&r2=78987&view=diff

==============================================================================
--- cfe/trunk/test/Misc/diag-mapping2.c (original)
+++ cfe/trunk/test/Misc/diag-mapping2.c Thu Aug 13 23:07:15 2009
@@ -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