Skip to content

Conversation

@vbvictor
Copy link
Contributor

@vbvictor vbvictor commented Nov 6, 2025

All detected by https://clang.llvm.org/extra/clang-tidy/checks/llvm/header-guard.html.
Some headers didn't have guards, so they were added.

@llvmbot
Copy link
Member

llvmbot commented Nov 6, 2025

@llvm/pr-subscribers-clang-tools-extra

@llvm/pr-subscribers-clang-tidy

Author: Baranov Victor (vbvictor)

Changes

All detected by https://clang.llvm.org/extra/clang-tidy/checks/llvm/header-guard.html.
Some headers didn't have guards, so they were added.


Patch is 184.26 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/166669.diff

181 Files Affected:

  • (modified) clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/FileExtensionsSet.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h (+5)
  • (modified) clang-tools-extra/clang-tidy/abseil/DurationAdditionCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/abseil/DurationUnnecessaryConversionCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/abseil/NoInternalDependenciesCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/altera/SingleWorkItemBarrierCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecAccept4Check.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecCreatCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecDupCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecEpollCreate1Check.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecEpollCreateCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecFopenCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecInotifyInit1Check.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecInotifyInitCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecMemfdCreateCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecOpenCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecPipe2Check.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecPipeCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/android/CloexecSocketCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/boost/UseToStringCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/CopyConstructorInitCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/DanglingHandleCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/DynamicStaticInitializersCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/FoldInitTypeCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/IntegerDivisionCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/MisplacedOperatorInStrlenInAllocCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/MisplacedPointerArithmeticInAllocCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/MultipleStatementMacroCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/NondeterministicPointerIterationOrderCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/NotNullTerminatedResultCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/PosixReturnCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/StringConstructorCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/SuspiciousMemsetUsageCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/UndefinedMemoryManipulationCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/UndelegatedConstructorCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/bugprone/VirtualNearMissCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cert/FloatLoopCounter.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cert/LimitedRandomnessCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cert/ProperlySeededRandomGeneratorCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/InterfacesGlobalInitCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/NoMallocCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/OwningMemoryCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsArrayToPointerDecayCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsAvoidUncheckedContainerAccess.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsPointerArithmeticCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeConstCastCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeCstyleCastCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeReinterpretCastCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeVarargCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/SlicingCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsCallsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsDeclarationsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/fuchsia/MultipleInheritanceCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/fuchsia/OverloadedOperatorCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/fuchsia/StaticallyConstructedObjectsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/fuchsia/TrailingReturnCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/fuchsia/VirtualInheritanceCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/google/DefaultArgumentsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/google/FunctionNamingCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/google/GlobalVariableDeclarationCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/hicpp/ExceptionBaseclassCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/hicpp/MultiwayPathsCoveredCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/hicpp/NoAssemblerCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/hicpp/SignedBitwiseCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/llvm/HeaderGuardCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/llvm/IncludeOrderCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/llvm/PreferIsaOrDynCastInConditionalsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/llvm/PreferRegisterOverUnsignedCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/llvm/PreferStaticOverAnonymousNamespaceCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/llvm/TwineLocalCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/llvm/UseNewMLIROpBuilderCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/llvm/UseRangesCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/llvmlibc/NamespaceConstants.h (+5)
  • (modified) clang-tools-extra/clang-tidy/misc/ConfusableIdentifierCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/CoroutineHostileRAIICheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/DefinitionsInHeadersCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/MisplacedConstCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/NewDeleteOverloadsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/UnconventionalAssignOperatorCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/UnusedAliasDeclsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/DeprecatedHeadersCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/IntegralLiteralExpressionMatcher.h (+2-2)
  • (modified) clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/MakeSharedCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/MakeUniqueCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/PassByValueCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/RawStringLiteralCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/RedundantVoidArgCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/ReturnBracedInitListCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/UnaryStaticAssertCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseAutoCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseBoolLiteralsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseEmplaceCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseEqualsDefaultCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseEqualsDeleteCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseNoexceptCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.h (+4-4)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseTransparentFunctorsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseUncaughtExceptionsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseUsingCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/mpi/BufferDerefCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/mpi/TypeMismatchCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/objc/AssertEquals.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/performance/FasterStringFindCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/performance/ImplicitConversionInLoopCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/performance/InefficientStringConcatenationCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/performance/InefficientVectorOperationCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/performance/MoveConstArgCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/performance/NoexceptFunctionBaseCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/performance/TypePromotionInMathFnCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/performance/UnnecessaryCopyInitialization.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/performance/UnnecessaryValueParamCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/portability/RestrictSystemIncludesCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/portability/SIMDIntrinsicsCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/AvoidConstParamsInDecls.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/AvoidNestedConditionalOperatorCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStatic.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/DeleteNullPointerCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/DuplicateIncludeCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/ImplicitBoolConversionCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/IsolateDeclarationCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/MisplacedArrayIndexCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/NonConstParameterCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/RedundantDeclarationCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/RedundantFunctionPtrDereferenceCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/RedundantMemberInitCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/RedundantStringInitCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/SimplifyBooleanExprCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/StaticDefinitionInAnonymousNamespaceCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/UniqueptrDeleteReleaseCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/readability/UseAnyOfAllOfCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/tool/ClangTidyMain.h (+4)
  • (modified) clang-tools-extra/clang-tidy/utils/ASTUtils.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/utils/BracesAroundStatement.h (+5)
  • (modified) clang-tools-extra/clang-tidy/utils/DesignatedInitializers.h (+5)
  • (modified) clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/utils/ExprSequence.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/utils/FileExtensionsUtils.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/utils/IncludeInserter.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/utils/IncludeSorter.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/utils/LexerUtils.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/utils/NamespaceAliaser.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/utils/OptionsUtils.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/utils/TransformerClangTidyCheck.h (+3-3)
  • (modified) clang-tools-extra/clang-tidy/utils/UsingInserter.h (+3-3)
