commit 3efd52cf8f4e57c5571bd8cc3168264c3bc46a1e
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Fri Jan 14 20:54:07 2011 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Fri Jan 14 20:54:07 2011 +0000
tree e01032cae49e0af5c073d902fc347cddfef7c904
parent db0594bfc013131f88429add4eb653c285fa94fb

Properly propagate #pragma diagnostic mappings from PCH but not command-line warning flags.
Addresses rdar://8435969&8852495

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@123462 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Basic/DiagnosticIDs.cpp

diff --git a/lib/Basic/DiagnosticIDs.cpp b/lib/Basic/DiagnosticIDs.cpp
index df32c31..f4d7047 100644
--- a/lib/Basic/DiagnosticIDs.cpp
+++ b/lib/Basic/DiagnosticIDs.cpp
@@ -317,7 +317,7 @@
                                                        State);
   if (MappingInfo == 0) {
     MappingInfo = GetDefaultDiagMapping(DiagID);
-    Diag.setDiagnosticMappingInternal(DiagID, MappingInfo, State, false);
+    Diag.setDiagnosticMappingInternal(DiagID, MappingInfo, State, false, false);
   }
 
   switch (MappingInfo & 7) {