Introducing -Wheader-guard, a warning that checks header guards actually work

properly.  This warning checks that the #ifndef and #define directives at
the beginning of a header refer to the same macro name.  Includes a fix-it
hint to correct the header guard.


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

1 files changed, 22 insertions, 1 deletions

diff --git a/lib/Lex/PPLexerChange.cpp b/lib/Lex/PPLexerChange.cpp
index 6437336246..e521032bca 100644
--- a/lib/Lex/PPLexerChange.cpp
+++ b/lib/Lex/PPLexerChange.cpp
@@ -244,8 +244,29 @@ bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) {
           CurPPLexer->MIOpt.GetControllingMacroAtEndOfFile()) {
       // Okay, this has a controlling macro, remember in HeaderFileInfo.
       if (const FileEntry *FE =
-            SourceMgr.getFileEntryForID(CurPPLexer->getFileID()))
+            SourceMgr.getFileEntryForID(CurPPLexer->getFileID())) {
         HeaderInfo.SetFileControllingMacro(FE, ControllingMacro);
+        if (const IdentifierInfo *DefinedMacro =
+              CurPPLexer->MIOpt.GetDefinedMacro()) {
+          if (!ControllingMacro->hasMacroDefinition() &&
+              DefinedMacro != ControllingMacro &&
+              HeaderInfo.FirstTimeLexingFile(FE)) {
+            // Emit a warning for a bad header guard.
+            Diag(CurPPLexer->MIOpt.GetMacroLocation(),
+                 diag::warn_header_guard)
+                << CurPPLexer->MIOpt.GetMacroLocation()
+                << ControllingMacro;
+            Diag(CurPPLexer->MIOpt.GetDefinedLocation(),
+                 diag::note_header_guard)
+                << CurPPLexer->MIOpt.GetDefinedLocation()
+                << DefinedMacro
+                << ControllingMacro
+                << FixItHint::CreateReplacement(
+                       CurPPLexer->MIOpt.GetDefinedLocation(),
+                       ControllingMacro->getName());
+          }
+        }
+      }
     }
   }