diff --git a/clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h b/clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h
index aaa04107a11ec..60cb01f13ae2f 100644
--- a/clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h
+++ b/clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLING_EXPANDMODULARHEADERSPPCALLBACKS_H_
-#define LLVM_CLANG_TOOLING_EXPANDMODULARHEADERSPPCALLBACKS_H_
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_EXPANDMODULARHEADERSPPCALLBACKS_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_EXPANDMODULARHEADERSPPCALLBACKS_H
 
 #include "clang/Lex/HeaderSearchOptions.h"
 #include "clang/Lex/PPCallbacks.h"
@@ -144,4 +144,4 @@ class ExpandModularHeadersPPCallbacks : public PPCallbacks {
 } // namespace tooling
 } // namespace clang
 
-#endif // LLVM_CLANG_TOOLING_EXPANDMODULARHEADERSPPCALLBACKS_H_
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_EXPANDMODULARHEADERSPPCALLBACKS_H
diff --git a/clang-tools-extra/clang-tidy/FileExtensionsSet.h b/clang-tools-extra/clang-tidy/FileExtensionsSet.h
index 95c221c84da2e..f97bb64ff946e 100644
--- a/clang-tools-extra/clang-tidy/FileExtensionsSet.h
+++ b/clang-tools-extra/clang-tidy/FileExtensionsSet.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FILE_EXTENSIONS_SET_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FILE_EXTENSIONS_SET_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FILEEXTENSIONSSET_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FILEEXTENSIONSSET_H
 
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/StringRef.h"
@@ -16,4 +16,4 @@ namespace clang::tidy {
 using FileExtensionsSet = llvm::SmallSet<llvm::StringRef, 5>;
 } // namespace clang::tidy
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FILE_EXTENSIONS_SET_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_FILEEXTENSIONSSET_H
diff --git a/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h b/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h
index 2ae3c00f7ee3e..33219e39a24ea 100644
--- a/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h
+++ b/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h
@@ -1,3 +1,6 @@
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_ABSEILMATCHER_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_ABSEILMATCHER_H
+
 //===- AbseilMatcher.h - clang-tidy ---------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -57,3 +60,5 @@ AST_POLYMORPHIC_MATCHER(
 }
 
 } // namespace clang::ast_matchers
