summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorZachary Henkel <zachary.henkel@microsoft.com>2020-01-14 14:58:14 -0800
committerReid Kleckner <rnk@google.com>2020-01-14 17:26:01 -0800
commit0f9cf42facaf9eff47dc0b9eb7e6ed8803d3bc3b (patch)
treea808457fca64c3dec045fcc63521a19b39566a41 /clang/lib
parent40cd26c7008183e01d8276396339aea2a99d83d7 (diff)
downloadbcm5719-llvm-0f9cf42facaf9eff47dc0b9eb7e6ed8803d3bc3b.tar.gz
bcm5719-llvm-0f9cf42facaf9eff47dc0b9eb7e6ed8803d3bc3b.zip
Allow /D flags absent during PCH creation under msvc-compat
Summary: Before this patch adding a new /D flag when compiling a source file that consumed a PCH with clang-cl would issue a diagnostic and then fail. With the patch, the diagnostic is still issued but the definition is accepted. This matches the msvc behavior. The fuzzy-pch-msvc.c is a clone of the existing fuzzy-pch.c tests with some msvc specific rework. msvc diagnostic: warning C4605: '/DBAR=int' specified on current command line, but was not specified when precompiled header was built Output of the CHECK-BAR test prior to the code change: <built-in>(1,9): warning: definition of macro 'BAR' does not match definition in precompiled header [-Wclang-cl-pch] #define BAR int ^ D:\repos\llvm\llvm-project\clang\test\PCH\fuzzy-pch-msvc.c(12,1): error: unknown type name 'BAR' BAR bar = 17; ^ D:\repos\llvm\llvm-project\clang\test\PCH\fuzzy-pch-msvc.c(23,4): error: BAR was not defined # error BAR was not defined ^ 1 warning and 2 errors generated. Reviewers: rnk, thakis, hans, zturner Subscribers: mikerice, aganea, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D72405
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Lex/PPDirectives.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp
index 3b7eaee3c91..e433b2cf1b9 100644
--- a/clang/lib/Lex/PPDirectives.cpp
+++ b/clang/lib/Lex/PPDirectives.cpp
@@ -2727,7 +2727,9 @@ void Preprocessor::HandleDefineDirective(
/*Syntactic=*/LangOpts.MicrosoftExt))
Diag(MI->getDefinitionLoc(), diag::warn_pp_macro_def_mismatch_with_pch)
<< MacroNameTok.getIdentifierInfo();
- return;
+ // Issue the diagnostic but allow the change if msvc extensions are enabled
+ if (!LangOpts.MicrosoftExt)
+ return;
}
// Finally, if this identifier already had a macro defined for it, verify that
OpenPOWER on IntegriCloud