diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/lib/Lex/PPDirectives.cpp @@ -2802,7 +2802,9 @@ // warn-because-unused-macro set. If it gets used it will be removed from set. if (getSourceManager().isInMainFile(MI->getDefinitionLoc()) && !Diags->isIgnored(diag::pp_macro_not_used, MI->getDefinitionLoc()) && - !MacroExpansionInDirectivesOverride) { + !MacroExpansionInDirectivesOverride && + getSourceManager().getFileID(MI->getDefinitionLoc()) != + getPredefinesFileID()) { MI->setIsWarnIfUnused(true); WarnUnusedMacroLocs.insert(MI->getDefinitionLoc()); } diff --git a/clang/test/PCH/cli-macro.c b/clang/test/PCH/cli-macro.c new file mode 100644 --- /dev/null +++ b/clang/test/PCH/cli-macro.c @@ -0,0 +1,12 @@ +// Test this without pch. +// RUN: %clang_cc1 -Wunused-macros -Dunused=1 -fsyntax-only -verify %s + +// Test with pch. +// RUN: %clang_cc1 -Wunused-macros -emit-pch -o %t %s +// RUN: %clang_cc1 -Wunused-macros -Dunused=1 -include-pch %t -fsyntax-only -verify %s + +// expected-no-diagnostics + +// -Dunused=1 is intentionally not set for the pch. +// There still should be no unused warning for a macro from the command line. +