+
+#endif
diff --git a/clang-tools-extra/clang-tidy/abseil/DurationAdditionCheck.h b/clang-tools-extra/clang-tidy/abseil/DurationAdditionCheck.h
index b728118c3da03..f5bab53035f87 100644
--- a/clang-tools-extra/clang-tidy/abseil/DurationAdditionCheck.h
+++ b/clang-tools-extra/clang-tidy/abseil/DurationAdditionCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_TIMEADDITIONCHECK_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_TIMEADDITIONCHECK_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_DURATIONADDITIONCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_DURATIONADDITIONCHECK_H
 
 #include "../ClangTidyCheck.h"
 
@@ -31,4 +31,4 @@ class DurationAdditionCheck : public ClangTidyCheck {
 
 } // namespace clang::tidy::abseil
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_TIMEADDITIONCHECK_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_DURATIONADDITIONCHECK_H
diff --git a/clang-tools-extra/clang-tidy/abseil/DurationUnnecessaryConversionCheck.h b/clang-tools-extra/clang-tidy/abseil/DurationUnnecessaryConversionCheck.h
index 59af8968e8b38..f5d25116b5bc1 100644
--- a/clang-tools-extra/clang-tidy/abseil/DurationUnnecessaryConversionCheck.h
+++ b/clang-tools-extra/clang-tidy/abseil/DurationUnnecessaryConversionCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_TIMEDOUBLECONVERSIONCHECK_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_TIMEDOUBLECONVERSIONCHECK_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_DURATIONUNNECESSARYCONVERSIONCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_DURATIONUNNECESSARYCONVERSIONCHECK_H
 
 #include "../ClangTidyCheck.h"
 
@@ -31,4 +31,4 @@ class DurationUnnecessaryConversionCheck : public ClangTidyCheck {
 
 } // namespace clang::tidy::abseil
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_TIMEDOUBLECONVERSIONCHECK_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_DURATIONUNNECESSARYCONVERSIONCHECK_H
diff --git a/clang-tools-extra/clang-tidy/abseil/NoInternalDependenciesCheck.h b/clang-tools-extra/clang-tidy/abseil/NoInternalDependenciesCheck.h
index 2911a1ad14ae8..22918311398f1 100644
--- a/clang-tools-extra/clang-tidy/abseil/NoInternalDependenciesCheck.h
+++ b/clang-tools-extra/clang-tidy/abseil/NoInternalDependenciesCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_NOINTERNALDEPSCHECK_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_NOINTERNALDEPSCHECK_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_NOINTERNALDEPENDENCIESCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_NOINTERNALDEPENDENCIESCHECK_H
 
 #include "../ClangTidyCheck.h"
 
@@ -31,4 +31,4 @@ class NoInternalDependenciesCheck : public ClangTidyCheck {
 
 } // namespace clang::tidy::abseil
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_NOINTERNALDEPSCHECK_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_NOINTERNALDEPENDENCIESCHECK_H
diff --git a/clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.h b/clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.h
index 703d9514e8c07..74a877a84d9e8 100644
--- a/clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.h
+++ b/clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_TIMECOMPARECHECK_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_TIMECOMPARECHECK_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_TIMECOMPARISONCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_TIMECOMPARISONCHECK_H
 
 #include "../ClangTidyCheck.h"
 
