[PATCH] D72405: Allow /D flags absent during PCH creation under msvc-compat

[Zachary Henkel via Phabricator via cfe-commits]

zahen updated this revision to Diff 237795.
zahen added a comment.

Incorporate review feedback.

I had no luck converting the CHECK-FOO & CHECK-NOFOO tests to use `-verify` because the errors were reported against "(frontend)"

  error: 'error' diagnostics seen but not expected:
    (frontend): definition of macro 'FOO' differs between the precompiled header ('1') and the command line ('blah')


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D72405/new/

https://reviews.llvm.org/D72405

Files:
  clang/lib/Lex/PPDirectives.cpp
  clang/test/PCH/fuzzy-pch-msvc.c


Index: clang/test/PCH/fuzzy-pch-msvc.c
===================================================================
--- /dev/null
+++ clang/test/PCH/fuzzy-pch-msvc.c
@@ -0,0 +1,32 @@
+// Test -D and -U interaction with a PCH when running clang-cl.
+
+// RUN: %clang_cl -DFOO -Yc %S/variables.h
+
+// RUN: not %clang_cl -c -DFOO=blah -DBAR=int -Wno-microsoft-include -Yuvariables.h %s 2> %t.err
+// RUN: FileCheck -check-prefix=CHECK-FOO %s < %t.err
+
+// RUN: not %clang_cl -c -UFOO -DBAR=int -Wno-microsoft-include -Yuvariables.h %s 2> %t.err
+// RUN: FileCheck -check-prefix=CHECK-NOFOO %s < %t.err 
+
+// RUN: %clang_cl -c -DBAR=int -Wno-microsoft-include -Yuvariables.h -Xclang -verify %s 
+#include "variables.h"
+
+BAR bar = 17;
+
+#ifndef FOO
+#  error FOO was not defined
+#endif
+
+#if FOO != 1
+#  error FOO has the wrong definition
+#endif
+
+#ifndef BAR
+#  error BAR was not defined 
+#endif
+
+
+// CHECK-FOO: definition of macro 'FOO' differs between the precompiled header ('1') and the command line ('blah')
+// CHECK-NOFOO: macro 'FOO' was defined in the precompiled header but undef'd on the command line
+
+// expected-warning at 1 {{definition of macro 'BAR' does not match definition in precompiled header}}
Index: clang/lib/Lex/PPDirectives.cpp
===================================================================
--- clang/lib/Lex/PPDirectives.cpp
+++ clang/lib/Lex/PPDirectives.cpp
@@ -2727,7 +2727,9 @@
                              /*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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D72405.237795.patch
Type: text/x-patch
Size: 1842 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200113/a3b36b42/attachment.bin>