thorsten-klein wrote:
I am little bit confused that there are valid findings in the LLVM codebase.
They are detected by `llvm-header-guard` and `misc-header-guard` both.
I use following `misc-header-guard` option to configure it to be compatible
with `llvm-header-guard`:
```
- key: misc-header-guard.Prefix
value: LLVM_
```
I get following diff (just some first findings):
```
clang/include/clang-c/BuildSystem.h | 2 +-
clang/include/clang-c/CXSourceLocation.h | 4 ++--
clang/include/clang-c/Documentation.h | 2 +-
clang/include/clang-c/ExternC.h | 4 ++--
clang/include/clang-c/FatalErrorHandler.h | 4 ++--
clang/include/clang/APINotes/APINotesReader.h | 6 +++---
clang/include/clang/APINotes/APINotesWriter.h | 6 +++---
clang/include/clang/CodeGen/ObjectFilePCHContainerWriter.h | 4 ++--
clang/include/clang/ExtractAPI/APIIgnoresList.h | 6 +++---
clang/include/clang/ExtractAPI/DeclarationFragments.h | 6 +++---
clang/include/clang/ExtractAPI/ExtractAPIActionBase.h | 6 +++---
clang/include/clang/ExtractAPI/ExtractAPIVisitor.h | 6 +++---
clang/include/clang/ExtractAPI/FrontendActions.h | 6 +++---
clang/include/clang/ExtractAPI/Serialization/APISetVisitor.h | 6 +++---
clang/include/clang/ExtractAPI/TypedefUnderlyingTypeResolver.h | 6 +++---
clang/include/clang/Tooling/Inclusions/HeaderAnalysis.h | 6 +++---
clang/include/clang/Tooling/Syntax/TokenBufferTokenManager.h | 6 +++---
clang/include/clang/Tooling/Syntax/TokenManager.h | 6 +++---
18 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/clang/include/clang-c/BuildSystem.h
b/clang/include/clang-c/BuildSystem.h
index 57e16af20a70..3281b57818e2 100644
--- a/clang/include/clang-c/BuildSystem.h
+++ b/clang/include/clang-c/BuildSystem.h
@@ -149,5 +149,5 @@ CINDEX_LINKAGE void
clang_ModuleMapDescriptor_dispose(CXModuleMapDescriptor);
LLVM_CLANG_C_EXTERN_C_END
-#endif /* CLANG_C_BUILD_SYSTEM_H */
+#endif /* LLVM_CLANG_C_BUILDSYSTEM_H */
diff --git a/clang/include/clang-c/CXSourceLocation.h
b/clang/include/clang-c/CXSourceLocation.h
index 421802151d02..a9b597bc21b9 100644
--- a/clang/include/clang-c/CXSourceLocation.h
+++ b/clang/include/clang-c/CXSourceLocation.h
@@ -11,8 +11,8 @@
|*
*|
\*===----------------------------------------------------------------------===*/
-#ifndef LLVM_CLANG_C_CXSOURCE_LOCATION_H
-#define LLVM_CLANG_C_CXSOURCE_LOCATION_H
+#ifndef LLVM_CLANG_C_CXSOURCELOCATION_H
+#define LLVM_CLANG_C_CXSOURCELOCATION_H
#include "clang-c/CXFile.h"
#include "clang-c/CXString.h"
diff --git a/clang/include/clang-c/Documentation.h
b/clang/include/clang-c/Documentation.h
index e04c50a0e68b..77ea889b52e1 100644
--- a/clang/include/clang-c/Documentation.h
+++ b/clang/include/clang-c/Documentation.h
@@ -615,5 +615,5 @@ CINDEX_LINKAGE CXString
clang_getSymbolGraphForCursor(CXCursor cursor);
LLVM_CLANG_C_EXTERN_C_END
-#endif /* CLANG_C_DOCUMENTATION_H */
+#endif /* LLVM_CLANG_C_DOCUMENTATION_H */
diff --git a/clang/include/clang-c/ExternC.h b/clang/include/clang-c/ExternC.h
index 384f24d47b0b..19ca595e4765 100644
--- a/clang/include/clang-c/ExternC.h
+++ b/clang/include/clang-c/ExternC.h
@@ -11,8 +11,8 @@
|*
*|
\*===----------------------------------------------------------------------===*/
-#ifndef LLVM_CLANG_C_EXTERN_C_H
-#define LLVM_CLANG_C_EXTERN_C_H
+#ifndef LLVM_CLANG_C_EXTERNC_H
+#define LLVM_CLANG_C_EXTERNC_H
#ifdef __clang__
#define LLVM_CLANG_C_STRICT_PROTOTYPES_BEGIN
\
diff --git a/clang/include/clang-c/FatalErrorHandler.h
b/clang/include/clang-c/FatalErrorHandler.h
index 4f18980dea24..68386d5790b1 100644
--- a/clang/include/clang-c/FatalErrorHandler.h
+++ b/clang/include/clang-c/FatalErrorHandler.h
@@ -7,8 +7,8 @@
|*
*|
\*===----------------------------------------------------------------------===*/
-#ifndef LLVM_CLANG_C_FATAL_ERROR_HANDLER_H
-#define LLVM_CLANG_C_FATAL_ERROR_HANDLER_H
+#ifndef LLVM_CLANG_C_FATALERRORHANDLER_H
+#define LLVM_CLANG_C_FATALERRORHANDLER_H
#include "clang-c/ExternC.h"
#include "clang-c/Platform.h"
diff --git a/clang/include/clang/APINotes/APINotesReader.h
b/clang/include/clang/APINotes/APINotesReader.h
index baf633406402..898c3d13d728 100644
--- a/clang/include/clang/APINotes/APINotesReader.h
+++ b/clang/include/clang/APINotes/APINotesReader.h
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_APINOTES_READER_H
-#define LLVM_CLANG_APINOTES_READER_H
+#ifndef LLVM_CLANG_APINOTES_APINOTESREADER_H
+#define LLVM_CLANG_APINOTES_APINOTESREADER_H
#include "clang/APINotes/Types.h"
#include "llvm/Support/MemoryBuffer.h"
@@ -225,4 +225,4 @@ public:
} // end namespace api_notes
} // end namespace clang
-#endif // LLVM_CLANG_APINOTES_READER_H
+#endif // LLVM_CLANG_APINOTES_APINOTESREADER_H
diff --git a/clang/include/clang/APINotes/APINotesWriter.h
b/clang/include/clang/APINotes/APINotesWriter.h
index 3cc16c3d959f..6d1497775e46 100644
--- a/clang/include/clang/APINotes/APINotesWriter.h
+++ b/clang/include/clang/APINotes/APINotesWriter.h
@@ -12,8 +12,8 @@
// method parameters.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_APINOTES_WRITER_H
-#define LLVM_CLANG_APINOTES_WRITER_H
+#ifndef LLVM_CLANG_APINOTES_APINOTESWRITER_H
+#define LLVM_CLANG_APINOTES_APINOTESWRITER_H
#include "clang/APINotes/Types.h"
#include "llvm/ADT/StringRef.h"
@@ -134,4 +134,4 @@ public:
} // namespace api_notes
} // namespace clang
-#endif // LLVM_CLANG_APINOTES_WRITER_H
+#endif // LLVM_CLANG_APINOTES_APINOTESWRITER_H
diff --git a/clang/include/clang/CodeGen/ObjectFilePCHContainerWriter.h
b/clang/include/clang/CodeGen/ObjectFilePCHContainerWriter.h
index 26ee9f22258c..1476fe2f390c 100644
--- a/clang/include/clang/CodeGen/ObjectFilePCHContainerWriter.h
+++ b/clang/include/clang/CodeGen/ObjectFilePCHContainerWriter.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_CODEGEN_OBJECTFILEPCHCONTAINEROPERATIONS_H
-#define LLVM_CLANG_CODEGEN_OBJECTFILEPCHCONTAINEROPERATIONS_H
+#ifndef LLVM_CLANG_CODEGEN_OBJECTFILEPCHCONTAINERWRITER_H
+#define LLVM_CLANG_CODEGEN_OBJECTFILEPCHCONTAINERWRITER_H
#include "clang/Frontend/PCHContainerOperations.h"
diff --git a/clang/include/clang/ExtractAPI/APIIgnoresList.h
b/clang/include/clang/ExtractAPI/APIIgnoresList.h
index 3eee8e336cb6..0cb0af16d44f 100644
--- a/clang/include/clang/ExtractAPI/APIIgnoresList.h
+++ b/clang/include/clang/ExtractAPI/APIIgnoresList.h
@@ -11,8 +11,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_API_IGNORES_LIST_H
-#define LLVM_CLANG_API_IGNORES_LIST_H
+#ifndef LLVM_CLANG_EXTRACTAPI_APIIGNORESLIST_H
+#define LLVM_CLANG_EXTRACTAPI_APIIGNORESLIST_H
#include "clang/Basic/FileManager.h"
#include "llvm/ADT/SmallVector.h"
@@ -73,4 +73,4 @@ private:
} // namespace extractapi
} // namespace clang
-#endif // LLVM_CLANG_API_IGNORES_LIST_H
+#endif // LLVM_CLANG_EXTRACTAPI_APIIGNORESLIST_H
diff --git a/clang/include/clang/ExtractAPI/DeclarationFragments.h
b/clang/include/clang/ExtractAPI/DeclarationFragments.h
index 4859225ef4ce..838c923566d4 100644
--- a/clang/include/clang/ExtractAPI/DeclarationFragments.h
+++ b/clang/include/clang/ExtractAPI/DeclarationFragments.h
@@ -15,8 +15,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_EXTRACTAPI_DECLARATION_FRAGMENTS_H
-#define LLVM_CLANG_EXTRACTAPI_DECLARATION_FRAGMENTS_H
+#ifndef LLVM_CLANG_EXTRACTAPI_DECLARATIONFRAGMENTS_H
+#define LLVM_CLANG_EXTRACTAPI_DECLARATIONFRAGMENTS_H
#include "clang/AST/ASTContext.h"
#include "clang/AST/Decl.h"
@@ -482,4 +482,4 @@ DeclarationFragmentsBuilder::getFunctionSignature(const
FunctionT *Function) {
} // namespace extractapi
} // namespace clang
-#endif // LLVM_CLANG_EXTRACTAPI_DECLARATION_FRAGMENTS_H
+#endif // LLVM_CLANG_EXTRACTAPI_DECLARATIONFRAGMENTS_H
diff --git a/clang/include/clang/ExtractAPI/ExtractAPIActionBase.h
b/clang/include/clang/ExtractAPI/ExtractAPIActionBase.h
index 08210a7ee059..59666d02f51c 100644
--- a/clang/include/clang/ExtractAPI/ExtractAPIActionBase.h
+++ b/clang/include/clang/ExtractAPI/ExtractAPIActionBase.h
@@ -12,8 +12,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_EXTRACTAPI_ACTION_BASE_H
-#define LLVM_CLANG_EXTRACTAPI_ACTION_BASE_H
+#ifndef LLVM_CLANG_EXTRACTAPI_EXTRACTAPIACTIONBASE_H
+#define LLVM_CLANG_EXTRACTAPI_EXTRACTAPIACTIONBASE_H
#include "clang/ExtractAPI/API.h"
#include "clang/ExtractAPI/APIIgnoresList.h"
@@ -53,4 +53,4 @@ protected:
} // namespace clang
-#endif // LLVM_CLANG_EXTRACTAPI_ACTION_BASE_H
+#endif // LLVM_CLANG_EXTRACTAPI_EXTRACTAPIACTIONBASE_H
diff --git a/clang/include/clang/ExtractAPI/ExtractAPIVisitor.h
b/clang/include/clang/ExtractAPI/ExtractAPIVisitor.h
index 9ea664f57f82..38bf19cfebfb 100644
--- a/clang/include/clang/ExtractAPI/ExtractAPIVisitor.h
+++ b/clang/include/clang/ExtractAPI/ExtractAPIVisitor.h
@@ -11,8 +11,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_EXTRACTAPI_EXTRACT_API_VISITOR_H
-#define LLVM_CLANG_EXTRACTAPI_EXTRACT_API_VISITOR_H
+#ifndef LLVM_CLANG_EXTRACTAPI_EXTRACTAPIVISITOR_H
+#define LLVM_CLANG_EXTRACTAPI_EXTRACTAPIVISITOR_H
#include "clang/AST/ASTContext.h"
#include "clang/AST/Decl.h"
@@ -1555,4 +1555,4 @@ public:
} // namespace extractapi
} // namespace clang
-#endif // LLVM_CLANG_EXTRACTAPI_EXTRACT_API_VISITOR_H
+#endif // LLVM_CLANG_EXTRACTAPI_EXTRACTAPIVISITOR_H
diff --git a/clang/include/clang/ExtractAPI/FrontendActions.h
b/clang/include/clang/ExtractAPI/FrontendActions.h
index 08045a30823d..c7cbfe567891 100644
--- a/clang/include/clang/ExtractAPI/FrontendActions.h
+++ b/clang/include/clang/ExtractAPI/FrontendActions.h
@@ -12,8 +12,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_EXTRACTAPI_FRONTEND_ACTIONS_H
-#define LLVM_CLANG_EXTRACTAPI_FRONTEND_ACTIONS_H
+#ifndef LLVM_CLANG_EXTRACTAPI_FRONTENDACTIONS_H
+#define LLVM_CLANG_EXTRACTAPI_FRONTENDACTIONS_H
#include "clang/ExtractAPI/ExtractAPIActionBase.h"
#include "clang/Frontend/FrontendAction.h"
@@ -86,4 +86,4 @@ private:
} // namespace clang
-#endif // LLVM_CLANG_EXTRACTAPI_FRONTEND_ACTIONS_H
+#endif // LLVM_CLANG_EXTRACTAPI_FRONTENDACTIONS_H
diff --git a/clang/include/clang/ExtractAPI/Serialization/APISetVisitor.h
b/clang/include/clang/ExtractAPI/Serialization/APISetVisitor.h
index 07f14f349f3d..ae1acc663a09 100644
--- a/clang/include/clang/ExtractAPI/Serialization/APISetVisitor.h
+++ b/clang/include/clang/ExtractAPI/Serialization/APISetVisitor.h
@@ -11,8 +11,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_EXTRACTAPI_SERIALIZATION_SERIALIZERBASE_H
-#define LLVM_CLANG_EXTRACTAPI_SERIALIZATION_SERIALIZERBASE_H
+#ifndef LLVM_CLANG_EXTRACTAPI_SERIALIZATION_APISETVISITOR_H
+#define LLVM_CLANG_EXTRACTAPI_SERIALIZATION_APISETVISITOR_H
#include "clang/ExtractAPI/API.h"
@@ -169,4 +169,4 @@ bool APISetVisitor<Derived>::traverseAPIRecord(const
APIRecord *Record) {
} // namespace extractapi
} // namespace clang
-#endif // LLVM_CLANG_EXTRACTAPI_SERIALIZATION_SERIALIZERBASE_H
+#endif // LLVM_CLANG_EXTRACTAPI_SERIALIZATION_APISETVISITOR_H
diff --git a/clang/include/clang/ExtractAPI/TypedefUnderlyingTypeResolver.h
b/clang/include/clang/ExtractAPI/TypedefUnderlyingTypeResolver.h
index 54aa11c354c0..d7804e49fbe7 100644
--- a/clang/include/clang/ExtractAPI/TypedefUnderlyingTypeResolver.h
+++ b/clang/include/clang/ExtractAPI/TypedefUnderlyingTypeResolver.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_UNDERLYING_TYPE_RESOLVER_H
-#define LLVM_CLANG_UNDERLYING_TYPE_RESOLVER_H
+#ifndef LLVM_CLANG_EXTRACTAPI_TYPEDEFUNDERLYINGTYPERESOLVER_H
+#define LLVM_CLANG_EXTRACTAPI_TYPEDEFUNDERLYINGTYPERESOLVER_H
#include "clang/AST/ASTContext.h"
#include "clang/AST/Decl.h"
@@ -45,4 +45,4 @@ private:
} // namespace extractapi
} // namespace clang
-#endif // LLVM_CLANG_UNDERLYING_TYPE_RESOLVER_H
+#endif // LLVM_CLANG_EXTRACTAPI_TYPEDEFUNDERLYINGTYPERESOLVER_H
diff --git a/clang/include/clang/Tooling/Inclusions/HeaderAnalysis.h
b/clang/include/clang/Tooling/Inclusions/HeaderAnalysis.h
index 34ec2d80d06a..46dbc7e05817 100644
--- a/clang/include/clang/Tooling/Inclusions/HeaderAnalysis.h
+++ b/clang/include/clang/Tooling/Inclusions/HeaderAnalysis.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_TOOLING_INCLUSIONS_HEADER_ANALYSIS_H
-#define LLVM_CLANG_TOOLING_INCLUSIONS_HEADER_ANALYSIS_H
+#ifndef LLVM_CLANG_TOOLING_INCLUSIONS_HEADERANALYSIS_H
+#define LLVM_CLANG_TOOLING_INCLUSIONS_HEADERANALYSIS_H
#include "clang/Basic/FileEntry.h"
#include "llvm/ADT/StringRef.h"
@@ -43,4 +43,4 @@ std::optional<llvm::StringRef> parseIWYUPragma(const char
*Text);
} // namespace tooling
} // namespace clang
-#endif // LLVM_CLANG_TOOLING_INCLUSIONS_HEADER_ANALYSIS_H
+#endif // LLVM_CLANG_TOOLING_INCLUSIONS_HEADERANALYSIS_H
diff --git a/clang/include/clang/Tooling/Syntax/TokenBufferTokenManager.h
b/clang/include/clang/Tooling/Syntax/TokenBufferTokenManager.h
index 6522af584e9a..47f7efbf4e9e 100644
--- a/clang/include/clang/Tooling/Syntax/TokenBufferTokenManager.h
+++ b/clang/include/clang/Tooling/Syntax/TokenBufferTokenManager.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_TOOLING_SYNTAX_TOKEN_BUFFER_TOKEN_MANAGER_H
-#define LLVM_CLANG_TOOLING_SYNTAX_TOKEN_BUFFER_TOKEN_MANAGER_H
+#ifndef LLVM_CLANG_TOOLING_SYNTAX_TOKENBUFFERTOKENMANAGER_H
+#define LLVM_CLANG_TOOLING_SYNTAX_TOKENBUFFERTOKENMANAGER_H
#include "clang/Tooling/Syntax/TokenManager.h"
#include "clang/Tooling/Syntax/Tokens.h"
@@ -67,4 +67,4 @@ private:
} // namespace syntax
} // namespace clang
-#endif // LLVM_CLANG_TOOLING_SYNTAX_TOKEN_BUFFER_TOKEN_MANAGER_H
+#endif // LLVM_CLANG_TOOLING_SYNTAX_TOKENBUFFERTOKENMANAGER_H
diff --git a/clang/include/clang/Tooling/Syntax/TokenManager.h
b/clang/include/clang/Tooling/Syntax/TokenManager.h
index 6f0d11ce0d6b..50db9eaf2d2c 100644
--- a/clang/include/clang/Tooling/Syntax/TokenManager.h
+++ b/clang/include/clang/Tooling/Syntax/TokenManager.h
@@ -16,8 +16,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_TOOLING_SYNTAX_TOKEN_MANAGER_H
-#define LLVM_CLANG_TOOLING_SYNTAX_TOKEN_MANAGER_H
+#ifndef LLVM_CLANG_TOOLING_SYNTAX_TOKENMANAGER_H
+#define LLVM_CLANG_TOOLING_SYNTAX_TOKENMANAGER_H
#include "llvm/ADT/StringRef.h"
#include <cstdint>
@@ -44,4 +44,4 @@ public:
} // namespace syntax
} // namespace clang
-#endif // LLVM_CLANG_TOOLING_SYNTAX_TOKEN_MANAGER_H
+#endif // LLVM_CLANG_TOOLING_SYNTAX_TOKENMANAGER_H
```
Shall I contribute those fixes?
https://github.com/llvm/llvm-project/pull/177315
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