@@ -31,4 +31,4 @@ class TimeComparisonCheck : public ClangTidyCheck {
 
 } // namespace clang::tidy::abseil
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_TIMECOMPARECHECK_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ABSEIL_TIMECOMPARISONCHECK_H
diff --git a/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.h b/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.h
index 182d10b5539e5..441cf36446c9a 100644
--- a/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.h
+++ b/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ALTERA_KERNEL_NAME_RESTRICTION_CHECK_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ALTERA_KERNEL_NAME_RESTRICTION_CHECK_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ALTERA_KERNELNAMERESTRICTIONCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ALTERA_KERNELNAMERESTRICTIONCHECK_H
 
 #include "../ClangTidyCheck.h"
 
@@ -28,4 +28,4 @@ class KernelNameRestrictionCheck : public ClangTidyCheck {
 
 } // namespace clang::tidy::altera
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ALTERA_KERNEL_NAME_RESTRICTION_CHECK_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ALTERA_KERNELNAMERESTRICTIONCHECK_H
diff --git a/clang-tools-extra/clang-tidy/altera/SingleWorkItemBarrierCheck.h b/clang-tools-extra/clang-tidy/altera/SingleWorkItemBarrierCheck.h
index dab3dbce50371..dcfefcb0a1b29 100644
--- a/clang-tools-extra/clang-tidy/altera/SingleWorkItemBarrierCheck.h
+++ b/clang-tools-extra/clang-tidy/altera/SingleWorkItemBarrierCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ALTERA_SINGLE_WORK_ITEM_BARRIER_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ALTERA_SINGLE_WORK_ITEM_BARRIER_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ALTERA_SINGLEWORKITEMBARRIERCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ALTERA_SINGLEWORKITEMBARRIERCHECK_H
 
 #include "../ClangTidyCheck.h"
 
@@ -33,4 +33,4 @@ class SingleWorkItemBarrierCheck : public ClangTidyCheck {
 
 } // namespace clang::tidy::altera
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ALTERA_SINGLE_WORK_ITEM_BARRIER_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ALTERA_SINGLEWORKITEMBARRIERCHECK_H
diff --git a/clang-tools-extra/clang-tidy/android/CloexecAccept4Check.h b/clang-tools-extra/clang-tidy/android/CloexecAccept4Check.h
index 02c4e0056ea15..5637fc8bb350e 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecAccept4Check.h
+++ b/clang-tools-extra/clang-tidy/android/CloexecAccept4Check.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_ACCEPT4_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_ACCEPT4_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECACCEPT4CHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECACCEPT4CHECK_H
 
 #include "CloexecCheck.h"
 
@@ -27,4 +27,4 @@ class CloexecAccept4Check : public CloexecCheck {
 
 } // namespace clang::tidy::android
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_ACCEPT4_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECACCEPT4CHECK_H
diff --git a/clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.h b/clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.h
index 4540f938fd478..332a97ace91a4 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.h
+++ b/clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_ACCEPT_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_ACCEPT_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECACCEPTCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECACCEPTCHECK_H
 
 #include "CloexecCheck.h"
 
@@ -27,4 +27,4 @@ class CloexecAcceptCheck : public CloexecCheck {
 
 } // namespace clang::tidy::android
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_ACCEPT_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECACCEPTCHECK_H
diff --git a/clang-tools-extra/clang-tidy/android/CloexecCheck.h b/clang-tools-extra/clang-tidy/android/CloexecCheck.h
index 858d96ab45b61..fc1accd5b4d4a 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecCheck.h
+++ b/clang-tools-extra/clang-tidy/android/CloexecCheck.h
@@ -12,8 +12,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECCHECK_H
 
 #include "../ClangTidyCheck.h"
 
@@ -97,4 +97,4 @@ class CloexecCheck : public ClangTidyCheck {
 
 } // namespace clang::tidy::android
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECCHECK_H
diff --git a/clang-tools-extra/clang-tidy/android/CloexecCreatCheck.h b/clang-tools-extra/clang-tidy/android/CloexecCreatCheck.h
index ee2f51abf05fc..d7d2b42049cd8 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecCreatCheck.h
+++ b/clang-tools-extra/clang-tidy/android/CloexecCreatCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_CREAT_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_CREAT_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECCREATCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECCREATCHECK_H
 
 #include "CloexecCheck.h"
 
@@ -27,4 +27,4 @@ class CloexecCreatCheck : public CloexecCheck {
 
 } // namespace clang::tidy::android
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_CREAT_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECCREATCHECK_H
diff --git a/clang-tools-extra/clang-tidy/android/CloexecDupCheck.h b/clang-tools-extra/clang-tidy/android/CloexecDupCheck.h
index f5699685ed086..4eae507b99b10 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecDupCheck.h
+++ b/clang-tools-extra/clang-tidy/android/CloexecDupCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_DUP_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_DUP_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECDUPCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECDUPCHECK_H
 
 #include "CloexecCheck.h"
 
@@ -28,4 +28,4 @@ class CloexecDupCheck : public CloexecCheck {
 
 } // namespace clang::tidy::android
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_DUP_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECDUPCHECK_H
diff --git a/clang-tools-extra/clang-tidy/android/CloexecEpollCreate1Check.h b/clang-tools-extra/clang-tidy/android/CloexecEpollCreate1Check.h
index f467b87a6cf70..03a529f02a6d7 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecEpollCreate1Check.h
+++ b/clang-tools-extra/clang-tidy/android/CloexecEpollCreate1Check.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_EPOLL_CREATE1_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_EPOLL_CREATE1_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECEPOLLCREATE1CHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECEPOLLCREATE1CHECK_H
 
 #include "CloexecCheck.h"
 
@@ -27,4 +27,4 @@ class CloexecEpollCreate1Check : public CloexecCheck {
 
 } // namespace clang::tidy::android
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_EPOLL_CREATE1_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECEPOLLCREATE1CHECK_H
diff --git a/clang-tools-extra/clang-tidy/android/CloexecEpollCreateCheck.h b/clang-tools-extra/clang-tidy/android/CloexecEpollCreateCheck.h
index a8d17c82d457d..243b9bd7b1317 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecEpollCreateCheck.h
+++ b/clang-tools-extra/clang-tidy/android/CloexecEpollCreateCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_EPOLL_CREATE_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_EPOLL_CREATE_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECEPOLLCREATECHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECEPOLLCREATECHECK_H
 
 #include "CloexecCheck.h"
 
@@ -27,4 +27,4 @@ class CloexecEpollCreateCheck : public CloexecCheck {
 
 } // namespace clang::tidy::android
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_EPOLL_CREATE_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECEPOLLCREATECHECK_H
diff --git a/clang-tools-extra/clang-tidy/android/CloexecFopenCheck.h b/clang-tools-extra/clang-tidy/android/CloexecFopenCheck.h
index 646b237a663e0..a018fc5deaddb 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecFopenCheck.h
+++ b/clang-tools-extra/clang-tidy/android/CloexecFopenCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_FOPEN_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_FOPEN_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECFOPENCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECFOPENCHECK_H
 
 #include "CloexecCheck.h"
 
@@ -30,4 +30,4 @@ class CloexecFopenCheck : public CloexecCheck {
 
 } // namespace clang::tidy::android
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_FOPEN_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECFOPENCHECK_H
diff --git a/clang-tools-extra/clang-tidy/android/CloexecInotifyInit1Check.h b/clang-tools-extra/clang-tidy/android/CloexecInotifyInit1Check.h
index 3960d05e2e1f0..c2e45332fd048 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecInotifyInit1Check.h
+++ b/clang-tools-extra/clang-tidy/android/CloexecInotifyInit1Check.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_INOTIFY_INIT1_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_INOTIFY_INIT1_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECINOTIFYINIT1CHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECINOTIFYINIT1CHECK_H
 
 #include "CloexecCheck.h"
 
@@ -27,4 +27,4 @@ class CloexecInotifyInit1Check : public CloexecCheck {
 
 } // namespace clang::tidy::android
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_INOTIFY_INIT1_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECINOTIFYINIT1CHECK_H
diff --git a/clang-tools-extra/clang-tidy/android/CloexecInotifyInitCheck.h b/clang-tools-extra/clang-tidy/android/CloexecInotifyInitCheck.h
index cb9e6820571bc..cd202c2ad97f8 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecInotifyInitCheck.h
+++ b/clang-tools-extra/clang-tidy/android/CloexecInotifyInitCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_INOTIFY_INIT_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_INOTIFY_INIT_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECINOTIFYINITCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECINOTIFYINITCHECK_H
 
 #include "CloexecCheck.h"
 
@@ -27,4 +27,4 @@ class CloexecInotifyInitCheck : public CloexecCheck {
 
 } // namespace clang::tidy::android
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_INOTIFY_INIT_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECINOTIFYINITCHECK_H
diff --git a/clang-tools-extra/clang-tidy/android/CloexecMemfdCreateCheck.h b/clang-tools-extra/clang-tidy/android/CloexecMemfdCreateCheck.h
index dd96ee968f3b4..1a77c7fcb196f 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecMemfdCreateCheck.h
+++ b/clang-tools-extra/clang-tidy/android/CloexecMemfdCreateCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_MEMFD_CREATE_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_MEMFD_CREATE_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECMEMFDCREATECHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECMEMFDCREATECHECK_H
 
 #include "CloexecCheck.h"
 
@@ -27,4 +27,4 @@ class CloexecMemfdCreateCheck : public CloexecCheck {
 
 } // namespace clang::tidy::android
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_MEMFD_CREATE_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECMEMFDCREATECHECK_H
diff --git a/clang-tools-extra/clang-tidy/android/CloexecOpenCheck.h b/clang-tools-extra/clang-tidy/android/CloexecOpenCheck.h
index d95fe21fb3e88..d30b456dcdc17 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecOpenCheck.h
+++ b/clang-tools-extra/clang-tidy/android/CloexecOpenCheck.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_OPEN_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_OPEN_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXECOPENCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CL...
[truncated]

@github-actions
Copy link

github-actions bot commented Nov 6, 2025

✅ With the latest revision this PR passed the C/C++ code formatter.


#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_LLVM_HEADERGUARDCHECK_H
#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_LLVM_HEADERGUARDCHECK_H
#ifndef LLVM_HEADERGUARDCHECK_H
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change correct? Same for other files in this directory.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Soo I guess the check removes leading part if sees "LLVM" in check-name. Seem like a general bug.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filed #166750, I will undo this changes manually

@localspook
Copy link
Contributor

Some headers didn't have guards

👀

@vbvictor
Copy link
Contributor Author

vbvictor commented Nov 6, 2025

Noted about missing "Check" in filenames and classnames.
I think this is a broader problem that we should solve separately.
Resolving all corresponding issues.

@vbvictor
Copy link
Contributor Author

vbvictor commented Nov 6, 2025

Noted about missing "Check" in filenames and classnames. I think this is a broader problem that we should solve separately. Resolving all corresponding issues.

Filed #166753 for it

@vbvictor vbvictor force-pushed the acp/vbvictor/6653940020867658 branch from 6989b32 to eaa0ab5 Compare November 6, 2025 13:35
@vbvictor vbvictor force-pushed the acp/vbvictor/6653940020867658 branch from eaa0ab5 to 6594656 Compare November 6, 2025 13:43
Copy link
Contributor

@localspook localspook left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noted about missing "Check" in filenames and classnames.
I think this is a broader problem that we should solve separately.

Fair enough, in that case LGTM

@vbvictor vbvictor merged commit 9a9e3e3 into llvm:main Nov 7, 2025
11 checks passed
@vbvictor vbvictor deleted the acp/vbvictor/6653940020867658 branch November 7, 2025 20:23
vinay-deshmukh pushed a commit to vinay-deshmukh/llvm-project that referenced this pull request Nov 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants