[llvm] aa5c09b - [llvm] Fix header guards (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 5 21:02:52 PST 2021
Author: Kazu Hirata
Date: 2021-02-05T21:02:06-08:00
New Revision: aa5c09bead260a6008ed7e92a1ee7b1023703b40
URL: https://github.com/llvm/llvm-project/commit/aa5c09bead260a6008ed7e92a1ee7b1023703b40
DIFF: https://github.com/llvm/llvm-project/commit/aa5c09bead260a6008ed7e92a1ee7b1023703b40.diff
LOG: [llvm] Fix header guards (NFC)
Identified with llvm-header-guard.
Added:
Modified:
llvm/include/llvm/ADT/CachedHashString.h
llvm/include/llvm/ADT/EpochTracker.h
llvm/include/llvm/ADT/FloatingPointMode.h
llvm/include/llvm/ADT/FunctionExtras.h
llvm/include/llvm/ADT/ScopeExit.h
llvm/include/llvm/Analysis/AssumeBundleQueries.h
llvm/include/llvm/Analysis/DemandedBits.h
llvm/include/llvm/Analysis/DependenceGraphBuilder.h
llvm/include/llvm/Analysis/DivergenceAnalysis.h
llvm/include/llvm/Analysis/FunctionPropertiesAnalysis.h
llvm/include/llvm/Analysis/InlineAdvisor.h
llvm/include/llvm/Analysis/IteratedDominanceFrontier.h
llvm/include/llvm/Analysis/LegacyDivergenceAnalysis.h
llvm/include/llvm/Analysis/ObjCARCAnalysisUtils.h
llvm/include/llvm/Analysis/OptimizationRemarkEmitter.h
llvm/include/llvm/Analysis/ProfileSummaryInfo.h
llvm/include/llvm/Analysis/SyncDependenceAnalysis.h
llvm/include/llvm/Analysis/SyntheticCountsUtils.h
llvm/include/llvm/Analysis/Utils/ImportedFunctionsInliningStatistics.h
llvm/include/llvm/Analysis/Utils/Local.h
llvm/include/llvm/BinaryFormat/MsgPackReader.h
llvm/include/llvm/BinaryFormat/MsgPackWriter.h
llvm/include/llvm/Bitcode/BitcodeAnalyzer.h
llvm/include/llvm/CodeGen/AccelTable.h
llvm/include/llvm/CodeGen/AntiDepBreaker.h
llvm/include/llvm/CodeGen/BuiltinGCs.h
llvm/include/llvm/CodeGen/CSEConfigBase.h
llvm/include/llvm/CodeGen/DIE.h
llvm/include/llvm/CodeGen/DbgEntityHistoryCalculator.h
llvm/include/llvm/CodeGen/GlobalISel/Combiner.h
llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
llvm/include/llvm/CodeGen/GlobalISel/CombinerInfo.h
llvm/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h
llvm/include/llvm/CodeGen/GlobalISel/GISelWorkList.h
llvm/include/llvm/CodeGen/GlobalISel/Legalizer.h
llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
llvm/include/llvm/CodeGen/GlobalISel/LostDebugLocObserver.h
llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h
llvm/include/llvm/CodeGen/GlobalISel/RegisterBank.h
llvm/include/llvm/CodeGen/IndirectThunks.h
llvm/include/llvm/CodeGen/LazyMachineBlockFrequencyInfo.h
llvm/include/llvm/CodeGen/LiveIntervalCalc.h
llvm/include/llvm/CodeGen/LiveRangeCalc.h
llvm/include/llvm/CodeGen/MIRParser/MIParser.h
llvm/include/llvm/CodeGen/MIRPrinter.h
llvm/include/llvm/CodeGen/MachineLoopUtils.h
llvm/include/llvm/CodeGen/MachineOutliner.h
llvm/include/llvm/CodeGen/MachinePipeliner.h
llvm/include/llvm/CodeGen/MachineSizeOpts.h
llvm/include/llvm/CodeGen/ModuloSchedule.h
llvm/include/llvm/CodeGen/PBQP/Graph.h
llvm/include/llvm/CodeGen/RDFGraph.h
llvm/include/llvm/CodeGen/RDFLiveness.h
llvm/include/llvm/CodeGen/RDFRegisters.h
llvm/include/llvm/CodeGen/ReachingDefAnalysis.h
llvm/include/llvm/CodeGen/Register.h
llvm/include/llvm/CodeGen/RegisterUsageInfo.h
llvm/include/llvm/CodeGen/Spiller.h
llvm/include/llvm/CodeGen/SwiftErrorValueTracking.h
llvm/include/llvm/CodeGen/TargetInstrInfo.h
llvm/include/llvm/CodeGen/UnreachableBlockElim.h
llvm/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h
llvm/include/llvm/DebugInfo/CodeView/CVRecord.h
llvm/include/llvm/DebugInfo/CodeView/CodeViewError.h
llvm/include/llvm/DebugInfo/CodeView/DebugSubsection.h
llvm/include/llvm/DebugInfo/CodeView/DebugSubsectionVisitor.h
llvm/include/llvm/DebugInfo/CodeView/DebugUnknownSubsection.h
llvm/include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h
llvm/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
llvm/include/llvm/DebugInfo/DWARF/DWARFAttribute.h
llvm/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h
llvm/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h
llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h
llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAddr.h
llvm/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h
llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h
llvm/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h
llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h
llvm/include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h
llvm/include/llvm/DebugInfo/DWARF/DWARFDie.h
llvm/include/llvm/DebugInfo/DWARF/DWARFExpression.h
llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h
llvm/include/llvm/DebugInfo/DWARF/DWARFVerifier.h
llvm/include/llvm/DebugInfo/GSYM/DwarfTransformer.h
llvm/include/llvm/DebugInfo/GSYM/FileEntry.h
llvm/include/llvm/DebugInfo/GSYM/FileWriter.h
llvm/include/llvm/DebugInfo/GSYM/FunctionInfo.h
llvm/include/llvm/DebugInfo/GSYM/GsymCreator.h
llvm/include/llvm/DebugInfo/GSYM/GsymReader.h
llvm/include/llvm/DebugInfo/GSYM/Header.h
llvm/include/llvm/DebugInfo/GSYM/InlineInfo.h
llvm/include/llvm/DebugInfo/GSYM/LineEntry.h
llvm/include/llvm/DebugInfo/GSYM/LineTable.h
llvm/include/llvm/DebugInfo/GSYM/LookupResult.h
llvm/include/llvm/DebugInfo/GSYM/ObjectFileTransformer.h
llvm/include/llvm/DebugInfo/GSYM/Range.h
llvm/include/llvm/DebugInfo/GSYM/StringTable.h
llvm/include/llvm/DebugInfo/PDB/GenericError.h
llvm/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptor.h
llvm/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptorBuilder.h
llvm/include/llvm/DebugInfo/PDB/Native/DbiStream.h
llvm/include/llvm/DebugInfo/PDB/Native/DbiStreamBuilder.h
llvm/include/llvm/DebugInfo/PDB/Native/EnumTables.h
llvm/include/llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h
llvm/include/llvm/DebugInfo/PDB/Native/GlobalsStream.h
llvm/include/llvm/DebugInfo/PDB/Native/ISectionContribVisitor.h
llvm/include/llvm/DebugInfo/PDB/Native/InfoStream.h
llvm/include/llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h
llvm/include/llvm/DebugInfo/PDB/Native/InjectedSourceStream.h
llvm/include/llvm/DebugInfo/PDB/Native/NativeSymbolEnumerator.h
llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeFunctionSig.h
llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeTypedef.h
llvm/include/llvm/DebugInfo/PDB/Native/PDBFile.h
llvm/include/llvm/DebugInfo/PDB/Native/PDBFileBuilder.h
llvm/include/llvm/DebugInfo/PDB/Native/PDBStringTable.h
llvm/include/llvm/DebugInfo/PDB/Native/PDBStringTableBuilder.h
llvm/include/llvm/DebugInfo/PDB/Native/PublicsStream.h
llvm/include/llvm/DebugInfo/PDB/Native/RawConstants.h
llvm/include/llvm/DebugInfo/PDB/Native/RawError.h
llvm/include/llvm/DebugInfo/PDB/Native/RawTypes.h
llvm/include/llvm/DebugInfo/PDB/Native/SymbolStream.h
llvm/include/llvm/DebugInfo/PDB/Native/TpiHashing.h
llvm/include/llvm/DebugInfo/PDB/Native/TpiStream.h
llvm/include/llvm/DebugInfo/PDB/Native/TpiStreamBuilder.h
llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h
llvm/include/llvm/Demangle/DemangleConfig.h
llvm/include/llvm/Demangle/ItaniumDemangle.h
llvm/include/llvm/Demangle/MicrosoftDemangle.h
llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h
llvm/include/llvm/Demangle/StringView.h
llvm/include/llvm/Demangle/Utility.h
llvm/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcError.h
llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h
llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
llvm/include/llvm/ExecutionEngine/SectionMemoryManager.h
llvm/include/llvm/Frontend/OpenMP/OMPConstants.h
llvm/include/llvm/Frontend/OpenMP/OMPContext.h
llvm/include/llvm/Frontend/OpenMP/OMPGridValues.h
llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
llvm/include/llvm/FuzzMutate/FuzzerCLI.h
llvm/include/llvm/IR/DebugLoc.h
llvm/include/llvm/IR/FPEnv.h
llvm/include/llvm/IR/SafepointIRVerifier.h
llvm/include/llvm/InterfaceStub/ELFObjHandler.h
llvm/include/llvm/InterfaceStub/ELFStub.h
llvm/include/llvm/InterfaceStub/TBEHandler.h
llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
llvm/include/llvm/LTO/legacy/LTOModule.h
llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
llvm/include/llvm/LTO/legacy/UpdateCompilerUsed.h
llvm/include/llvm/MC/MCRegister.h
llvm/include/llvm/MCA/HardwareUnits/HardwareUnit.h
llvm/include/llvm/MCA/HardwareUnits/LSUnit.h
llvm/include/llvm/MCA/HardwareUnits/RegisterFile.h
llvm/include/llvm/MCA/HardwareUnits/ResourceManager.h
llvm/include/llvm/MCA/HardwareUnits/RetireControlUnit.h
llvm/include/llvm/MCA/HardwareUnits/Scheduler.h
llvm/include/llvm/MCA/Stages/DispatchStage.h
llvm/include/llvm/MCA/Stages/EntryStage.h
llvm/include/llvm/MCA/Stages/ExecuteStage.h
llvm/include/llvm/MCA/Stages/InstructionTables.h
llvm/include/llvm/MCA/Stages/MicroOpQueueStage.h
llvm/include/llvm/MCA/Stages/RetireStage.h
llvm/include/llvm/MCA/Stages/Stage.h
llvm/include/llvm/Object/COFFImportFile.h
llvm/include/llvm/Object/COFFModuleDefinition.h
llvm/include/llvm/Object/RelocationResolver.h
llvm/include/llvm/Object/StackMapParser.h
llvm/include/llvm/Object/TapiFile.h
llvm/include/llvm/Object/TapiUniversal.h
llvm/include/llvm/Object/WindowsMachineFlag.h
llvm/include/llvm/Object/WindowsResource.h
llvm/include/llvm/ObjectYAML/CodeViewYAMLTypeHashing.h
llvm/include/llvm/ObjectYAML/yaml2obj.h
llvm/include/llvm/ProfileData/GCOV.h
llvm/include/llvm/Remarks/BitstreamRemarkContainer.h
llvm/include/llvm/Remarks/BitstreamRemarkParser.h
llvm/include/llvm/Remarks/BitstreamRemarkSerializer.h
llvm/include/llvm/Remarks/RemarkFormat.h
llvm/include/llvm/Remarks/RemarkLinker.h
llvm/include/llvm/Remarks/RemarkParser.h
llvm/include/llvm/Remarks/RemarkSerializer.h
llvm/include/llvm/Remarks/RemarkStringTable.h
llvm/include/llvm/Remarks/YAMLRemarkSerializer.h
llvm/include/llvm/Support/AArch64TargetParser.h
llvm/include/llvm/Support/BinaryByteStream.h
llvm/include/llvm/Support/CachePruning.h
llvm/include/llvm/Support/CodeGenCoverage.h
llvm/include/llvm/Support/Errno.h
llvm/include/llvm/Support/FileCollector.h
llvm/include/llvm/Support/FormatVariadicDetails.h
llvm/include/llvm/Support/GenericIteratedDominanceFrontier.h
llvm/include/llvm/Support/GlobPattern.h
llvm/include/llvm/Support/InitLLVM.h
llvm/include/llvm/Support/LEB128.h
llvm/include/llvm/Support/MachineValueType.h
llvm/include/llvm/Support/NativeFormatting.h
llvm/include/llvm/Support/Signposts.h
llvm/include/llvm/Support/SmallVectorMemoryBuffer.h
llvm/include/llvm/Support/TarWriter.h
llvm/include/llvm/Support/TaskQueue.h
llvm/include/llvm/Support/ThreadPool.h
llvm/include/llvm/Support/TimeProfiler.h
llvm/include/llvm/Support/TypeSize.h
llvm/include/llvm/Support/WithColor.h
llvm/include/llvm/Support/X86DisassemblerDecoderCommon.h
llvm/include/llvm/Support/X86TargetParser.h
llvm/include/llvm/Target/CGPassBuilderOption.h
llvm/include/llvm/Target/TargetLoweringObjectFile.h
llvm/include/llvm/TextAPI/MachO/ArchitectureSet.h
llvm/include/llvm/TextAPI/MachO/InterfaceFile.h
llvm/include/llvm/TextAPI/MachO/PackedVersion.h
llvm/include/llvm/TextAPI/MachO/TextAPIReader.h
llvm/include/llvm/TextAPI/MachO/TextAPIWriter.h
llvm/include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
llvm/include/llvm/Transforms/IPO/Annotation2Metadata.h
llvm/include/llvm/Transforms/IPO/Attributor.h
llvm/include/llvm/Transforms/IPO/OpenMPOpt.h
llvm/include/llvm/Transforms/IPO/SampleProfile.h
llvm/include/llvm/Transforms/IPO/SyntheticCountsPropagation.h
llvm/include/llvm/Transforms/Instrumentation/AddressSanitizer.h
llvm/include/llvm/Transforms/Instrumentation/CGProfile.h
llvm/include/llvm/Transforms/Instrumentation/GCOVProfiler.h
llvm/include/llvm/Transforms/Instrumentation/HWAddressSanitizer.h
llvm/include/llvm/Transforms/Instrumentation/InstrOrderFile.h
llvm/include/llvm/Transforms/Instrumentation/InstrProfiling.h
llvm/include/llvm/Transforms/Instrumentation/PGOInstrumentation.h
llvm/include/llvm/Transforms/Instrumentation/PoisonChecking.h
llvm/include/llvm/Transforms/Scalar/AnnotationRemarks.h
llvm/include/llvm/Transforms/Scalar/CallSiteSplitting.h
llvm/include/llvm/Transforms/Scalar/GuardWidening.h
llvm/include/llvm/Transforms/Scalar/InstSimplifyPass.h
llvm/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h
llvm/include/llvm/Transforms/Scalar/LowerMatrixIntrinsics.h
llvm/include/llvm/Transforms/Scalar/LowerWidenableCondition.h
llvm/include/llvm/Transforms/Scalar/MakeGuardsExplicit.h
llvm/include/llvm/Transforms/Scalar/RewriteStatepointsForGC.h
llvm/include/llvm/Transforms/Scalar/ScalarizeMaskedMemIntrin.h
llvm/include/llvm/Transforms/Scalar/SpeculativeExecution.h
llvm/include/llvm/Transforms/Utils/CanonicalizeAliases.h
llvm/include/llvm/Transforms/Utils/CanonicalizeFreezeInLoops.h
llvm/include/llvm/Transforms/Utils/Debugify.h
llvm/include/llvm/Transforms/Utils/HelloWorld.h
llvm/include/llvm/Transforms/Utils/ModuleUtils.h
llvm/include/llvm/Transforms/Utils/NameAnonGlobals.h
llvm/include/llvm/Transforms/Utils/ScalarEvolutionExpander.h
llvm/include/llvm/Transforms/Utils/SymbolRewriter.h
llvm/include/llvm/Transforms/Vectorize/VectorCombine.h
llvm/include/llvm/WindowsManifest/WindowsManifestMerger.h
llvm/include/llvm/XRay/BlockIndexer.h
llvm/include/llvm/XRay/BlockPrinter.h
llvm/include/llvm/XRay/BlockVerifier.h
llvm/include/llvm/XRay/FDRLogBuilder.h
llvm/include/llvm/XRay/FDRRecordConsumer.h
llvm/include/llvm/XRay/FDRRecordProducer.h
llvm/include/llvm/XRay/FDRRecords.h
llvm/include/llvm/XRay/FDRTraceExpander.h
llvm/include/llvm/XRay/FDRTraceWriter.h
llvm/include/llvm/XRay/FileHeaderReader.h
llvm/include/llvm/XRay/Graph.h
llvm/include/llvm/XRay/InstrumentationMap.h
llvm/include/llvm/XRay/RecordPrinter.h
llvm/include/llvm/XRay/XRayRecord.h
llvm/include/llvm/XRay/YAMLXRayRecord.h
Removed:
################################################################################
diff --git a/llvm/include/llvm/ADT/CachedHashString.h b/llvm/include/llvm/ADT/CachedHashString.h
index 6233d0fc08fd..785bd07b3a44 100644
--- a/llvm/include/llvm/ADT/CachedHashString.h
+++ b/llvm/include/llvm/ADT/CachedHashString.h
@@ -16,8 +16,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ADT_CACHED_HASH_STRING_H
-#define LLVM_ADT_CACHED_HASH_STRING_H
+#ifndef LLVM_ADT_CACHEDHASHSTRING_H
+#define LLVM_ADT_CACHEDHASHSTRING_H
#include "llvm/ADT/DenseMapInfo.h"
#include "llvm/ADT/StringRef.h"
diff --git a/llvm/include/llvm/ADT/EpochTracker.h b/llvm/include/llvm/ADT/EpochTracker.h
index a782b4756898..7a2e4220afec 100644
--- a/llvm/include/llvm/ADT/EpochTracker.h
+++ b/llvm/include/llvm/ADT/EpochTracker.h
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ADT_EPOCH_TRACKER_H
-#define LLVM_ADT_EPOCH_TRACKER_H
+#ifndef LLVM_ADT_EPOCHTRACKER_H
+#define LLVM_ADT_EPOCHTRACKER_H
#include "llvm/Config/abi-breaking.h"
diff --git a/llvm/include/llvm/ADT/FloatingPointMode.h b/llvm/include/llvm/ADT/FloatingPointMode.h
index 698830937870..62c127a49620 100644
--- a/llvm/include/llvm/ADT/FloatingPointMode.h
+++ b/llvm/include/llvm/ADT/FloatingPointMode.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===/
-#ifndef LLVM_FLOATINGPOINTMODE_H
-#define LLVM_FLOATINGPOINTMODE_H
+#ifndef LLVM_ADT_FLOATINGPOINTMODE_H
+#define LLVM_ADT_FLOATINGPOINTMODE_H
#include "llvm/ADT/StringSwitch.h"
#include "llvm/Support/raw_ostream.h"
@@ -192,4 +192,4 @@ void DenormalMode::print(raw_ostream &OS) const {
}
-#endif // LLVM_FLOATINGPOINTMODE_H
+#endif // LLVM_ADT_FLOATINGPOINTMODE_H
diff --git a/llvm/include/llvm/ADT/FunctionExtras.h b/llvm/include/llvm/ADT/FunctionExtras.h
index 7f8fb103f148..c0a05bfc09db 100644
--- a/llvm/include/llvm/ADT/FunctionExtras.h
+++ b/llvm/include/llvm/ADT/FunctionExtras.h
@@ -29,8 +29,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ADT_FUNCTION_EXTRAS_H
-#define LLVM_ADT_FUNCTION_EXTRAS_H
+#ifndef LLVM_ADT_FUNCTIONEXTRAS_H
+#define LLVM_ADT_FUNCTIONEXTRAS_H
#include "llvm/ADT/PointerIntPair.h"
#include "llvm/ADT/PointerUnion.h"
@@ -380,4 +380,4 @@ class unique_function<R(P...) const>
} // end namespace llvm
-#endif // LLVM_ADT_FUNCTION_H
+#endif // LLVM_ADT_FUNCTIONEXTRAS_H
diff --git a/llvm/include/llvm/ADT/ScopeExit.h b/llvm/include/llvm/ADT/ScopeExit.h
index 712d91237739..61618818bae5 100644
--- a/llvm/include/llvm/ADT/ScopeExit.h
+++ b/llvm/include/llvm/ADT/ScopeExit.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ADT_SCOPE_EXIT_H
-#define LLVM_ADT_SCOPE_EXIT_H
+#ifndef LLVM_ADT_SCOPEEXIT_H
+#define LLVM_ADT_SCOPEEXIT_H
#include "llvm/Support/Compiler.h"
diff --git a/llvm/include/llvm/Analysis/AssumeBundleQueries.h b/llvm/include/llvm/Analysis/AssumeBundleQueries.h
index 4d2884284d67..333b14ff08c9 100644
--- a/llvm/include/llvm/Analysis/AssumeBundleQueries.h
+++ b/llvm/include/llvm/Analysis/AssumeBundleQueries.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_UTILS_ASSUMEBUNDLEQUERIES_H
-#define LLVM_TRANSFORMS_UTILS_ASSUMEBUNDLEQUERIES_H
+#ifndef LLVM_ANALYSIS_ASSUMEBUNDLEQUERIES_H
+#define LLVM_ANALYSIS_ASSUMEBUNDLEQUERIES_H
#include "llvm/IR/Attributes.h"
#include "llvm/IR/Instructions.h"
diff --git a/llvm/include/llvm/Analysis/DemandedBits.h b/llvm/include/llvm/Analysis/DemandedBits.h
index 7a8618a27ce7..66623fbdcdc1 100644
--- a/llvm/include/llvm/Analysis/DemandedBits.h
+++ b/llvm/include/llvm/Analysis/DemandedBits.h
@@ -18,8 +18,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ANALYSIS_DEMANDED_BITS_H
-#define LLVM_ANALYSIS_DEMANDED_BITS_H
+#ifndef LLVM_ANALYSIS_DEMANDEDBITS_H
+#define LLVM_ANALYSIS_DEMANDEDBITS_H
#include "llvm/ADT/APInt.h"
#include "llvm/ADT/DenseMap.h"
@@ -146,4 +146,4 @@ FunctionPass *createDemandedBitsWrapperPass();
} // end namespace llvm
-#endif // LLVM_ANALYSIS_DEMANDED_BITS_H
+#endif // LLVM_ANALYSIS_DEMANDEDBITS_H
diff --git a/llvm/include/llvm/Analysis/DependenceGraphBuilder.h b/llvm/include/llvm/Analysis/DependenceGraphBuilder.h
index 6f4e1be94164..332829cbc8a9 100644
--- a/llvm/include/llvm/Analysis/DependenceGraphBuilder.h
+++ b/llvm/include/llvm/Analysis/DependenceGraphBuilder.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ANALYSIS_DEPENDENCE_GRAPH_BUILDER_H
-#define LLVM_ANALYSIS_DEPENDENCE_GRAPH_BUILDER_H
+#ifndef LLVM_ANALYSIS_DEPENDENCEGRAPHBUILDER_H
+#define LLVM_ANALYSIS_DEPENDENCEGRAPHBUILDER_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/EquivalenceClasses.h"
@@ -200,4 +200,4 @@ template <class GraphType> class AbstractDependenceGraphBuilder {
} // namespace llvm
-#endif // LLVM_ANALYSIS_DEPENDENCE_GRAPH_BUILDER_H
+#endif // LLVM_ANALYSIS_DEPENDENCEGRAPHBUILDER_H
diff --git a/llvm/include/llvm/Analysis/DivergenceAnalysis.h b/llvm/include/llvm/Analysis/DivergenceAnalysis.h
index 2e4ae65d0981..a6530b2eb493 100644
--- a/llvm/include/llvm/Analysis/DivergenceAnalysis.h
+++ b/llvm/include/llvm/Analysis/DivergenceAnalysis.h
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ANALYSIS_DIVERGENCE_ANALYSIS_H
-#define LLVM_ANALYSIS_DIVERGENCE_ANALYSIS_H
+#ifndef LLVM_ANALYSIS_DIVERGENCEANALYSIS_H
+#define LLVM_ANALYSIS_DIVERGENCEANALYSIS_H
#include "llvm/ADT/DenseSet.h"
#include "llvm/Analysis/SyncDependenceAnalysis.h"
@@ -188,4 +188,4 @@ class GPUDivergenceAnalysis {
} // namespace llvm
-#endif // LLVM_ANALYSIS_DIVERGENCE_ANALYSIS_H
+#endif // LLVM_ANALYSIS_DIVERGENCEANALYSIS_H
diff --git a/llvm/include/llvm/Analysis/FunctionPropertiesAnalysis.h b/llvm/include/llvm/Analysis/FunctionPropertiesAnalysis.h
index a5f96e72ce97..cf07c873b17c 100644
--- a/llvm/include/llvm/Analysis/FunctionPropertiesAnalysis.h
+++ b/llvm/include/llvm/Analysis/FunctionPropertiesAnalysis.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_FUNCTIONPROPERTIESANALYSIS_H_
-#define LLVM_FUNCTIONPROPERTIESANALYSIS_H_
+#ifndef LLVM_ANALYSIS_FUNCTIONPROPERTIESANALYSIS_H
+#define LLVM_ANALYSIS_FUNCTIONPROPERTIESANALYSIS_H
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/IR/PassManager.h"
@@ -83,4 +83,4 @@ class FunctionPropertiesPrinterPass
};
} // namespace llvm
-#endif // LLVM_FUNCTIONPROPERTIESANALYSIS_H_
+#endif // LLVM_ANALYSIS_FUNCTIONPROPERTIESANALYSIS_H
diff --git a/llvm/include/llvm/Analysis/InlineAdvisor.h b/llvm/include/llvm/Analysis/InlineAdvisor.h
index c39fae13d3b8..469560cd8c8d 100644
--- a/llvm/include/llvm/Analysis/InlineAdvisor.h
+++ b/llvm/include/llvm/Analysis/InlineAdvisor.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
//
-#ifndef LLVM_INLINEADVISOR_H_
-#define LLVM_INLINEADVISOR_H_
+#ifndef LLVM_ANALYSIS_INLINEADVISOR_H
+#define LLVM_ANALYSIS_INLINEADVISOR_H
#include "llvm/Analysis/InlineCost.h"
#include "llvm/Config/llvm-config.h"
@@ -283,4 +283,4 @@ void setInlineRemark(CallBase &CB, StringRef Message);
/// Utility for extracting the inline cost message to a string.
std::string inlineCostStr(const InlineCost &IC);
} // namespace llvm
-#endif // LLVM_INLINEADVISOR_H_
+#endif // LLVM_ANALYSIS_INLINEADVISOR_H
diff --git a/llvm/include/llvm/Analysis/IteratedDominanceFrontier.h b/llvm/include/llvm/Analysis/IteratedDominanceFrontier.h
index 8166b52aa226..542a741ee07e 100644
--- a/llvm/include/llvm/Analysis/IteratedDominanceFrontier.h
+++ b/llvm/include/llvm/Analysis/IteratedDominanceFrontier.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ANALYSIS_IDF_H
-#define LLVM_ANALYSIS_IDF_H
+#ifndef LLVM_ANALYSIS_ITERATEDDOMINANCEFRONTIER_H
+#define LLVM_ANALYSIS_ITERATEDDOMINANCEFRONTIER_H
#include "llvm/Support/CFGDiff.h"
#include "llvm/Support/GenericIteratedDominanceFrontier.h"
diff --git a/llvm/include/llvm/Analysis/LegacyDivergenceAnalysis.h b/llvm/include/llvm/Analysis/LegacyDivergenceAnalysis.h
index 15400f5e07ff..6215af3d3236 100644
--- a/llvm/include/llvm/Analysis/LegacyDivergenceAnalysis.h
+++ b/llvm/include/llvm/Analysis/LegacyDivergenceAnalysis.h
@@ -12,8 +12,8 @@
// better decisions.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ANALYSIS_LEGACY_DIVERGENCE_ANALYSIS_H
-#define LLVM_ANALYSIS_LEGACY_DIVERGENCE_ANALYSIS_H
+#ifndef LLVM_ANALYSIS_LEGACYDIVERGENCEANALYSIS_H
+#define LLVM_ANALYSIS_LEGACYDIVERGENCEANALYSIS_H
#include "llvm/ADT/DenseSet.h"
#include "llvm/Pass.h"
@@ -73,4 +73,4 @@ class LegacyDivergenceAnalysis : public FunctionPass {
};
} // End llvm namespace
-#endif //LLVM_ANALYSIS_LEGACY_DIVERGENCE_ANALYSIS_H
+#endif // LLVM_ANALYSIS_LEGACYDIVERGENCEANALYSIS_H
diff --git a/llvm/include/llvm/Analysis/ObjCARCAnalysisUtils.h b/llvm/include/llvm/Analysis/ObjCARCAnalysisUtils.h
index 16c5f6701da0..62bdade95d96 100644
--- a/llvm/include/llvm/Analysis/ObjCARCAnalysisUtils.h
+++ b/llvm/include/llvm/Analysis/ObjCARCAnalysisUtils.h
@@ -19,8 +19,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_ANALYSIS_OBJCARCANALYSISUTILS_H
-#define LLVM_LIB_ANALYSIS_OBJCARCANALYSISUTILS_H
+#ifndef LLVM_ANALYSIS_OBJCARCANALYSISUTILS_H
+#define LLVM_ANALYSIS_OBJCARCANALYSISUTILS_H
#include "llvm/ADT/Optional.h"
#include "llvm/Analysis/ObjCARCInstKind.h"
diff --git a/llvm/include/llvm/Analysis/OptimizationRemarkEmitter.h b/llvm/include/llvm/Analysis/OptimizationRemarkEmitter.h
index 9815dd05cd1c..7b34b9795040 100644
--- a/llvm/include/llvm/Analysis/OptimizationRemarkEmitter.h
+++ b/llvm/include/llvm/Analysis/OptimizationRemarkEmitter.h
@@ -11,8 +11,8 @@
// used to compute the "hotness" of the diagnostic message.
//===----------------------------------------------------------------------===//
-#ifndef LLVM_IR_OPTIMIZATIONDIAGNOSTICINFO_H
-#define LLVM_IR_OPTIMIZATIONDIAGNOSTICINFO_H
+#ifndef LLVM_ANALYSIS_OPTIMIZATIONREMARKEMITTER_H
+#define LLVM_ANALYSIS_OPTIMIZATIONREMARKEMITTER_H
#include "llvm/ADT/Optional.h"
#include "llvm/Analysis/BlockFrequencyInfo.h"
@@ -166,4 +166,4 @@ class OptimizationRemarkEmitterAnalysis
Result run(Function &F, FunctionAnalysisManager &AM);
};
}
-#endif // LLVM_IR_OPTIMIZATIONDIAGNOSTICINFO_H
+#endif // LLVM_ANALYSIS_OPTIMIZATIONREMARKEMITTER_H
diff --git a/llvm/include/llvm/Analysis/ProfileSummaryInfo.h b/llvm/include/llvm/Analysis/ProfileSummaryInfo.h
index a4e6ffc3dd58..c7967df12418 100644
--- a/llvm/include/llvm/Analysis/ProfileSummaryInfo.h
+++ b/llvm/include/llvm/Analysis/ProfileSummaryInfo.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ANALYSIS_PROFILE_SUMMARY_INFO_H
-#define LLVM_ANALYSIS_PROFILE_SUMMARY_INFO_H
+#ifndef LLVM_ANALYSIS_PROFILESUMMARYINFO_H
+#define LLVM_ANALYSIS_PROFILESUMMARYINFO_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/IR/PassManager.h"
diff --git a/llvm/include/llvm/Analysis/SyncDependenceAnalysis.h b/llvm/include/llvm/Analysis/SyncDependenceAnalysis.h
index 9838d629e93e..92459ea79ab4 100644
--- a/llvm/include/llvm/Analysis/SyncDependenceAnalysis.h
+++ b/llvm/include/llvm/Analysis/SyncDependenceAnalysis.h
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ANALYSIS_SYNC_DEPENDENCE_ANALYSIS_H
-#define LLVM_ANALYSIS_SYNC_DEPENDENCE_ANALYSIS_H
+#ifndef LLVM_ANALYSIS_SYNCDEPENDENCEANALYSIS_H
+#define LLVM_ANALYSIS_SYNCDEPENDENCEANALYSIS_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/PostOrderIterator.h"
@@ -89,4 +89,4 @@ class SyncDependenceAnalysis {
} // namespace llvm
-#endif // LLVM_ANALYSIS_SYNC_DEPENDENCE_ANALYSIS_H
+#endif // LLVM_ANALYSIS_SYNCDEPENDENCEANALYSIS_H
diff --git a/llvm/include/llvm/Analysis/SyntheticCountsUtils.h b/llvm/include/llvm/Analysis/SyntheticCountsUtils.h
index 358f757314ee..f9bac739cee6 100644
--- a/llvm/include/llvm/Analysis/SyntheticCountsUtils.h
+++ b/llvm/include/llvm/Analysis/SyntheticCountsUtils.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ANALYSIS_SYNTHETIC_COUNTS_UTILS_H
-#define LLVM_ANALYSIS_SYNTHETIC_COUNTS_UTILS_H
+#ifndef LLVM_ANALYSIS_SYNTHETICCOUNTSUTILS_H
+#define LLVM_ANALYSIS_SYNTHETICCOUNTSUTILS_H
#include "llvm/ADT/STLExtras.h"
#include "llvm/Analysis/CallGraph.h"
diff --git a/llvm/include/llvm/Analysis/Utils/ImportedFunctionsInliningStatistics.h b/llvm/include/llvm/Analysis/Utils/ImportedFunctionsInliningStatistics.h
index d02bcd0e335b..a06224bbd033 100644
--- a/llvm/include/llvm/Analysis/Utils/ImportedFunctionsInliningStatistics.h
+++ b/llvm/include/llvm/Analysis/Utils/ImportedFunctionsInliningStatistics.h
@@ -9,8 +9,8 @@
// ThinLTO.
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_UTILS_IMPORTEDFUNCTIONSINLININGSTATISTICS_H
-#define LLVM_TRANSFORMS_UTILS_IMPORTEDFUNCTIONSINLININGSTATISTICS_H
+#ifndef LLVM_ANALYSIS_UTILS_IMPORTEDFUNCTIONSINLININGSTATISTICS_H
+#define LLVM_ANALYSIS_UTILS_IMPORTEDFUNCTIONSINLININGSTATISTICS_H
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringMap.h"
@@ -109,4 +109,4 @@ enum class InlinerFunctionImportStatsOpts {
} // llvm
-#endif // LLVM_TRANSFORMS_UTILS_IMPORTEDFUNCTIONSINLININGSTATISTICS_H
+#endif // LLVM_ANALYSIS_UTILS_IMPORTEDFUNCTIONSINLININGSTATISTICS_H
diff --git a/llvm/include/llvm/Analysis/Utils/Local.h b/llvm/include/llvm/Analysis/Utils/Local.h
index bd82b34165d6..031938c6f9c7 100644
--- a/llvm/include/llvm/Analysis/Utils/Local.h
+++ b/llvm/include/llvm/Analysis/Utils/Local.h
@@ -100,4 +100,4 @@ Value *EmitGEPOffset(IRBuilderTy *Builder, const DataLayout &DL, User *GEP,
}
-#endif // LLVM_TRANSFORMS_UTILS_LOCAL_H
+#endif // LLVM_ANALYSIS_UTILS_LOCAL_H
diff --git a/llvm/include/llvm/BinaryFormat/MsgPackReader.h b/llvm/include/llvm/BinaryFormat/MsgPackReader.h
index a6ae542637fd..5035de03cc1b 100644
--- a/llvm/include/llvm/BinaryFormat/MsgPackReader.h
+++ b/llvm/include/llvm/BinaryFormat/MsgPackReader.h
@@ -30,8 +30,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_MSGPACKREADER_H
-#define LLVM_SUPPORT_MSGPACKREADER_H
+#ifndef LLVM_BINARYFORMAT_MSGPACKREADER_H
+#define LLVM_BINARYFORMAT_MSGPACKREADER_H
#include "llvm/Support/Error.h"
#include "llvm/Support/MemoryBuffer.h"
@@ -146,4 +146,4 @@ class Reader {
} // end namespace msgpack
} // end namespace llvm
-#endif // LLVM_SUPPORT_MSGPACKREADER_H
+#endif // LLVM_BINARYFORMAT_MSGPACKREADER_H
diff --git a/llvm/include/llvm/BinaryFormat/MsgPackWriter.h b/llvm/include/llvm/BinaryFormat/MsgPackWriter.h
index 3b610b774f77..254b52f18bd3 100644
--- a/llvm/include/llvm/BinaryFormat/MsgPackWriter.h
+++ b/llvm/include/llvm/BinaryFormat/MsgPackWriter.h
@@ -25,8 +25,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_MSGPACKPARSER_H
-#define LLVM_SUPPORT_MSGPACKPARSER_H
+#ifndef LLVM_BINARYFORMAT_MSGPACKWRITER_H
+#define LLVM_BINARYFORMAT_MSGPACKWRITER_H
#include "llvm/BinaryFormat/MsgPack.h"
#include "llvm/Support/EndianStream.h"
@@ -127,4 +127,4 @@ class Writer {
} // end namespace msgpack
} // end namespace llvm
-#endif // LLVM_SUPPORT_MSGPACKPARSER_H
+#endif // LLVM_BINARYFORMAT_MSGPACKWRITER_H
diff --git a/llvm/include/llvm/Bitcode/BitcodeAnalyzer.h b/llvm/include/llvm/Bitcode/BitcodeAnalyzer.h
index 5fb8bb26f255..de828be3bf1b 100644
--- a/llvm/include/llvm/Bitcode/BitcodeAnalyzer.h
+++ b/llvm/include/llvm/Bitcode/BitcodeAnalyzer.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_BITCODE_BITCODE_ANALYZER_H
-#define LLVM_BITCODE_BITCODE_ANALYZER_H
+#ifndef LLVM_BITCODE_BITCODEANALYZER_H
+#define LLVM_BITCODE_BITCODEANALYZER_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
@@ -101,4 +101,4 @@ class BitcodeAnalyzer {
} // end namespace llvm
-#endif // LLVM_BITCODE_BITCODE_ANALYZER_H
+#endif // LLVM_BITCODE_BITCODEANALYZER_H
diff --git a/llvm/include/llvm/CodeGen/AccelTable.h b/llvm/include/llvm/CodeGen/AccelTable.h
index f8f6b5448f3f..3915badfadd1 100644
--- a/llvm/include/llvm/CodeGen/AccelTable.h
+++ b/llvm/include/llvm/CodeGen/AccelTable.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_DWARFACCELTABLE_H
-#define LLVM_CODEGEN_DWARFACCELTABLE_H
+#ifndef LLVM_CODEGEN_ACCELTABLE_H
+#define LLVM_CODEGEN_ACCELTABLE_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/SmallVector.h"
@@ -404,4 +404,4 @@ class AppleAccelTableStaticTypeData : public AppleAccelTableStaticOffsetData {
} // end namespace llvm
-#endif // LLVM_CODEGEN_DWARFACCELTABLE_H
+#endif // LLVM_CODEGEN_ACCELTABLE_H
diff --git a/llvm/include/llvm/CodeGen/AntiDepBreaker.h b/llvm/include/llvm/CodeGen/AntiDepBreaker.h
index 0553d7d452a4..4b8fb4c5fbde 100644
--- a/llvm/include/llvm/CodeGen/AntiDepBreaker.h
+++ b/llvm/include/llvm/CodeGen/AntiDepBreaker.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_CODEGEN_ANTIDEPBREAKER_H
-#define LLVM_LIB_CODEGEN_ANTIDEPBREAKER_H
+#ifndef LLVM_CODEGEN_ANTIDEPBREAKER_H
+#define LLVM_CODEGEN_ANTIDEPBREAKER_H
#include "llvm/ADT/iterator_range.h"
#include "llvm/CodeGen/MachineBasicBlock.h"
@@ -93,4 +93,4 @@ AntiDepBreaker *createCriticalAntiDepBreaker(MachineFunction &MFi,
} // end namespace llvm
-#endif // LLVM_LIB_CODEGEN_ANTIDEPBREAKER_H
+#endif // LLVM_CODEGEN_ANTIDEPBREAKER_H
diff --git a/llvm/include/llvm/CodeGen/BuiltinGCs.h b/llvm/include/llvm/CodeGen/BuiltinGCs.h
index d44183dab0f7..c1c3cdc22b31 100644
--- a/llvm/include/llvm/CodeGen/BuiltinGCs.h
+++ b/llvm/include/llvm/CodeGen/BuiltinGCs.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_GCS_H
-#define LLVM_CODEGEN_GCS_H
+#ifndef LLVM_CODEGEN_BUILTINGCS_H
+#define LLVM_CODEGEN_BUILTINGCS_H
namespace llvm {
diff --git a/llvm/include/llvm/CodeGen/CSEConfigBase.h b/llvm/include/llvm/CodeGen/CSEConfigBase.h
index 70b5e5c17eb1..d3637099c4b6 100644
--- a/llvm/include/llvm/CodeGen/CSEConfigBase.h
+++ b/llvm/include/llvm/CodeGen/CSEConfigBase.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_CSECONFIG_BASE_H
-#define LLVM_CODEGEN_CSECONFIG_BASE_H
+#ifndef LLVM_CODEGEN_CSECONFIGBASE_H
+#define LLVM_CODEGEN_CSECONFIGBASE_H
namespace llvm {
// Class representing some configuration that can be done during GlobalISel's
@@ -25,4 +25,4 @@ class CSEConfigBase {
} // namespace llvm
-#endif // LLVM_CODEGEN_CSECONFIG_BASE_H
+#endif // LLVM_CODEGEN_CSECONFIGBASE_H
diff --git a/llvm/include/llvm/CodeGen/DIE.h b/llvm/include/llvm/CodeGen/DIE.h
index 59538b498b88..9e94c401bfae 100644
--- a/llvm/include/llvm/CodeGen/DIE.h
+++ b/llvm/include/llvm/CodeGen/DIE.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_CODEGEN_ASMPRINTER_DIE_H
-#define LLVM_LIB_CODEGEN_ASMPRINTER_DIE_H
+#ifndef LLVM_CODEGEN_DIE_H
+#define LLVM_CODEGEN_DIE_H
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/PointerIntPair.h"
@@ -989,4 +989,4 @@ class DIEBlock : public DIEValueList {
} // end namespace llvm
-#endif // LLVM_LIB_CODEGEN_ASMPRINTER_DIE_H
+#endif // LLVM_CODEGEN_DIE_H
diff --git a/llvm/include/llvm/CodeGen/DbgEntityHistoryCalculator.h b/llvm/include/llvm/CodeGen/DbgEntityHistoryCalculator.h
index bca6065b1643..1ecb22be60b1 100644
--- a/llvm/include/llvm/CodeGen/DbgEntityHistoryCalculator.h
+++ b/llvm/include/llvm/CodeGen/DbgEntityHistoryCalculator.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_DBGVALUEHISTORYCALCULATOR_H
-#define LLVM_CODEGEN_DBGVALUEHISTORYCALCULATOR_H
+#ifndef LLVM_CODEGEN_DBGENTITYHISTORYCALCULATOR_H
+#define LLVM_CODEGEN_DBGENTITYHISTORYCALCULATOR_H
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/PointerIntPair.h"
@@ -150,4 +150,4 @@ void calculateDbgEntityHistory(const MachineFunction *MF,
} // end namespace llvm
-#endif // LLVM_CODEGEN_DBGVALUEHISTORYCALCULATOR_H
+#endif // LLVM_CODEGEN_DBGENTITYHISTORYCALCULATOR_H
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/Combiner.h b/llvm/include/llvm/CodeGen/GlobalISel/Combiner.h
index efe8bdf93664..bad541b10d65 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/Combiner.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/Combiner.h
@@ -43,4 +43,4 @@ class Combiner {
} // End namespace llvm.
-#endif // LLVM_CODEGEN_GLOBALISEL_GICOMBINER_H
+#endif // LLVM_CODEGEN_GLOBALISEL_COMBINER_H
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h b/llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
index 8570f5ca5dd5..9c72b90522a0 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
@@ -14,8 +14,8 @@
//
//===--------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_GLOBALISEL_COMBINER_HELPER_H
-#define LLVM_CODEGEN_GLOBALISEL_COMBINER_HELPER_H
+#ifndef LLVM_CODEGEN_GLOBALISEL_COMBINERHELPER_H
+#define LLVM_CODEGEN_GLOBALISEL_COMBINERHELPER_H
#include "llvm/ADT/APFloat.h"
#include "llvm/ADT/DenseMap.h"
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/CombinerInfo.h b/llvm/include/llvm/CodeGen/GlobalISel/CombinerInfo.h
index e95a5e21f832..df5ecbfde781 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/CombinerInfo.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/CombinerInfo.h
@@ -10,8 +10,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_GLOBALISEL_COMBINER_INFO_H
-#define LLVM_CODEGEN_GLOBALISEL_COMBINER_INFO_H
+#ifndef LLVM_CODEGEN_GLOBALISEL_COMBINERINFO_H
+#define LLVM_CODEGEN_GLOBALISEL_COMBINERINFO_H
#include <cassert>
namespace llvm {
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h b/llvm/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h
index eafed3760738..e2e35cdd2c28 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h
@@ -10,8 +10,8 @@
/// passes.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_GLOBALISEL_KNOWNBITSINFO_H
-#define LLVM_CODEGEN_GLOBALISEL_KNOWNBITSINFO_H
+#ifndef LLVM_CODEGEN_GLOBALISEL_GISELKNOWNBITS_H
+#define LLVM_CODEGEN_GLOBALISEL_GISELKNOWNBITS_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/CodeGen/GlobalISel/GISelChangeObserver.h"
@@ -128,4 +128,4 @@ class GISelKnownBitsAnalysis : public MachineFunctionPass {
};
} // namespace llvm
-#endif // ifdef
+#endif // LLVM_CODEGEN_GLOBALISEL_GISELKNOWNBITS_H
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/GISelWorkList.h b/llvm/include/llvm/CodeGen/GlobalISel/GISelWorkList.h
index 9e7ade3ee329..c5af64d2bcbe 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/GISelWorkList.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/GISelWorkList.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_GISEL_WORKLIST_H
-#define LLVM_GISEL_WORKLIST_H
+#ifndef LLVM_CODEGEN_GLOBALISEL_GISELWORKLIST_H
+#define LLVM_CODEGEN_GLOBALISEL_GISELWORKLIST_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallVector.h"
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/Legalizer.h b/llvm/include/llvm/CodeGen/GlobalISel/Legalizer.h
index 690e84f79a6b..4871d8d32ebd 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/Legalizer.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/Legalizer.h
@@ -17,8 +17,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_GLOBALISEL_LEGALIZEMACHINEIRPASS_H
-#define LLVM_CODEGEN_GLOBALISEL_LEGALIZEMACHINEIRPASS_H
+#ifndef LLVM_CODEGEN_GLOBALISEL_LEGALIZER_H
+#define LLVM_CODEGEN_GLOBALISEL_LEGALIZER_H
#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
#include "llvm/CodeGen/MachineFunctionPass.h"
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h b/llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
index a2c0899fd18b..f7c033fe06fe 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
@@ -17,8 +17,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_GLOBALISEL_MACHINELEGALIZEHELPER_H
-#define LLVM_CODEGEN_GLOBALISEL_MACHINELEGALIZEHELPER_H
+#ifndef LLVM_CODEGEN_GLOBALISEL_LEGALIZERHELPER_H
+#define LLVM_CODEGEN_GLOBALISEL_LEGALIZERHELPER_H
#include "llvm/CodeGen/GlobalISel/CallLowering.h"
#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/LostDebugLocObserver.h b/llvm/include/llvm/CodeGen/GlobalISel/LostDebugLocObserver.h
index cd2a871e9579..b2816e48489f 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/LostDebugLocObserver.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/LostDebugLocObserver.h
@@ -47,4 +47,4 @@ class LostDebugLocObserver : public GISelChangeObserver {
};
} // namespace llvm
-#endif // ifndef LLVM_CODEGEN_GLOBALISEL_LOSTDEBUGLOCOBSERVER_H
+#endif // LLVM_CODEGEN_GLOBALISEL_LOSTDEBUGLOCOBSERVER_H
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h b/llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h
index 55d6d365fbb4..3268a6fda84e 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h
@@ -9,8 +9,8 @@
/// Contains matchers for matching SSA Machine Instructions.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_GMIR_PATTERNMATCH_H
-#define LLVM_GMIR_PATTERNMATCH_H
+#ifndef LLVM_CODEGEN_GLOBALISEL_MIPATTERNMATCH_H
+#define LLVM_CODEGEN_GLOBALISEL_MIPATTERNMATCH_H
#include "llvm/CodeGen/GlobalISel/Utils.h"
#include "llvm/CodeGen/MachineRegisterInfo.h"
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/RegisterBank.h b/llvm/include/llvm/CodeGen/GlobalISel/RegisterBank.h
index f528d1a46012..5440d97728b4 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/RegisterBank.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/RegisterBank.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_GLOBALISEL_REGBANK_H
-#define LLVM_CODEGEN_GLOBALISEL_REGBANK_H
+#ifndef LLVM_CODEGEN_GLOBALISEL_REGISTERBANK_H
+#define LLVM_CODEGEN_GLOBALISEL_REGISTERBANK_H
#include "llvm/ADT/BitVector.h"
diff --git a/llvm/include/llvm/CodeGen/IndirectThunks.h b/llvm/include/llvm/CodeGen/IndirectThunks.h
index 810acc0bcf8b..3b40055da7a4 100644
--- a/llvm/include/llvm/CodeGen/IndirectThunks.h
+++ b/llvm/include/llvm/CodeGen/IndirectThunks.h
@@ -11,8 +11,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_INDIRECTTHUNKS_H
-#define LLVM_INDIRECTTHUNKS_H
+#ifndef LLVM_CODEGEN_INDIRECTTHUNKS_H
+#define LLVM_CODEGEN_INDIRECTTHUNKS_H
#include "llvm/CodeGen/MachineFunction.h"
#include "llvm/CodeGen/MachineModuleInfo.h"
diff --git a/llvm/include/llvm/CodeGen/LazyMachineBlockFrequencyInfo.h b/llvm/include/llvm/CodeGen/LazyMachineBlockFrequencyInfo.h
index ca99c6c89b19..c692dbc2199e 100644
--- a/llvm/include/llvm/CodeGen/LazyMachineBlockFrequencyInfo.h
+++ b/llvm/include/llvm/CodeGen/LazyMachineBlockFrequencyInfo.h
@@ -13,8 +13,8 @@
///
///===---------------------------------------------------------------------===//
-#ifndef LLVM_ANALYSIS_LAZYMACHINEBLOCKFREQUENCYINFO_H
-#define LLVM_ANALYSIS_LAZYMACHINEBLOCKFREQUENCYINFO_H
+#ifndef LLVM_CODEGEN_LAZYMACHINEBLOCKFREQUENCYINFO_H
+#define LLVM_CODEGEN_LAZYMACHINEBLOCKFREQUENCYINFO_H
#include "llvm/CodeGen/MachineBlockFrequencyInfo.h"
#include "llvm/CodeGen/MachineBranchProbabilityInfo.h"
diff --git a/llvm/include/llvm/CodeGen/LiveIntervalCalc.h b/llvm/include/llvm/CodeGen/LiveIntervalCalc.h
index 76005e835595..4dd22cdfa224 100644
--- a/llvm/include/llvm/CodeGen/LiveIntervalCalc.h
+++ b/llvm/include/llvm/CodeGen/LiveIntervalCalc.h
@@ -14,8 +14,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_CODEGEN_LIVEINTERVALCALC_H
-#define LLVM_LIB_CODEGEN_LIVEINTERVALCALC_H
+#ifndef LLVM_CODEGEN_LIVEINTERVALCALC_H
+#define LLVM_CODEGEN_LIVEINTERVALCALC_H
#include "llvm/CodeGen/LiveRangeCalc.h"
@@ -68,4 +68,4 @@ class LiveIntervalCalc : public LiveRangeCalc {
} // end namespace llvm
-#endif // LLVM_LIB_CODEGEN_LIVEINTERVALCALC_H
+#endif // LLVM_CODEGEN_LIVEINTERVALCALC_H
diff --git a/llvm/include/llvm/CodeGen/LiveRangeCalc.h b/llvm/include/llvm/CodeGen/LiveRangeCalc.h
index bbb6f2ddd233..31efd6e37e01 100644
--- a/llvm/include/llvm/CodeGen/LiveRangeCalc.h
+++ b/llvm/include/llvm/CodeGen/LiveRangeCalc.h
@@ -20,8 +20,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_CODEGEN_LIVERANGECALC_H
-#define LLVM_LIB_CODEGEN_LIVERANGECALC_H
+#ifndef LLVM_CODEGEN_LIVERANGECALC_H
+#define LLVM_CODEGEN_LIVERANGECALC_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/BitVector.h"
@@ -267,4 +267,4 @@ class LiveRangeCalc {
} // end namespace llvm
-#endif // LLVM_LIB_CODEGEN_LIVERANGECALC_H
+#endif // LLVM_CODEGEN_LIVERANGECALC_H
diff --git a/llvm/include/llvm/CodeGen/MIRParser/MIParser.h b/llvm/include/llvm/CodeGen/MIRParser/MIParser.h
index 590b3dcdd93b..e3f7e3df3f1a 100644
--- a/llvm/include/llvm/CodeGen/MIRParser/MIParser.h
+++ b/llvm/include/llvm/CodeGen/MIRParser/MIParser.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_CODEGEN_MIRPARSER_MIPARSER_H
-#define LLVM_LIB_CODEGEN_MIRPARSER_MIPARSER_H
+#ifndef LLVM_CODEGEN_MIRPARSER_MIPARSER_H
+#define LLVM_CODEGEN_MIRPARSER_MIPARSER_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/StringMap.h"
@@ -235,4 +235,4 @@ bool parseMDNode(PerFunctionMIParsingState &PFS, MDNode *&Node, StringRef Src,
} // end namespace llvm
-#endif // LLVM_LIB_CODEGEN_MIRPARSER_MIPARSER_H
+#endif // LLVM_CODEGEN_MIRPARSER_MIPARSER_H
diff --git a/llvm/include/llvm/CodeGen/MIRPrinter.h b/llvm/include/llvm/CodeGen/MIRPrinter.h
index a4b03a7fb765..45e30686b642 100644
--- a/llvm/include/llvm/CodeGen/MIRPrinter.h
+++ b/llvm/include/llvm/CodeGen/MIRPrinter.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_CODEGEN_MIRPRINTER_H
-#define LLVM_LIB_CODEGEN_MIRPRINTER_H
+#ifndef LLVM_CODEGEN_MIRPRINTER_H
+#define LLVM_CODEGEN_MIRPRINTER_H
namespace llvm {
diff --git a/llvm/include/llvm/CodeGen/MachineLoopUtils.h b/llvm/include/llvm/CodeGen/MachineLoopUtils.h
index ec0b3529c0d6..2352fbca548d 100644
--- a/llvm/include/llvm/CodeGen/MachineLoopUtils.h
+++ b/llvm/include/llvm/CodeGen/MachineLoopUtils.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_CODEGEN_MACHINELOOPUTILS_H
-#define LLVM_LIB_CODEGEN_MACHINELOOPUTILS_H
+#ifndef LLVM_CODEGEN_MACHINELOOPUTILS_H
+#define LLVM_CODEGEN_MACHINELOOPUTILS_H
namespace llvm {
class MachineLoop;
@@ -39,4 +39,4 @@ MachineBasicBlock *PeelSingleBlockLoop(LoopPeelDirection Direction,
} // namespace llvm
-#endif // LLVM_LIB_CODEGEN_MACHINELOOPUTILS_H
+#endif // LLVM_CODEGEN_MACHINELOOPUTILS_H
diff --git a/llvm/include/llvm/CodeGen/MachineOutliner.h b/llvm/include/llvm/CodeGen/MachineOutliner.h
index a5dbbdb4fdcd..3e597e728fef 100644
--- a/llvm/include/llvm/CodeGen/MachineOutliner.h
+++ b/llvm/include/llvm/CodeGen/MachineOutliner.h
@@ -12,8 +12,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MACHINEOUTLINER_H
-#define LLVM_MACHINEOUTLINER_H
+#ifndef LLVM_CODEGEN_MACHINEOUTLINER_H
+#define LLVM_CODEGEN_MACHINEOUTLINER_H
#include "llvm/CodeGen/LivePhysRegs.h"
#include "llvm/CodeGen/LiveRegUnits.h"
diff --git a/llvm/include/llvm/CodeGen/MachinePipeliner.h b/llvm/include/llvm/CodeGen/MachinePipeliner.h
index f89a453749e8..ad7d109068dc 100644
--- a/llvm/include/llvm/CodeGen/MachinePipeliner.h
+++ b/llvm/include/llvm/CodeGen/MachinePipeliner.h
@@ -37,8 +37,8 @@
// 3) Attempt to schedule the nodes in the specified order using the MII.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_CODEGEN_MACHINEPIPELINER_H
-#define LLVM_LIB_CODEGEN_MACHINEPIPELINER_H
+#ifndef LLVM_CODEGEN_MACHINEPIPELINER_H
+#define LLVM_CODEGEN_MACHINEPIPELINER_H
#include "llvm/CodeGen/MachineDominators.h"
#include "llvm/CodeGen/MachineOptimizationRemarkEmitter.h"
@@ -595,4 +595,4 @@ class SMSchedule {
} // end namespace llvm
-#endif // LLVM_LIB_CODEGEN_MACHINEPIPELINER_H
+#endif // LLVM_CODEGEN_MACHINEPIPELINER_H
diff --git a/llvm/include/llvm/CodeGen/MachineSizeOpts.h b/llvm/include/llvm/CodeGen/MachineSizeOpts.h
index 07bbbad8d9c9..550508ad7a23 100644
--- a/llvm/include/llvm/CodeGen/MachineSizeOpts.h
+++ b/llvm/include/llvm/CodeGen/MachineSizeOpts.h
@@ -10,8 +10,8 @@
// code.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_MACHINE_SIZEOPTS_H
-#define LLVM_CODEGEN_MACHINE_SIZEOPTS_H
+#ifndef LLVM_CODEGEN_MACHINESIZEOPTS_H
+#define LLVM_CODEGEN_MACHINESIZEOPTS_H
#include "llvm/Transforms/Utils/SizeOpts.h"
@@ -43,4 +43,4 @@ bool shouldOptimizeForSize(const MachineBasicBlock *MBB,
} // end namespace llvm
-#endif // LLVM_CODEGEN_MACHINE_SIZEOPTS_H
+#endif // LLVM_CODEGEN_MACHINESIZEOPTS_H
diff --git a/llvm/include/llvm/CodeGen/ModuloSchedule.h b/llvm/include/llvm/CodeGen/ModuloSchedule.h
index 1aa23208cfb9..e8dbf49994bb 100644
--- a/llvm/include/llvm/CodeGen/ModuloSchedule.h
+++ b/llvm/include/llvm/CodeGen/ModuloSchedule.h
@@ -57,8 +57,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_CODEGEN_MODULOSCHEDULE_H
-#define LLVM_LIB_CODEGEN_MODULOSCHEDULE_H
+#ifndef LLVM_CODEGEN_MODULOSCHEDULE_H
+#define LLVM_CODEGEN_MODULOSCHEDULE_H
#include "llvm/CodeGen/MachineFunction.h"
#include "llvm/CodeGen/MachineLoopInfo.h"
@@ -386,4 +386,4 @@ class ModuloScheduleTestAnnotater {
} // end namespace llvm
-#endif // LLVM_LIB_CODEGEN_MODULOSCHEDULE_H
+#endif // LLVM_CODEGEN_MODULOSCHEDULE_H
diff --git a/llvm/include/llvm/CodeGen/PBQP/Graph.h b/llvm/include/llvm/CodeGen/PBQP/Graph.h
index c2cd6dadae5f..5c802802a880 100644
--- a/llvm/include/llvm/CodeGen/PBQP/Graph.h
+++ b/llvm/include/llvm/CodeGen/PBQP/Graph.h
@@ -671,4 +671,4 @@ namespace PBQP {
} // end namespace PBQP
} // end namespace llvm
-#endif // LLVM_CODEGEN_PBQP_GRAPH_HPP
+#endif // LLVM_CODEGEN_PBQP_GRAPH_H
diff --git a/llvm/include/llvm/CodeGen/RDFGraph.h b/llvm/include/llvm/CodeGen/RDFGraph.h
index 00d6ec93d555..e0205d7c92c8 100644
--- a/llvm/include/llvm/CodeGen/RDFGraph.h
+++ b/llvm/include/llvm/CodeGen/RDFGraph.h
@@ -221,8 +221,8 @@
// mark " indicates that the node is a shadow.
//
-#ifndef LLVM_LIB_TARGET_HEXAGON_RDFGRAPH_H
-#define LLVM_LIB_TARGET_HEXAGON_RDFGRAPH_H
+#ifndef LLVM_CODEGEN_RDFGRAPH_H
+#define LLVM_CODEGEN_RDFGRAPH_H
#include "RDFRegisters.h"
#include "llvm/ADT/SmallVector.h"
@@ -961,4 +961,4 @@ namespace rdf {
} // end namespace llvm
-#endif // LLVM_LIB_TARGET_HEXAGON_RDFGRAPH_H
+#endif // LLVM_CODEGEN_RDFGRAPH_H
diff --git a/llvm/include/llvm/CodeGen/RDFLiveness.h b/llvm/include/llvm/CodeGen/RDFLiveness.h
index d39d3585e7bd..45cd84a13007 100644
--- a/llvm/include/llvm/CodeGen/RDFLiveness.h
+++ b/llvm/include/llvm/CodeGen/RDFLiveness.h
@@ -9,8 +9,8 @@
// Recalculate the liveness information given a data flow graph.
// This includes block live-ins and kill flags.
-#ifndef LLVM_LIB_TARGET_HEXAGON_RDFLIVENESS_H
-#define LLVM_LIB_TARGET_HEXAGON_RDFLIVENESS_H
+#ifndef LLVM_CODEGEN_RDFLIVENESS_H
+#define LLVM_CODEGEN_RDFLIVENESS_H
#include "RDFGraph.h"
#include "RDFRegisters.h"
@@ -172,4 +172,4 @@ namespace rdf {
} // end namespace llvm
-#endif // LLVM_LIB_TARGET_HEXAGON_RDFLIVENESS_H
+#endif // LLVM_CODEGEN_RDFLIVENESS_H
diff --git a/llvm/include/llvm/CodeGen/RDFRegisters.h b/llvm/include/llvm/CodeGen/RDFRegisters.h
index c49b4883e1c1..b18cbba2275c 100644
--- a/llvm/include/llvm/CodeGen/RDFRegisters.h
+++ b/llvm/include/llvm/CodeGen/RDFRegisters.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_TARGET_HEXAGON_RDFREGISTERS_H
-#define LLVM_LIB_TARGET_HEXAGON_RDFREGISTERS_H
+#ifndef LLVM_CODEGEN_RDFREGISTERS_H
+#define LLVM_CODEGEN_RDFREGISTERS_H
#include "llvm/ADT/BitVector.h"
#include "llvm/ADT/STLExtras.h"
@@ -276,4 +276,4 @@ namespace std {
}
};
}
-#endif // LLVM_LIB_TARGET_HEXAGON_RDFREGISTERS_H
+#endif // LLVM_CODEGEN_RDFREGISTERS_H
diff --git a/llvm/include/llvm/CodeGen/ReachingDefAnalysis.h b/llvm/include/llvm/CodeGen/ReachingDefAnalysis.h
index bcb48de2fe5a..5144548a2792 100644
--- a/llvm/include/llvm/CodeGen/ReachingDefAnalysis.h
+++ b/llvm/include/llvm/CodeGen/ReachingDefAnalysis.h
@@ -18,8 +18,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_REACHINGDEFSANALYSIS_H
-#define LLVM_CODEGEN_REACHINGDEFSANALYSIS_H
+#ifndef LLVM_CODEGEN_REACHINGDEFANALYSIS_H
+#define LLVM_CODEGEN_REACHINGDEFANALYSIS_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallVector.h"
@@ -278,4 +278,4 @@ class ReachingDefAnalysis : public MachineFunctionPass {
} // namespace llvm
-#endif // LLVM_CODEGEN_REACHINGDEFSANALYSIS_H
+#endif // LLVM_CODEGEN_REACHINGDEFANALYSIS_H
diff --git a/llvm/include/llvm/CodeGen/Register.h b/llvm/include/llvm/CodeGen/Register.h
index d7057cfb76e0..a683223b5a4a 100644
--- a/llvm/include/llvm/CodeGen/Register.h
+++ b/llvm/include/llvm/CodeGen/Register.h
@@ -162,4 +162,4 @@ template<> struct DenseMapInfo<Register> {
}
-#endif // ifndef LLVM_CODEGEN_REGISTER_H
+#endif // LLVM_CODEGEN_REGISTER_H
diff --git a/llvm/include/llvm/CodeGen/RegisterUsageInfo.h b/llvm/include/llvm/CodeGen/RegisterUsageInfo.h
index 53982ce5d4a2..bf347c0753e5 100644
--- a/llvm/include/llvm/CodeGen/RegisterUsageInfo.h
+++ b/llvm/include/llvm/CodeGen/RegisterUsageInfo.h
@@ -15,8 +15,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_PHYSICALREGISTERUSAGEINFO_H
-#define LLVM_CODEGEN_PHYSICALREGISTERUSAGEINFO_H
+#ifndef LLVM_CODEGEN_REGISTERUSAGEINFO_H
+#define LLVM_CODEGEN_REGISTERUSAGEINFO_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/DenseMap.h"
@@ -68,4 +68,4 @@ class PhysicalRegisterUsageInfo : public ImmutablePass {
} // end namespace llvm
-#endif // LLVM_CODEGEN_PHYSICALREGISTERUSAGEINFO_H
+#endif // LLVM_CODEGEN_REGISTERUSAGEINFO_H
diff --git a/llvm/include/llvm/CodeGen/Spiller.h b/llvm/include/llvm/CodeGen/Spiller.h
index a693d64858f9..a3c57f6fef83 100644
--- a/llvm/include/llvm/CodeGen/Spiller.h
+++ b/llvm/include/llvm/CodeGen/Spiller.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_CODEGEN_SPILLER_H
-#define LLVM_LIB_CODEGEN_SPILLER_H
+#ifndef LLVM_CODEGEN_SPILLER_H
+#define LLVM_CODEGEN_SPILLER_H
namespace llvm {
@@ -39,4 +39,4 @@ Spiller *createInlineSpiller(MachineFunctionPass &pass, MachineFunction &mf,
} // end namespace llvm
-#endif // LLVM_LIB_CODEGEN_SPILLER_H
+#endif // LLVM_CODEGEN_SPILLER_H
diff --git a/llvm/include/llvm/CodeGen/SwiftErrorValueTracking.h b/llvm/include/llvm/CodeGen/SwiftErrorValueTracking.h
index fb7a12853c09..08ab2abbdd5b 100644
--- a/llvm/include/llvm/CodeGen/SwiftErrorValueTracking.h
+++ b/llvm/include/llvm/CodeGen/SwiftErrorValueTracking.h
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef SWIFTERRORVALUETRACKING_H
-#define SWIFTERRORVALUETRACKING_H
+#ifndef LLVM_CODEGEN_SWIFTERRORVALUETRACKING_H
+#define LLVM_CODEGEN_SWIFTERRORVALUETRACKING_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallVector.h"
diff --git a/llvm/include/llvm/CodeGen/TargetInstrInfo.h b/llvm/include/llvm/CodeGen/TargetInstrInfo.h
index 36afdefd27b2..2e1806aa8bfc 100644
--- a/llvm/include/llvm/CodeGen/TargetInstrInfo.h
+++ b/llvm/include/llvm/CodeGen/TargetInstrInfo.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TARGET_TARGETINSTRINFO_H
-#define LLVM_TARGET_TARGETINSTRINFO_H
+#ifndef LLVM_CODEGEN_TARGETINSTRINFO_H
+#define LLVM_CODEGEN_TARGETINSTRINFO_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/DenseMap.h"
@@ -1974,4 +1974,4 @@ template <> struct DenseMapInfo<TargetInstrInfo::RegSubRegPair> {
} // end namespace llvm
-#endif // LLVM_TARGET_TARGETINSTRINFO_H
+#endif // LLVM_CODEGEN_TARGETINSTRINFO_H
diff --git a/llvm/include/llvm/CodeGen/UnreachableBlockElim.h b/llvm/include/llvm/CodeGen/UnreachableBlockElim.h
index d52d7c3c5b49..7dbae77e3440 100644
--- a/llvm/include/llvm/CodeGen/UnreachableBlockElim.h
+++ b/llvm/include/llvm/CodeGen/UnreachableBlockElim.h
@@ -19,8 +19,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_CODEGEN_UNREACHABLEBLOCKELIM_H
-#define LLVM_LIB_CODEGEN_UNREACHABLEBLOCKELIM_H
+#ifndef LLVM_CODEGEN_UNREACHABLEBLOCKELIM_H
+#define LLVM_CODEGEN_UNREACHABLEBLOCKELIM_H
#include "llvm/IR/PassManager.h"
@@ -33,4 +33,4 @@ class UnreachableBlockElimPass
};
} // end namespace llvm
-#endif // LLVM_LIB_CODEGEN_UNREACHABLEBLOCKELIM_H
+#endif // LLVM_CODEGEN_UNREACHABLEBLOCKELIM_H
diff --git a/llvm/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h b/llvm/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h
index 482755b3dbc6..55b953561540 100644
--- a/llvm/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h
+++ b/llvm/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h
@@ -65,4 +65,4 @@ class AppendingTypeTableBuilder : public TypeCollection {
} // end namespace codeview
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_CODEVIEW_TYPETABLEBUILDER_H
+#endif // LLVM_DEBUGINFO_CODEVIEW_APPENDINGTYPETABLEBUILDER_H
diff --git a/llvm/include/llvm/DebugInfo/CodeView/CVRecord.h b/llvm/include/llvm/DebugInfo/CodeView/CVRecord.h
index bb29ef5f2ce8..18392e3608e7 100644
--- a/llvm/include/llvm/DebugInfo/CodeView/CVRecord.h
+++ b/llvm/include/llvm/DebugInfo/CodeView/CVRecord.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_CODEVIEW_RECORDITERATOR_H
-#define LLVM_DEBUGINFO_CODEVIEW_RECORDITERATOR_H
+#ifndef LLVM_DEBUGINFO_CODEVIEW_CVRECORD_H
+#define LLVM_DEBUGINFO_CODEVIEW_CVRECORD_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
@@ -131,4 +131,4 @@ using CVTypeRange = iterator_range<CVTypeArray::Iterator>;
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_CODEVIEW_RECORDITERATOR_H
+#endif // LLVM_DEBUGINFO_CODEVIEW_CVRECORD_H
diff --git a/llvm/include/llvm/DebugInfo/CodeView/CodeViewError.h b/llvm/include/llvm/DebugInfo/CodeView/CodeViewError.h
index 9990c8d05d1c..cda32633ce65 100644
--- a/llvm/include/llvm/DebugInfo/CodeView/CodeViewError.h
+++ b/llvm/include/llvm/DebugInfo/CodeView/CodeViewError.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_CODEVIEW_CODEVIEWERROR_H
-#define LLVM_DEBUGINFO_PDB_CODEVIEW_CODEVIEWERROR_H
+#ifndef LLVM_DEBUGINFO_CODEVIEW_CODEVIEWERROR_H
+#define LLVM_DEBUGINFO_CODEVIEW_CODEVIEWERROR_H
#include "llvm/Support/Error.h"
diff --git a/llvm/include/llvm/DebugInfo/CodeView/DebugSubsection.h b/llvm/include/llvm/DebugInfo/CodeView/DebugSubsection.h
index 66272870efda..2e1cd15a3956 100644
--- a/llvm/include/llvm/DebugInfo/CodeView/DebugSubsection.h
+++ b/llvm/include/llvm/DebugInfo/CodeView/DebugSubsection.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_CODEVIEW_MODULEDEBUGFRAGMENT_H
-#define LLVM_DEBUGINFO_CODEVIEW_MODULEDEBUGFRAGMENT_H
+#ifndef LLVM_DEBUGINFO_CODEVIEW_DEBUGSUBSECTION_H
+#define LLVM_DEBUGINFO_CODEVIEW_DEBUGSUBSECTION_H
#include "llvm/DebugInfo/CodeView/CodeView.h"
#include "llvm/Support/BinaryStreamWriter.h"
@@ -48,4 +48,4 @@ class DebugSubsection {
} // namespace codeview
} // namespace llvm
-#endif // LLVM_DEBUGINFO_CODEVIEW_MODULEDEBUGFRAGMENT_H
+#endif // LLVM_DEBUGINFO_CODEVIEW_DEBUGSUBSECTION_H
diff --git a/llvm/include/llvm/DebugInfo/CodeView/DebugSubsectionVisitor.h b/llvm/include/llvm/DebugInfo/CodeView/DebugSubsectionVisitor.h
index 624a623e75b8..151930d6d43d 100644
--- a/llvm/include/llvm/DebugInfo/CodeView/DebugSubsectionVisitor.h
+++ b/llvm/include/llvm/DebugInfo/CodeView/DebugSubsectionVisitor.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_CODEVIEW_MODULEDEBUGFRAGMENTVISITOR_H
-#define LLVM_DEBUGINFO_CODEVIEW_MODULEDEBUGFRAGMENTVISITOR_H
+#ifndef LLVM_DEBUGINFO_CODEVIEW_DEBUGSUBSECTIONVISITOR_H
+#define LLVM_DEBUGINFO_CODEVIEW_DEBUGSUBSECTIONVISITOR_H
#include "llvm/DebugInfo/CodeView/CodeView.h"
#include "llvm/DebugInfo/CodeView/StringsAndChecksums.h"
@@ -107,4 +107,4 @@ Error visitDebugSubsections(T &&FragmentRange, DebugSubsectionVisitor &V,
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_CODEVIEW_MODULEDEBUGFRAGMENTVISITOR_H
+#endif // LLVM_DEBUGINFO_CODEVIEW_DEBUGSUBSECTIONVISITOR_H
diff --git a/llvm/include/llvm/DebugInfo/CodeView/DebugUnknownSubsection.h b/llvm/include/llvm/DebugInfo/CodeView/DebugUnknownSubsection.h
index fa7df325499f..eddecf365034 100644
--- a/llvm/include/llvm/DebugInfo/CodeView/DebugUnknownSubsection.h
+++ b/llvm/include/llvm/DebugInfo/CodeView/DebugUnknownSubsection.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_CODEVIEW_MODULEDEBUGUNKNOWNFRAGMENT_H
-#define LLVM_DEBUGINFO_CODEVIEW_MODULEDEBUGUNKNOWNFRAGMENT_H
+#ifndef LLVM_DEBUGINFO_CODEVIEW_DEBUGUNKNOWNSUBSECTION_H
+#define LLVM_DEBUGINFO_CODEVIEW_DEBUGUNKNOWNSUBSECTION_H
#include "llvm/DebugInfo/CodeView/DebugSubsection.h"
#include "llvm/Support/BinaryStreamRef.h"
diff --git a/llvm/include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h b/llvm/include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h
index 9774d5f50e89..9d791403ebd6 100644
--- a/llvm/include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h
+++ b/llvm/include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h
@@ -117,4 +117,4 @@ class GlobalTypeTableBuilder : public TypeCollection {
} // end namespace codeview
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_CODEVIEW_MERGINGTYPETABLEBUILDER_H
+#endif // LLVM_DEBUGINFO_CODEVIEW_GLOBALTYPETABLEBUILDER_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
index 39ae53c4e7fe..bd0d8bb2437b 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFABBREVIATIONDECLARATION_H
-#define LLVM_DEBUGINFO_DWARFABBREVIATIONDECLARATION_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFABBREVIATIONDECLARATION_H
+#define LLVM_DEBUGINFO_DWARF_DWARFABBREVIATIONDECLARATION_H
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/SmallVector.h"
@@ -180,4 +180,4 @@ class DWARFAbbreviationDeclaration {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFABBREVIATIONDECLARATION_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFABBREVIATIONDECLARATION_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
index 961a8d82fe9e..b82ad9d58093 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFACCELERATORTABLE_H
-#define LLVM_DEBUGINFO_DWARFACCELERATORTABLE_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFACCELERATORTABLE_H
+#define LLVM_DEBUGINFO_DWARF_DWARFACCELERATORTABLE_H
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/SmallVector.h"
@@ -595,4 +595,4 @@ class DWARFDebugNames : public DWARFAcceleratorTable {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFACCELERATORTABLE_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFACCELERATORTABLE_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFAttribute.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFAttribute.h
index dfc778346dbe..66be921efa23 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFAttribute.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFAttribute.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFATTRIBUTE_H
-#define LLVM_DEBUGINFO_DWARFATTRIBUTE_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFATTRIBUTE_H
+#define LLVM_DEBUGINFO_DWARF_DWARFATTRIBUTE_H
#include "llvm/BinaryFormat/Dwarf.h"
#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
@@ -46,4 +46,4 @@ struct DWARFAttribute {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFATTRIBUTE_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFATTRIBUTE_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h
index 16b9bfb5de56..ec5a3cd85266 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFCOMPILEUNIT_H
-#define LLVM_DEBUGINFO_DWARFCOMPILEUNIT_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFCOMPILEUNIT_H
+#define LLVM_DEBUGINFO_DWARF_DWARFCOMPILEUNIT_H
#include "llvm/DebugInfo/DWARF/DWARFUnit.h"
#include "llvm/DebugInfo/DWARF/DWARFUnitIndex.h"
@@ -35,4 +35,4 @@ class DWARFCompileUnit : public DWARFUnit {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFCOMPILEUNIT_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFCOMPILEUNIT_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h
index 34329ec66baa..49749201af99 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFDATAEXTRACTOR_H
-#define LLVM_DEBUGINFO_DWARFDATAEXTRACTOR_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFDATAEXTRACTOR_H
+#define LLVM_DEBUGINFO_DWARF_DWARFDATAEXTRACTOR_H
#include "llvm/BinaryFormat/Dwarf.h"
#include "llvm/DebugInfo/DWARF/DWARFSection.h"
@@ -87,4 +87,4 @@ class DWARFDataExtractor : public DataExtractor {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFDATAEXTRACTOR_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFDATAEXTRACTOR_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h
index 1398e16252a9..f07a4d8d2783 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFDEBUGABBREV_H
-#define LLVM_DEBUGINFO_DWARFDEBUGABBREV_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGABBREV_H
+#define LLVM_DEBUGINFO_DWARF_DWARFDEBUGABBREV_H
#include "llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h"
#include "llvm/Support/DataExtractor.h"
@@ -84,4 +84,4 @@ class DWARFDebugAbbrev {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFDEBUGABBREV_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFDEBUGABBREV_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAddr.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAddr.h
index 69e67866946c..e1407ddd89eb 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAddr.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAddr.h
@@ -6,8 +6,8 @@
//
//===------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFDEBUGADDR_H
-#define LLVM_DEBUGINFO_DWARFDEBUGADDR_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGADDR_H
+#define LLVM_DEBUGINFO_DWARF_DWARFDEBUGADDR_H
#include "llvm/BinaryFormat/Dwarf.h"
#include "llvm/DebugInfo/DIContext.h"
@@ -96,4 +96,4 @@ class DWARFDebugAddrTable {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFDEBUGADDR_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFDEBUGADDR_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h
index 3d5852ee1518..65334b4a4976 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFDEBUGARANGESET_H
-#define LLVM_DEBUGINFO_DWARFDEBUGARANGESET_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGARANGESET_H
+#define LLVM_DEBUGINFO_DWARF_DWARFDEBUGARANGESET_H
#include "llvm/ADT/iterator_range.h"
#include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h"
@@ -76,4 +76,4 @@ class DWARFDebugArangeSet {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFDEBUGARANGESET_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFDEBUGARANGESET_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h
index 31a8b462ef71..216dd1e4defc 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFDEBUGARANGES_H
-#define LLVM_DEBUGINFO_DWARFDEBUGARANGES_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGARANGES_H
+#define LLVM_DEBUGINFO_DWARF_DWARFDEBUGARANGES_H
#include "llvm/ADT/DenseSet.h"
#include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h"
@@ -81,4 +81,4 @@ class DWARFDebugAranges {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFDEBUGARANGES_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFDEBUGARANGES_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h
index ded960337ec6..0bfe9f376f46 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFDEBUGINFOENTRY_H
-#define LLVM_DEBUGINFO_DWARFDEBUGINFOENTRY_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGINFOENTRY_H
+#define LLVM_DEBUGINFO_DWARF_DWARFDEBUGINFOENTRY_H
#include "llvm/BinaryFormat/Dwarf.h"
#include "llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h"
@@ -59,4 +59,4 @@ class DWARFDebugInfoEntry {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFDEBUGINFOENTRY_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFDEBUGINFOENTRY_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h
index bc6c67ae6c5d..d1d65372740b 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFDEBUGLINE_H
-#define LLVM_DEBUGINFO_DWARFDEBUGLINE_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGLINE_H
+#define LLVM_DEBUGINFO_DWARF_DWARFDEBUGLINE_H
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/StringRef.h"
@@ -420,4 +420,4 @@ class DWARFDebugLine {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFDEBUGLINE_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFDEBUGLINE_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h
index 28ef19890001..2baa6493f709 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFDEBUGRNGLISTS_H
-#define LLVM_DEBUGINFO_DWARFDEBUGRNGLISTS_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGRNGLISTS_H
+#define LLVM_DEBUGINFO_DWARF_DWARFDEBUGRNGLISTS_H
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/STLExtras.h"
@@ -67,4 +67,4 @@ class DWARFDebugRnglistTable : public DWARFListTableBase<DWARFDebugRnglist> {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFDEBUGRNGLISTS_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFDEBUGRNGLISTS_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDie.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDie.h
index 0f76d7f1b31c..1903bab5e73f 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFDie.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDie.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFDIE_H
-#define LLVM_DEBUGINFO_DWARFDIE_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFDIE_H
+#define LLVM_DEBUGINFO_DWARF_DWARFDIE_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
@@ -478,4 +478,4 @@ inline std::reverse_iterator<DWARFDie::iterator> DWARFDie::rend() const {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFDIE_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFDIE_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFExpression.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFExpression.h
index 0cee1b5c9be2..794e859bfe72 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFExpression.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFExpression.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFEXPRESSION_H
-#define LLVM_DEBUGINFO_DWARFEXPRESSION_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFEXPRESSION_H
+#define LLVM_DEBUGINFO_DWARF_DWARFEXPRESSION_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
index 1342e645934c..43be024f0d37 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFFORMVALUE_H
-#define LLVM_DEBUGINFO_DWARFFORMVALUE_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFFORMVALUE_H
+#define LLVM_DEBUGINFO_DWARF_DWARFFORMVALUE_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/None.h"
@@ -323,4 +323,4 @@ inline Optional<ArrayRef<uint8_t>> toBlock(const Optional<DWARFFormValue> &V) {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFFORMVALUE_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFFORMVALUE_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h
index 8f58b4e6458e..94b647d3fbf4 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_DWARFLISTTABLE_H
-#define LLVM_DEBUGINFO_DWARFLISTTABLE_H
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFLISTTABLE_H
+#define LLVM_DEBUGINFO_DWARF_DWARFLISTTABLE_H
#include "llvm/BinaryFormat/Dwarf.h"
#include "llvm/DebugInfo/DIContext.h"
@@ -289,4 +289,4 @@ DWARFListTableBase<DWARFListType>::findList(DWARFDataExtractor Data,
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARFLISTTABLE_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFLISTTABLE_H
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFVerifier.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFVerifier.h
index 18d889f5cadb..93d7e2b563fd 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFVerifier.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFVerifier.h
@@ -333,4 +333,4 @@ static inline bool operator<(const DWARFVerifier::DieRangeInfo &LHS,
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_DWARF_DWARFCONTEXT_H
+#endif // LLVM_DEBUGINFO_DWARF_DWARFVERIFIER_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/DwarfTransformer.h b/llvm/include/llvm/DebugInfo/GSYM/DwarfTransformer.h
index a5d07fbeda92..32fc54b14796 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/DwarfTransformer.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/DwarfTransformer.h
@@ -88,4 +88,4 @@ class DwarfTransformer {
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_DWARFTRANSFORMER_H
+#endif // LLVM_DEBUGINFO_GSYM_DWARFTRANSFORMER_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/FileEntry.h b/llvm/include/llvm/DebugInfo/GSYM/FileEntry.h
index 49e7fc9c4291..538f6760841c 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/FileEntry.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/FileEntry.h
@@ -64,4 +64,4 @@ template <> struct DenseMapInfo<gsym::FileEntry> {
};
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_FILEENTRY_H
+#endif // LLVM_DEBUGINFO_GSYM_FILEENTRY_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/FileWriter.h b/llvm/include/llvm/DebugInfo/GSYM/FileWriter.h
index cd568765a4f2..84b568759722 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/FileWriter.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/FileWriter.h
@@ -121,4 +121,4 @@ class FileWriter {
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_FILEWRITER_H
+#endif // LLVM_DEBUGINFO_GSYM_FILEWRITER_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/FunctionInfo.h b/llvm/include/llvm/DebugInfo/GSYM/FunctionInfo.h
index 8bd29b465b41..552337f54390 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/FunctionInfo.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/FunctionInfo.h
@@ -214,4 +214,4 @@ raw_ostream &operator<<(raw_ostream &OS, const FunctionInfo &R);
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_FUNCTIONINFO_H
+#endif // LLVM_DEBUGINFO_GSYM_FUNCTIONINFO_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/GsymCreator.h b/llvm/include/llvm/DebugInfo/GSYM/GsymCreator.h
index f29a147d4403..422c2af76939 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/GsymCreator.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/GsymCreator.h
@@ -294,4 +294,4 @@ class GsymCreator {
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_GSYMCREATOR_H
+#endif // LLVM_DEBUGINFO_GSYM_GSYMCREATOR_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/GsymReader.h b/llvm/include/llvm/DebugInfo/GSYM/GsymReader.h
index 2a4eac77d946..1865fe78260b 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/GsymReader.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/GsymReader.h
@@ -310,4 +310,4 @@ class GsymReader {
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_GSYMREADER_H
+#endif // LLVM_DEBUGINFO_GSYM_GSYMREADER_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/Header.h b/llvm/include/llvm/DebugInfo/GSYM/Header.h
index 6652c59c97a6..9ca32d25985e 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/Header.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/Header.h
@@ -126,4 +126,4 @@ raw_ostream &operator<<(raw_ostream &OS, const llvm::gsym::Header &H);
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_HEADER_H
+#endif // LLVM_DEBUGINFO_GSYM_HEADER_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/InlineInfo.h b/llvm/include/llvm/DebugInfo/GSYM/InlineInfo.h
index 06126da7d007..9bcfa5935180 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/InlineInfo.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/InlineInfo.h
@@ -179,4 +179,4 @@ raw_ostream &operator<<(raw_ostream &OS, const InlineInfo &FI);
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_INLINEINFO_H
+#endif // LLVM_DEBUGINFO_GSYM_INLINEINFO_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/LineEntry.h b/llvm/include/llvm/DebugInfo/GSYM/LineEntry.h
index aac7c48e067e..b4e7587fc5ee 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/LineEntry.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/LineEntry.h
@@ -44,4 +44,4 @@ inline bool operator<(const LineEntry &LHS, const LineEntry &RHS) {
}
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_LINEENTRY_H
+#endif // LLVM_DEBUGINFO_GSYM_LINEENTRY_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/LineTable.h b/llvm/include/llvm/DebugInfo/GSYM/LineTable.h
index fba9b2c79735..efb7b8dfd43b 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/LineTable.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/LineTable.h
@@ -230,4 +230,4 @@ raw_ostream &operator<<(raw_ostream &OS, const gsym::LineTable <);
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_LINETABLE_H
+#endif // LLVM_DEBUGINFO_GSYM_LINETABLE_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/LookupResult.h b/llvm/include/llvm/DebugInfo/GSYM/LookupResult.h
index 693a02c50f16..79ef7b22111b 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/LookupResult.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/LookupResult.h
@@ -60,4 +60,4 @@ raw_ostream &operator<<(raw_ostream &OS, const LookupResult &R);
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_LOOKUPRESULT_H
+#endif // LLVM_DEBUGINFO_GSYM_LOOKUPRESULT_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/ObjectFileTransformer.h b/llvm/include/llvm/DebugInfo/GSYM/ObjectFileTransformer.h
index 84a8d98fe365..bcde92e94fc5 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/ObjectFileTransformer.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/ObjectFileTransformer.h
@@ -48,4 +48,4 @@ class ObjectFileTransformer {
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_OBJECTFILETRANSFORMER_H
+#endif // LLVM_DEBUGINFO_GSYM_OBJECTFILETRANSFORMER_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/Range.h b/llvm/include/llvm/DebugInfo/GSYM/Range.h
index b3e7692543bf..36ad95602d14 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/Range.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/Range.h
@@ -127,4 +127,4 @@ raw_ostream &operator<<(raw_ostream &OS, const AddressRanges &AR);
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_RANGE_H
+#endif // LLVM_DEBUGINFO_GSYM_RANGE_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/StringTable.h b/llvm/include/llvm/DebugInfo/GSYM/StringTable.h
index a96ae5899da3..3c0c65482e8c 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/StringTable.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/StringTable.h
@@ -50,4 +50,4 @@ inline raw_ostream &operator<<(raw_ostream &OS, const StringTable &S) {
} // namespace gsym
} // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_STRINGTABLE_H
+#endif // LLVM_DEBUGINFO_GSYM_STRINGTABLE_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/GenericError.h b/llvm/include/llvm/DebugInfo/PDB/GenericError.h
index 1ef9b36cadaf..1121343ed64f 100644
--- a/llvm/include/llvm/DebugInfo/PDB/GenericError.h
+++ b/llvm/include/llvm/DebugInfo/PDB/GenericError.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_ERROR_H
-#define LLVM_DEBUGINFO_PDB_ERROR_H
+#ifndef LLVM_DEBUGINFO_PDB_GENERICERROR_H
+#define LLVM_DEBUGINFO_PDB_GENERICERROR_H
#include "llvm/Support/Error.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptor.h b/llvm/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptor.h
index ac1c191ab423..70ef4d058082 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptor.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptor.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_DBIMODULEDESCRIPTOR_H
-#define LLVM_DEBUGINFO_PDB_RAW_DBIMODULEDESCRIPTOR_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_DBIMODULEDESCRIPTOR_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_DBIMODULEDESCRIPTOR_H
#include "llvm/ADT/StringRef.h"
#include "llvm/DebugInfo/PDB/Native/RawTypes.h"
@@ -67,4 +67,4 @@ template <> struct VarStreamArrayExtractor<pdb::DbiModuleDescriptor> {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_PDB_RAW_DBIMODULEDESCRIPTOR_H
+#endif // LLVM_DEBUGINFO_PDB_NATIVE_DBIMODULEDESCRIPTOR_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptorBuilder.h b/llvm/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptorBuilder.h
index beaaef0c5a6c..a098f3afb830 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptorBuilder.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptorBuilder.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_DBIMODULEDESCRIPTORBUILDER_H
-#define LLVM_DEBUGINFO_PDB_RAW_DBIMODULEDESCRIPTORBUILDER_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_DBIMODULEDESCRIPTORBUILDER_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_DBIMODULEDESCRIPTORBUILDER_H
#include "llvm/ADT/StringRef.h"
#include "llvm/DebugInfo/CodeView/DebugChecksumsSubsection.h"
@@ -102,4 +102,4 @@ class DbiModuleDescriptorBuilder {
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_PDB_RAW_DBIMODULEDESCRIPTORBUILDER_H
+#endif // LLVM_DEBUGINFO_PDB_NATIVE_DBIMODULEDESCRIPTORBUILDER_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/DbiStream.h b/llvm/include/llvm/DebugInfo/PDB/Native/DbiStream.h
index 7d75c159b7ae..0bdb27a0a991 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/DbiStream.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/DbiStream.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBDBISTREAM_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBDBISTREAM_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_DBISTREAM_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_DBISTREAM_H
#include "llvm/DebugInfo/CodeView/DebugSubsection.h"
#include "llvm/DebugInfo/CodeView/DebugFrameDataSubsection.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/DbiStreamBuilder.h b/llvm/include/llvm/DebugInfo/PDB/Native/DbiStreamBuilder.h
index 24664c31e7ca..ef441d433040 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/DbiStreamBuilder.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/DbiStreamBuilder.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBDBISTREAMBUILDER_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBDBISTREAMBUILDER_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_DBISTREAMBUILDER_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_DBISTREAMBUILDER_H
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/StringSet.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/EnumTables.h b/llvm/include/llvm/DebugInfo/PDB/Native/EnumTables.h
index 70161fadf7d2..60cd494639c1 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/EnumTables.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/EnumTables.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_ENUMTABLES_H
-#define LLVM_DEBUGINFO_PDB_RAW_ENUMTABLES_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_ENUMTABLES_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_ENUMTABLES_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/Support/ScopedPrinter.h"
@@ -18,4 +18,4 @@ ArrayRef<EnumEntry<uint16_t>> getOMFSegMapDescFlagNames();
}
}
-#endif // LLVM_DEBUGINFO_PDB_RAW_ENUMTABLES_H
+#endif // LLVM_DEBUGINFO_PDB_NATIVE_ENUMTABLES_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h b/llvm/include/llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h
index 378d4cdd23e6..9530a15849d5 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_GSISTREAMBUILDER_H
-#define LLVM_DEBUGINFO_PDB_RAW_GSISTREAMBUILDER_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_GSISTREAMBUILDER_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_GSISTREAMBUILDER_H
#include "llvm/ADT/DenseSet.h"
#include "llvm/DebugInfo/CodeView/SymbolRecord.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/GlobalsStream.h b/llvm/include/llvm/DebugInfo/PDB/Native/GlobalsStream.h
index 404baaa25077..2b74babd6ab9 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/GlobalsStream.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/GlobalsStream.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_GLOBALS_STREAM_H
-#define LLVM_DEBUGINFO_PDB_RAW_GLOBALS_STREAM_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_GLOBALSSTREAM_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_GLOBALSSTREAM_H
#include "llvm/ADT/iterator.h"
#include "llvm/DebugInfo/CodeView/SymbolRecord.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/ISectionContribVisitor.h b/llvm/include/llvm/DebugInfo/PDB/Native/ISectionContribVisitor.h
index 717dce2f2737..da4078365ff5 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/ISectionContribVisitor.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/ISectionContribVisitor.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_ISECTIONCONTRIBVISITOR_H
-#define LLVM_DEBUGINFO_PDB_RAW_ISECTIONCONTRIBVISITOR_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_ISECTIONCONTRIBVISITOR_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_ISECTIONCONTRIBVISITOR_H
namespace llvm {
namespace pdb {
@@ -26,4 +26,4 @@ class ISectionContribVisitor {
} // end namespace pdb
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_PDB_RAW_ISECTIONCONTRIBVISITOR_H
+#endif // LLVM_DEBUGINFO_PDB_NATIVE_ISECTIONCONTRIBVISITOR_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/InfoStream.h b/llvm/include/llvm/DebugInfo/PDB/Native/InfoStream.h
index 315b09356ae3..67db92b64913 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/InfoStream.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/InfoStream.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBINFOSTREAM_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBINFOSTREAM_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_INFOSTREAM_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_INFOSTREAM_H
#include "llvm/ADT/BitmaskEnum.h"
#include "llvm/ADT/StringMap.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h b/llvm/include/llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h
index 208a37c45d49..4952173c5873 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBINFOSTREAMBUILDER_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBINFOSTREAMBUILDER_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_INFOSTREAMBUILDER_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_INFOSTREAMBUILDER_H
#include "llvm/ADT/Optional.h"
#include "llvm/Support/Error.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/InjectedSourceStream.h b/llvm/include/llvm/DebugInfo/PDB/Native/InjectedSourceStream.h
index 07f63ee8f1ed..b2ba81a88254 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/InjectedSourceStream.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/InjectedSourceStream.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBINJECTEDSOURCESTREAM_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBINJECTEDSOURCESTREAM_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_INJECTEDSOURCESTREAM_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_INJECTEDSOURCESTREAM_H
#include "llvm/DebugInfo/PDB/Native/HashTable.h"
#include "llvm/DebugInfo/PDB/Native/RawTypes.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/NativeSymbolEnumerator.h b/llvm/include/llvm/DebugInfo/PDB/Native/NativeSymbolEnumerator.h
index 063585097899..d6a3125ee40b 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/NativeSymbolEnumerator.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/NativeSymbolEnumerator.h
@@ -47,4 +47,4 @@ class NativeSymbolEnumerator : public NativeRawSymbol {
} // namespace pdb
} // namespace llvm
-#endif // LLVM_DEBUGINFO_PDB_NATIVE_NATIVETYPEENUM_H
+#endif // LLVM_DEBUGINFO_PDB_NATIVE_NATIVESYMBOLENUMERATOR_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeFunctionSig.h b/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeFunctionSig.h
index 358ddf5e2081..8f1834d0a2c2 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeFunctionSig.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeFunctionSig.h
@@ -70,4 +70,4 @@ class NativeTypeFunctionSig : public NativeRawSymbol {
} // namespace pdb
} // namespace llvm
-#endif // LLVM_DEBUGINFO_PDB_NATIVE_NATIVETYPEPOINTER_H
+#endif // LLVM_DEBUGINFO_PDB_NATIVE_NATIVETYPEFUNCTIONSIG_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeTypedef.h b/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeTypedef.h
index e7fb41bf61fc..292fc48e7b6d 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeTypedef.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeTypedef.h
@@ -38,4 +38,4 @@ class NativeTypeTypedef : public NativeRawSymbol {
} // namespace pdb
} // namespace llvm
-#endif // LLVM_DEBUGINFO_PDB_NATIVE_NATIVETYPEPOINTER_H
+#endif // LLVM_DEBUGINFO_PDB_NATIVE_NATIVETYPETYPEDEF_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/PDBFile.h b/llvm/include/llvm/DebugInfo/PDB/Native/PDBFile.h
index 56de4030167d..2124e6a46ed5 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/PDBFile.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/PDBFile.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBFILE_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBFILE_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_PDBFILE_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_PDBFILE_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/DebugInfo/MSF/IMSFFile.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/PDBFileBuilder.h b/llvm/include/llvm/DebugInfo/PDB/Native/PDBFileBuilder.h
index 5b6c0e30d08b..3c414e7a9005 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/PDBFileBuilder.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/PDBFileBuilder.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBFILEBUILDER_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBFILEBUILDER_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_PDBFILEBUILDER_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_PDBFILEBUILDER_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/PDBStringTable.h b/llvm/include/llvm/DebugInfo/PDB/Native/PDBStringTable.h
index 5603b231bdd0..5cb749c8a747 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/PDBStringTable.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/PDBStringTable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBSTRINGTABLE_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBSTRINGTABLE_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_PDBSTRINGTABLE_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_PDBSTRINGTABLE_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/StringRef.h"
@@ -60,4 +60,4 @@ class PDBStringTable {
} // end namespace pdb
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_PDB_RAW_STRINGTABLE_H
+#endif // LLVM_DEBUGINFO_PDB_NATIVE_PDBSTRINGTABLE_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/PDBStringTableBuilder.h b/llvm/include/llvm/DebugInfo/PDB/Native/PDBStringTableBuilder.h
index c953039ec14d..986bd3645108 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/PDBStringTableBuilder.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/PDBStringTableBuilder.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBSTRINGTABLEBUILDER_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBSTRINGTABLEBUILDER_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_PDBSTRINGTABLEBUILDER_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_PDBSTRINGTABLEBUILDER_H
#include "llvm/ADT/StringRef.h"
#include "llvm/DebugInfo/CodeView/DebugStringTableSubsection.h"
@@ -67,4 +67,4 @@ class PDBStringTableBuilder {
} // end namespace pdb
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_PDB_RAW_PDBSTRINGTABLEBUILDER_H
+#endif // LLVM_DEBUGINFO_PDB_NATIVE_PDBSTRINGTABLEBUILDER_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/PublicsStream.h b/llvm/include/llvm/DebugInfo/PDB/Native/PublicsStream.h
index ee28d108df8b..bf6da3ea2920 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/PublicsStream.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/PublicsStream.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PUBLICSSTREAM_H
-#define LLVM_DEBUGINFO_PDB_RAW_PUBLICSSTREAM_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_PUBLICSSTREAM_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_PUBLICSSTREAM_H
#include "llvm/DebugInfo/CodeView/SymbolRecord.h"
#include "llvm/DebugInfo/MSF/MappedBlockStream.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/RawConstants.h b/llvm/include/llvm/DebugInfo/PDB/Native/RawConstants.h
index 0dde5ef66932..dacd0281ac53 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/RawConstants.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/RawConstants.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBRAWCONSTANTS_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBRAWCONSTANTS_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_RAWCONSTANTS_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_RAWCONSTANTS_H
#include "llvm/ADT/BitmaskEnum.h"
#include "llvm/DebugInfo/CodeView/CodeView.h"
@@ -115,4 +115,4 @@ LLVM_ENABLE_BITMASK_ENUMS_IN_NAMESPACE();
} // end namespace pdb
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_PDB_RAW_PDBRAWCONSTANTS_H
+#endif // LLVM_DEBUGINFO_PDB_NATIVE_RAWCONSTANTS_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/RawError.h b/llvm/include/llvm/DebugInfo/PDB/Native/RawError.h
index aadb64c2e3f1..fbfefe72ae7e 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/RawError.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/RawError.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_RAWERROR_H
-#define LLVM_DEBUGINFO_PDB_RAW_RAWERROR_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_RAWERROR_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_RAWERROR_H
#include "llvm/Support/Error.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/RawTypes.h b/llvm/include/llvm/DebugInfo/PDB/Native/RawTypes.h
index 6119e6e5db26..4a9db4962fbb 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/RawTypes.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/RawTypes.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_RAWTYPES_H
-#define LLVM_DEBUGINFO_PDB_RAW_RAWTYPES_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_RAWTYPES_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_RAWTYPES_H
#include "llvm/DebugInfo/CodeView/GUID.h"
#include "llvm/DebugInfo/CodeView/TypeRecord.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/SymbolStream.h b/llvm/include/llvm/DebugInfo/PDB/Native/SymbolStream.h
index 4fe1bd9734e4..839cc8d2c503 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/SymbolStream.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/SymbolStream.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBSYMBOLSTREAM_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBSYMBOLSTREAM_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_SYMBOLSTREAM_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_SYMBOLSTREAM_H
#include "llvm/DebugInfo/CodeView/SymbolRecord.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/TpiHashing.h b/llvm/include/llvm/DebugInfo/PDB/Native/TpiHashing.h
index 4ac60a80e701..3cdb890d81d3 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/TpiHashing.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/TpiHashing.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_TPIHASHING_H
-#define LLVM_DEBUGINFO_PDB_TPIHASHING_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_TPIHASHING_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_TPIHASHING_H
#include "llvm/DebugInfo/CodeView/TypeRecord.h"
#include "llvm/Support/Error.h"
@@ -68,4 +68,4 @@ Expected<TagRecordHash> hashTagRecord(const codeview::CVType &Type);
} // end namespace pdb
} // end namespace llvm
-#endif // LLVM_DEBUGINFO_PDB_TPIHASHING_H
+#endif // LLVM_DEBUGINFO_PDB_NATIVE_TPIHASHING_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/TpiStream.h b/llvm/include/llvm/DebugInfo/PDB/Native/TpiStream.h
index 70288868ca21..e49d58af4421 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/TpiStream.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/TpiStream.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBTPISTREAM_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBTPISTREAM_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_TPISTREAM_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_TPISTREAM_H
#include "llvm/DebugInfo/CodeView/CVRecord.h"
#include "llvm/DebugInfo/PDB/Native/HashTable.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/TpiStreamBuilder.h b/llvm/include/llvm/DebugInfo/PDB/Native/TpiStreamBuilder.h
index 9ef2ee6a9307..f18d38ae0b31 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Native/TpiStreamBuilder.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/TpiStreamBuilder.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBTPISTREAMBUILDER_H
-#define LLVM_DEBUGINFO_PDB_RAW_PDBTPISTREAMBUILDER_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_TPISTREAMBUILDER_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_TPISTREAMBUILDER_H
#include "llvm/ADT/Optional.h"
#include "llvm/DebugInfo/CodeView/TypeRecord.h"
diff --git a/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h b/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h
index b82bb6c0a352..dbd8ba5a63ff 100644
--- a/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h
+++ b/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h
@@ -49,4 +49,4 @@ class PDBSymbolCompilandDetails : public PDBSymbol {
} // namespace llvm
}
-#endif // LLVM_DEBUGINFO_PDB_PDBFUNCTION_H
+#endif // LLVM_DEBUGINFO_PDB_PDBSYMBOLCOMPILANDDETAILS_H
diff --git a/llvm/include/llvm/Demangle/DemangleConfig.h b/llvm/include/llvm/Demangle/DemangleConfig.h
index b7b7dbd24c7f..2ff95dd8d29e 100644
--- a/llvm/include/llvm/Demangle/DemangleConfig.h
+++ b/llvm/include/llvm/Demangle/DemangleConfig.h
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEMANGLE_COMPILER_H
-#define LLVM_DEMANGLE_COMPILER_H
+#ifndef LLVM_DEMANGLE_DEMANGLECONFIG_H
+#define LLVM_DEMANGLE_DEMANGLECONFIG_H
#ifndef __has_feature
#define __has_feature(x) 0
diff --git a/llvm/include/llvm/Demangle/ItaniumDemangle.h b/llvm/include/llvm/Demangle/ItaniumDemangle.h
index e5fca98f9271..112d5a489e56 100644
--- a/llvm/include/llvm/Demangle/ItaniumDemangle.h
+++ b/llvm/include/llvm/Demangle/ItaniumDemangle.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef DEMANGLE_ITANIUMDEMANGLE_H
-#define DEMANGLE_ITANIUMDEMANGLE_H
+#ifndef LLVM_DEMANGLE_ITANIUMDEMANGLE_H
+#define LLVM_DEMANGLE_ITANIUMDEMANGLE_H
// FIXME: (possibly) incomplete list of features that clang mangles that this
// file does not yet support:
@@ -5702,4 +5702,4 @@ struct ManglingParser : AbstractManglingParser<ManglingParser<Alloc>, Alloc> {
DEMANGLE_NAMESPACE_END
-#endif // DEMANGLE_ITANIUMDEMANGLE_H
+#endif // LLVM_DEMANGLE_ITANIUMDEMANGLE_H
diff --git a/llvm/include/llvm/Demangle/MicrosoftDemangle.h b/llvm/include/llvm/Demangle/MicrosoftDemangle.h
index c6f26061bedd..040313661601 100644
--- a/llvm/include/llvm/Demangle/MicrosoftDemangle.h
+++ b/llvm/include/llvm/Demangle/MicrosoftDemangle.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_DEMANGLE_MICROSOFT_DEMANGLE_H
-#define LLVM_DEMANGLE_MICROSOFT_DEMANGLE_H
+#ifndef LLVM_DEMANGLE_MICROSOFTDEMANGLE_H
+#define LLVM_DEMANGLE_MICROSOFTDEMANGLE_H
#include "llvm/Demangle/DemangleConfig.h"
#include "llvm/Demangle/MicrosoftDemangleNodes.h"
@@ -275,4 +275,4 @@ class Demangler {
} // namespace ms_demangle
} // namespace llvm
-#endif // LLVM_DEMANGLE_MICROSOFT_DEMANGLE_H
+#endif // LLVM_DEMANGLE_MICROSOFTDEMANGLE_H
diff --git a/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h b/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h
index bcc63b6ef5cb..18eafd62df43 100644
--- a/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h
+++ b/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_MICROSOFTDEMANGLENODES_H
-#define LLVM_SUPPORT_MICROSOFTDEMANGLENODES_H
+#ifndef LLVM_DEMANGLE_MICROSOFTDEMANGLENODES_H
+#define LLVM_DEMANGLE_MICROSOFTDEMANGLENODES_H
#include "llvm/Demangle/DemangleConfig.h"
#include "llvm/Demangle/StringView.h"
diff --git a/llvm/include/llvm/Demangle/StringView.h b/llvm/include/llvm/Demangle/StringView.h
index ceb6c7958066..2e260969ce9a 100644
--- a/llvm/include/llvm/Demangle/StringView.h
+++ b/llvm/include/llvm/Demangle/StringView.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef DEMANGLE_STRINGVIEW_H
-#define DEMANGLE_STRINGVIEW_H
+#ifndef LLVM_DEMANGLE_STRINGVIEW_H
+#define LLVM_DEMANGLE_STRINGVIEW_H
#include "DemangleConfig.h"
#include <algorithm>
diff --git a/llvm/include/llvm/Demangle/Utility.h b/llvm/include/llvm/Demangle/Utility.h
index 846a5f0818e7..04ff65a35aed 100644
--- a/llvm/include/llvm/Demangle/Utility.h
+++ b/llvm/include/llvm/Demangle/Utility.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef DEMANGLE_UTILITY_H
-#define DEMANGLE_UTILITY_H
+#ifndef LLVM_DEMANGLE_UTILITY_H
+#define LLVM_DEMANGLE_UTILITY_H
#include "StringView.h"
#include <cstdint>
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h b/llvm/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
index f8fdb171bbf9..be8526bf4353 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
@@ -69,4 +69,4 @@ class IRCompileLayer : public IRLayer {
} // end namespace orc
} // end namespace llvm
-#endif // LLVM_EXECUTIONENGINE_ORC_IRCOMPILINGLAYER_H
+#endif // LLVM_EXECUTIONENGINE_ORC_IRCOMPILELAYER_H
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcError.h b/llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcError.h
index 9b0d941f5459..379dd9efefd1 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcError.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcError.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_EXECUTIONENGINE_ORC_ORCERROR_H
-#define LLVM_EXECUTIONENGINE_ORC_ORCERROR_H
+#ifndef LLVM_EXECUTIONENGINE_ORC_SHARED_ORCERROR_H
+#define LLVM_EXECUTIONENGINE_ORC_SHARED_ORCERROR_H
#include "llvm/Support/Error.h"
#include "llvm/Support/raw_ostream.h"
@@ -71,4 +71,4 @@ class JITSymbolNotFound : public ErrorInfo<JITSymbolNotFound> {
} // End namespace orc.
} // End namespace llvm.
-#endif // LLVM_EXECUTIONENGINE_ORC_ORCERROR_H
+#endif // LLVM_EXECUTIONENGINE_ORC_SHARED_ORCERROR_H
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h b/llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h
index f2d07632bd5d..0ea483ba2abb 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h
@@ -766,4 +766,4 @@ class SerializationTraits<ChannelT, std::map<K, V>, DenseMap<K2, V2>> {
} // end namespace orc
} // end namespace llvm
-#endif // LLVM_EXECUTIONENGINE_ORC_RPC_RPCSERIALIZATION_H
+#endif // LLVM_EXECUTIONENGINE_ORC_SHARED_SERIALIZATION_H
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h b/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
index 82f2b7464953..d4960ab8b0bb 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_EXECUTIONENGINE_ORC_THREADSAFEMODULEWRAPPER_H
-#define LLVM_EXECUTIONENGINE_ORC_THREADSAFEMODULEWRAPPER_H
+#ifndef LLVM_EXECUTIONENGINE_ORC_THREADSAFEMODULE_H
+#define LLVM_EXECUTIONENGINE_ORC_THREADSAFEMODULE_H
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/Module.h"
@@ -169,4 +169,4 @@ cloneToNewContext(const ThreadSafeModule &TSMW,
} // End namespace orc
} // End namespace llvm
-#endif // LLVM_EXECUTIONENGINE_ORC_THREADSAFEMODULEWRAPPER_H
+#endif // LLVM_EXECUTIONENGINE_ORC_THREADSAFEMODULE_H
diff --git a/llvm/include/llvm/ExecutionEngine/SectionMemoryManager.h b/llvm/include/llvm/ExecutionEngine/SectionMemoryManager.h
index 49956fab17ce..455efc9f9001 100644
--- a/llvm/include/llvm/ExecutionEngine/SectionMemoryManager.h
+++ b/llvm/include/llvm/ExecutionEngine/SectionMemoryManager.h
@@ -190,4 +190,4 @@ class SectionMemoryManager : public RTDyldMemoryManager {
} // end namespace llvm
-#endif // LLVM_EXECUTION_ENGINE_SECTION_MEMORY_MANAGER_H
+#endif // LLVM_EXECUTIONENGINE_SECTIONMEMORYMANAGER_H
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPConstants.h b/llvm/include/llvm/Frontend/OpenMP/OMPConstants.h
index 36ce3fc0f66f..4c67ea332aa9 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMPConstants.h
+++ b/llvm/include/llvm/Frontend/OpenMP/OMPConstants.h
@@ -11,8 +11,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_OPENMP_CONSTANTS_H
-#define LLVM_OPENMP_CONSTANTS_H
+#ifndef LLVM_FRONTEND_OPENMP_OMPCONSTANTS_H
+#define LLVM_FRONTEND_OPENMP_OMPCONSTANTS_H
#include "llvm/ADT/BitmaskEnum.h"
@@ -111,4 +111,4 @@ inline std::string getAllAssumeClauseOptions() {
} // end namespace llvm
-#endif // LLVM_OPENMP_CONSTANTS_H
+#endif // LLVM_FRONTEND_OPENMP_OMPCONSTANTS_H
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPContext.h b/llvm/include/llvm/Frontend/OpenMP/OMPContext.h
index 8a4179167c89..544f698655a4 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMPContext.h
+++ b/llvm/include/llvm/Frontend/OpenMP/OMPContext.h
@@ -12,8 +12,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_OPENMP_CONTEXT_H
-#define LLVM_OPENMP_CONTEXT_H
+#ifndef LLVM_FRONTEND_OPENMP_OMPCONTEXT_H
+#define LLVM_FRONTEND_OPENMP_OMPCONTEXT_H
#include "llvm/ADT/APSInt.h"
#include "llvm/ADT/BitVector.h"
@@ -207,4 +207,4 @@ template <> struct DenseMapInfo<omp::TraitProperty> {
};
} // end namespace llvm
-#endif // LLVM_OPENMP_CONTEXT_H
+#endif // LLVM_FRONTEND_OPENMP_OMPCONTEXT_H
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPGridValues.h b/llvm/include/llvm/Frontend/OpenMP/OMPGridValues.h
index 6b48cc447e13..0b6aed1e9e12 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMPGridValues.h
+++ b/llvm/include/llvm/Frontend/OpenMP/OMPGridValues.h
@@ -11,8 +11,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_OPENMP_GRIDVALUES_H
-#define LLVM_OPENMP_GRIDVALUES_H
+#ifndef LLVM_FRONTEND_OPENMP_OMPGRIDVALUES_H
+#define LLVM_FRONTEND_OPENMP_OMPGRIDVALUES_H
namespace llvm {
@@ -128,4 +128,4 @@ static constexpr unsigned NVPTXGpuGridValues[] = {
} // namespace omp
} // namespace llvm
-#endif // LLVM_OPENMP_GRIDVALUES_H
+#endif // LLVM_FRONTEND_OPENMP_OMPGRIDVALUES_H
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h b/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
index 4b5258831e10..6c6468b1acc6 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
+++ b/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_OPENMP_IR_IRBUILDER_H
-#define LLVM_OPENMP_IR_IRBUILDER_H
+#ifndef LLVM_FRONTEND_OPENMP_OMPIRBUILDER_H
+#define LLVM_FRONTEND_OPENMP_OMPIRBUILDER_H
#include "llvm/Frontend/OpenMP/OMPConstants.h"
#include "llvm/IR/DebugLoc.h"
@@ -922,4 +922,4 @@ class CanonicalLoopInfo {
} // end namespace llvm
-#endif // LLVM_IR_IRBUILDER_H
+#endif // LLVM_FRONTEND_OPENMP_OMPIRBUILDER_H
diff --git a/llvm/include/llvm/FuzzMutate/FuzzerCLI.h b/llvm/include/llvm/FuzzMutate/FuzzerCLI.h
index 27eec058b599..473277396a90 100644
--- a/llvm/include/llvm/FuzzMutate/FuzzerCLI.h
+++ b/llvm/include/llvm/FuzzMutate/FuzzerCLI.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_FUZZMUTATE_FUZZER_CLI_H
-#define LLVM_FUZZMUTATE_FUZZER_CLI_H
+#ifndef LLVM_FUZZMUTATE_FUZZERCLI_H
+#define LLVM_FUZZMUTATE_FUZZERCLI_H
#include "llvm/IR/LLVMContext.h"
#include "llvm/Support/DataTypes.h"
@@ -76,4 +76,4 @@ std::unique_ptr<Module> parseAndVerify(const uint8_t *Data, size_t Size,
} // end llvm namespace
-#endif // LLVM_FUZZMUTATE_FUZZER_CLI_H
+#endif // LLVM_FUZZMUTATE_FUZZERCLI_H
diff --git a/llvm/include/llvm/IR/DebugLoc.h b/llvm/include/llvm/IR/DebugLoc.h
index 4824f2e9f2fd..4c48f048d60c 100644
--- a/llvm/include/llvm/IR/DebugLoc.h
+++ b/llvm/include/llvm/IR/DebugLoc.h
@@ -113,4 +113,4 @@ namespace llvm {
} // end namespace llvm
-#endif /* LLVM_SUPPORT_DEBUGLOC_H */
+#endif // LLVM_IR_DEBUGLOC_H
diff --git a/llvm/include/llvm/IR/FPEnv.h b/llvm/include/llvm/IR/FPEnv.h
index f00cb735932f..2a765a2d700b 100644
--- a/llvm/include/llvm/IR/FPEnv.h
+++ b/llvm/include/llvm/IR/FPEnv.h
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_IR_FLOATINGPOINT_H
-#define LLVM_IR_FLOATINGPOINT_H
+#ifndef LLVM_IR_FPENV_H
+#define LLVM_IR_FPENV_H
#include "llvm/ADT/FloatingPointMode.h"
#include "llvm/ADT/Optional.h"
diff --git a/llvm/include/llvm/IR/SafepointIRVerifier.h b/llvm/include/llvm/IR/SafepointIRVerifier.h
index ec5527954adc..76b147e690be 100644
--- a/llvm/include/llvm/IR/SafepointIRVerifier.h
+++ b/llvm/include/llvm/IR/SafepointIRVerifier.h
@@ -15,8 +15,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_IR_SAFEPOINT_IR_VERIFIER
-#define LLVM_IR_SAFEPOINT_IR_VERIFIER
+#ifndef LLVM_IR_SAFEPOINTIRVERIFIER_H
+#define LLVM_IR_SAFEPOINTIRVERIFIER_H
#include "llvm/IR/PassManager.h"
@@ -43,4 +43,4 @@ class SafepointIRVerifierPass : public PassInfoMixin<SafepointIRVerifierPass> {
};
}
-#endif // LLVM_IR_SAFEPOINT_IR_VERIFIER
+#endif // LLVM_IR_SAFEPOINTIRVERIFIER_H
diff --git a/llvm/include/llvm/InterfaceStub/ELFObjHandler.h b/llvm/include/llvm/InterfaceStub/ELFObjHandler.h
index 4ec158c1405f..a947327a7286 100644
--- a/llvm/include/llvm/InterfaceStub/ELFObjHandler.h
+++ b/llvm/include/llvm/InterfaceStub/ELFObjHandler.h
@@ -10,8 +10,8 @@
///
//===-----------------------------------------------------------------------===/
-#ifndef LLVM_TOOLS_ELFABI_ELFOBJHANDLER_H
-#define LLVM_TOOLS_ELFABI_ELFOBJHANDLER_H
+#ifndef LLVM_INTERFACESTUB_ELFOBJHANDLER_H
+#define LLVM_INTERFACESTUB_ELFOBJHANDLER_H
#include "llvm/InterfaceStub/ELFStub.h"
#include "llvm/Object/ELFObjectFile.h"
@@ -44,4 +44,4 @@ Error writeBinaryStub(StringRef FilePath, const ELFStub &Stub,
} // end namespace elfabi
} // end namespace llvm
-#endif // LLVM_TOOLS_ELFABI_ELFOBJHANDLER_H
+#endif // LLVM_INTERFACESTUB_ELFOBJHANDLER_H
diff --git a/llvm/include/llvm/InterfaceStub/ELFStub.h b/llvm/include/llvm/InterfaceStub/ELFStub.h
index 7832c1c7413b..20c1ab449bda 100644
--- a/llvm/include/llvm/InterfaceStub/ELFStub.h
+++ b/llvm/include/llvm/InterfaceStub/ELFStub.h
@@ -11,8 +11,8 @@
///
//===-----------------------------------------------------------------------===/
-#ifndef LLVM_TEXTAPI_ELF_ELFSTUB_H
-#define LLVM_TEXTAPI_ELF_ELFSTUB_H
+#ifndef LLVM_INTERFACESTUB_ELFSTUB_H
+#define LLVM_INTERFACESTUB_ELFSTUB_H
#include "llvm/BinaryFormat/ELF.h"
#include "llvm/Support/VersionTuple.h"
@@ -63,4 +63,4 @@ class ELFStub {
} // end namespace elfabi
} // end namespace llvm
-#endif // LLVM_TEXTAPI_ELF_ELFSTUB_H
+#endif // LLVM_INTERFACESTUB_ELFSTUB_H
diff --git a/llvm/include/llvm/InterfaceStub/TBEHandler.h b/llvm/include/llvm/InterfaceStub/TBEHandler.h
index 5c523eba037e..aee7ed0d0fcb 100644
--- a/llvm/include/llvm/InterfaceStub/TBEHandler.h
+++ b/llvm/include/llvm/InterfaceStub/TBEHandler.h
@@ -12,8 +12,8 @@
///
//===-----------------------------------------------------------------------===/
-#ifndef LLVM_TEXTAPI_ELF_TBEHANDLER_H
-#define LLVM_TEXTAPI_ELF_TBEHANDLER_H
+#ifndef LLVM_INTERFACESTUB_TBEHANDLER_H
+#define LLVM_INTERFACESTUB_TBEHANDLER_H
#include "llvm/Support/Error.h"
#include "llvm/Support/VersionTuple.h"
@@ -40,4 +40,4 @@ Error writeTBEToOutputStream(raw_ostream &OS, const ELFStub &Stub);
} // end namespace elfabi
} // end namespace llvm
-#endif // LLVM_TEXTAPI_ELF_TBEHANDLER_H
+#endif // LLVM_INTERFACESTUB_TBEHANDLER_H
diff --git a/llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h b/llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
index fc7b8fc25bd9..864d60cffb20 100644
--- a/llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
+++ b/llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
@@ -31,8 +31,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LTO_LTOCODEGENERATOR_H
-#define LLVM_LTO_LTOCODEGENERATOR_H
+#ifndef LLVM_LTO_LEGACY_LTOCODEGENERATOR_H
+#define LLVM_LTO_LEGACY_LTOCODEGENERATOR_H
#include "llvm-c/lto.h"
#include "llvm/ADT/ArrayRef.h"
diff --git a/llvm/include/llvm/LTO/legacy/LTOModule.h b/llvm/include/llvm/LTO/legacy/LTOModule.h
index 310447d615f9..2a25dab58ada 100644
--- a/llvm/include/llvm/LTO/legacy/LTOModule.h
+++ b/llvm/include/llvm/LTO/legacy/LTOModule.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LTO_LTOMODULE_H
-#define LLVM_LTO_LTOMODULE_H
+#ifndef LLVM_LTO_LEGACY_LTOMODULE_H
+#define LLVM_LTO_LEGACY_LTOMODULE_H
#include "llvm-c/lto.h"
#include "llvm/ADT/StringMap.h"
diff --git a/llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h b/llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
index 210a2ce00bdf..3360da0d5ad1 100644
--- a/llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
+++ b/llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LTO_THINLTOCODEGENERATOR_H
-#define LLVM_LTO_THINLTOCODEGENERATOR_H
+#ifndef LLVM_LTO_LEGACY_THINLTOCODEGENERATOR_H
+#define LLVM_LTO_LEGACY_THINLTOCODEGENERATOR_H
#include "llvm-c/lto.h"
#include "llvm/ADT/StringSet.h"
diff --git a/llvm/include/llvm/LTO/legacy/UpdateCompilerUsed.h b/llvm/include/llvm/LTO/legacy/UpdateCompilerUsed.h
index af9d62b4af30..25a8c553ccb8 100644
--- a/llvm/include/llvm/LTO/legacy/UpdateCompilerUsed.h
+++ b/llvm/include/llvm/LTO/legacy/UpdateCompilerUsed.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LTO_UPDATE_COMPILER_USED_H
-#define LLVM_LTO_UPDATE_COMPILER_USED_H
+#ifndef LLVM_LTO_LEGACY_UPDATECOMPILERUSED_H
+#define LLVM_LTO_LEGACY_UPDATECOMPILERUSED_H
#include "llvm/ADT/StringSet.h"
#include "llvm/IR/GlobalValue.h"
@@ -28,4 +28,4 @@ void updateCompilerUsed(Module &TheModule, const TargetMachine &TM,
const StringSet<> &AsmUndefinedRefs);
}
-#endif // LLVM_LTO_UPDATE_COMPILER_USED_H
+#endif // LLVM_LTO_LEGACY_UPDATECOMPILERUSED_H
diff --git a/llvm/include/llvm/MC/MCRegister.h b/llvm/include/llvm/MC/MCRegister.h
index 8bbeab5bef43..bee7822067ad 100644
--- a/llvm/include/llvm/MC/MCRegister.h
+++ b/llvm/include/llvm/MC/MCRegister.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MC_REGISTER_H
-#define LLVM_MC_REGISTER_H
+#ifndef LLVM_MC_MCREGISTER_H
+#define LLVM_MC_MCREGISTER_H
#include "llvm/ADT/DenseMapInfo.h"
#include <cassert>
@@ -111,4 +111,4 @@ inline hash_code hash_value(const MCRegister &Reg) {
}
}
-#endif // ifndef LLVM_MC_REGISTER_H
+#endif // LLVM_MC_MCREGISTER_H
diff --git a/llvm/include/llvm/MCA/HardwareUnits/HardwareUnit.h b/llvm/include/llvm/MCA/HardwareUnits/HardwareUnit.h
index f6e178bcff10..85350e4eb7f0 100644
--- a/llvm/include/llvm/MCA/HardwareUnits/HardwareUnit.h
+++ b/llvm/include/llvm/MCA/HardwareUnits/HardwareUnit.h
@@ -12,8 +12,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_HARDWAREUNIT_H
-#define LLVM_MCA_HARDWAREUNIT_H
+#ifndef LLVM_MCA_HARDWAREUNITS_HARDWAREUNIT_H
+#define LLVM_MCA_HARDWAREUNITS_HARDWAREUNIT_H
namespace llvm {
namespace mca {
@@ -29,4 +29,4 @@ class HardwareUnit {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_HARDWAREUNIT_H
+#endif // LLVM_MCA_HARDWAREUNITS_HARDWAREUNIT_H
diff --git a/llvm/include/llvm/MCA/HardwareUnits/LSUnit.h b/llvm/include/llvm/MCA/HardwareUnits/LSUnit.h
index 2f9b4ba8782d..0f1fac55af4f 100644
--- a/llvm/include/llvm/MCA/HardwareUnits/LSUnit.h
+++ b/llvm/include/llvm/MCA/HardwareUnits/LSUnit.h
@@ -12,8 +12,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_LSUNIT_H
-#define LLVM_MCA_LSUNIT_H
+#ifndef LLVM_MCA_HARDWAREUNITS_LSUNIT_H
+#define LLVM_MCA_HARDWAREUNITS_LSUNIT_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallVector.h"
@@ -472,4 +472,4 @@ class LSUnit : public LSUnitBase {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_LSUNIT_H
+#endif // LLVM_MCA_HARDWAREUNITS_LSUNIT_H
diff --git a/llvm/include/llvm/MCA/HardwareUnits/RegisterFile.h b/llvm/include/llvm/MCA/HardwareUnits/RegisterFile.h
index e8ca34854295..6447db00999c 100644
--- a/llvm/include/llvm/MCA/HardwareUnits/RegisterFile.h
+++ b/llvm/include/llvm/MCA/HardwareUnits/RegisterFile.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_REGISTER_FILE_H
-#define LLVM_MCA_REGISTER_FILE_H
+#ifndef LLVM_MCA_HARDWAREUNITS_REGISTERFILE_H
+#define LLVM_MCA_HARDWAREUNITS_REGISTERFILE_H
#include "llvm/ADT/APInt.h"
#include "llvm/ADT/SmallVector.h"
@@ -235,4 +235,4 @@ class RegisterFile : public HardwareUnit {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_REGISTER_FILE_H
+#endif // LLVM_MCA_HARDWAREUNITS_REGISTERFILE_H
diff --git a/llvm/include/llvm/MCA/HardwareUnits/ResourceManager.h b/llvm/include/llvm/MCA/HardwareUnits/ResourceManager.h
index b6d4e345da2c..b679b0d7d537 100644
--- a/llvm/include/llvm/MCA/HardwareUnits/ResourceManager.h
+++ b/llvm/include/llvm/MCA/HardwareUnits/ResourceManager.h
@@ -12,8 +12,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_RESOURCE_MANAGER_H
-#define LLVM_MCA_RESOURCE_MANAGER_H
+#ifndef LLVM_MCA_HARDWAREUNITS_RESOURCEMANAGER_H
+#define LLVM_MCA_HARDWAREUNITS_RESOURCEMANAGER_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallVector.h"
@@ -444,4 +444,4 @@ class ResourceManager {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_RESOURCE_MANAGER_H
+#endif // LLVM_MCA_HARDWAREUNITS_RESOURCEMANAGER_H
diff --git a/llvm/include/llvm/MCA/HardwareUnits/RetireControlUnit.h b/llvm/include/llvm/MCA/HardwareUnits/RetireControlUnit.h
index acbd4543bd4a..e4b57b28830c 100644
--- a/llvm/include/llvm/MCA/HardwareUnits/RetireControlUnit.h
+++ b/llvm/include/llvm/MCA/HardwareUnits/RetireControlUnit.h
@@ -11,8 +11,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_RETIRE_CONTROL_UNIT_H
-#define LLVM_MCA_RETIRE_CONTROL_UNIT_H
+#ifndef LLVM_MCA_HARDWAREUNITS_RETIRECONTROLUNIT_H
+#define LLVM_MCA_HARDWAREUNITS_RETIRECONTROLUNIT_H
#include "llvm/MC/MCSchedule.h"
#include "llvm/MCA/HardwareUnits/HardwareUnit.h"
@@ -109,4 +109,4 @@ struct RetireControlUnit : public HardwareUnit {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_RETIRE_CONTROL_UNIT_H
+#endif // LLVM_MCA_HARDWAREUNITS_RETIRECONTROLUNIT_H
diff --git a/llvm/include/llvm/MCA/HardwareUnits/Scheduler.h b/llvm/include/llvm/MCA/HardwareUnits/Scheduler.h
index 0293364e26ef..2b0f391570cd 100644
--- a/llvm/include/llvm/MCA/HardwareUnits/Scheduler.h
+++ b/llvm/include/llvm/MCA/HardwareUnits/Scheduler.h
@@ -11,8 +11,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_SCHEDULER_H
-#define LLVM_MCA_SCHEDULER_H
+#ifndef LLVM_MCA_HARDWAREUNITS_SCHEDULER_H
+#define LLVM_MCA_HARDWAREUNITS_SCHEDULER_H
#include "llvm/ADT/SmallVector.h"
#include "llvm/MC/MCSchedule.h"
@@ -276,4 +276,4 @@ class Scheduler : public HardwareUnit {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_SCHEDULER_H
+#endif // LLVM_MCA_HARDWAREUNITS_SCHEDULER_H
diff --git a/llvm/include/llvm/MCA/Stages/DispatchStage.h b/llvm/include/llvm/MCA/Stages/DispatchStage.h
index 597f7312448d..c2b521993c2f 100644
--- a/llvm/include/llvm/MCA/Stages/DispatchStage.h
+++ b/llvm/include/llvm/MCA/Stages/DispatchStage.h
@@ -15,8 +15,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_DISPATCH_STAGE_H
-#define LLVM_MCA_DISPATCH_STAGE_H
+#ifndef LLVM_MCA_STAGES_DISPATCHSTAGE_H
+#define LLVM_MCA_STAGES_DISPATCHSTAGE_H
#include "llvm/MC/MCRegisterInfo.h"
#include "llvm/MC/MCSubtargetInfo.h"
@@ -84,4 +84,4 @@ class DispatchStage final : public Stage {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_DISPATCH_STAGE_H
+#endif // LLVM_MCA_STAGES_DISPATCHSTAGE_H
diff --git a/llvm/include/llvm/MCA/Stages/EntryStage.h b/llvm/include/llvm/MCA/Stages/EntryStage.h
index 59a2daff886e..1c133898d603 100644
--- a/llvm/include/llvm/MCA/Stages/EntryStage.h
+++ b/llvm/include/llvm/MCA/Stages/EntryStage.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_ENTRY_STAGE_H
-#define LLVM_MCA_ENTRY_STAGE_H
+#ifndef LLVM_MCA_STAGES_ENTRYSTAGE_H
+#define LLVM_MCA_STAGES_ENTRYSTAGE_H
#include "llvm/ADT/SmallVector.h"
#include "llvm/MCA/SourceMgr.h"
@@ -48,4 +48,4 @@ class EntryStage final : public Stage {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_FETCH_STAGE_H
+#endif // LLVM_MCA_STAGES_ENTRYSTAGE_H
diff --git a/llvm/include/llvm/MCA/Stages/ExecuteStage.h b/llvm/include/llvm/MCA/Stages/ExecuteStage.h
index 03737e0220eb..04dd657e9ac8 100644
--- a/llvm/include/llvm/MCA/Stages/ExecuteStage.h
+++ b/llvm/include/llvm/MCA/Stages/ExecuteStage.h
@@ -14,8 +14,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_EXECUTE_STAGE_H
-#define LLVM_MCA_EXECUTE_STAGE_H
+#ifndef LLVM_MCA_STAGES_EXECUTESTAGE_H
+#define LLVM_MCA_STAGES_EXECUTESTAGE_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/MCA/HardwareUnits/Scheduler.h"
@@ -87,4 +87,4 @@ class ExecuteStage final : public Stage {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_EXECUTE_STAGE_H
+#endif // LLVM_MCA_STAGES_EXECUTESTAGE_H
diff --git a/llvm/include/llvm/MCA/Stages/InstructionTables.h b/llvm/include/llvm/MCA/Stages/InstructionTables.h
index 4b463c9b51c1..30fdf2931789 100644
--- a/llvm/include/llvm/MCA/Stages/InstructionTables.h
+++ b/llvm/include/llvm/MCA/Stages/InstructionTables.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_INSTRUCTIONTABLES_H
-#define LLVM_MCA_INSTRUCTIONTABLES_H
+#ifndef LLVM_MCA_STAGES_INSTRUCTIONTABLES_H
+#define LLVM_MCA_STAGES_INSTRUCTIONTABLES_H
#include "llvm/ADT/SmallVector.h"
#include "llvm/MC/MCSchedule.h"
@@ -42,4 +42,4 @@ class InstructionTables final : public Stage {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_INSTRUCTIONTABLES_H
+#endif // LLVM_MCA_STAGES_INSTRUCTIONTABLES_H
diff --git a/llvm/include/llvm/MCA/Stages/MicroOpQueueStage.h b/llvm/include/llvm/MCA/Stages/MicroOpQueueStage.h
index 50a5ef87b2d2..d9e3264c5951 100644
--- a/llvm/include/llvm/MCA/Stages/MicroOpQueueStage.h
+++ b/llvm/include/llvm/MCA/Stages/MicroOpQueueStage.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_MICRO_OP_QUEUE_STAGE_H
-#define LLVM_MCA_MICRO_OP_QUEUE_STAGE_H
+#ifndef LLVM_MCA_STAGES_MICROOPQUEUESTAGE_H
+#define LLVM_MCA_STAGES_MICROOPQUEUESTAGE_H
#include "llvm/ADT/SmallVector.h"
#include "llvm/MCA/Stages/Stage.h"
@@ -85,4 +85,4 @@ class MicroOpQueueStage : public Stage {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_MICRO_OP_QUEUE_STAGE_H
+#endif // LLVM_MCA_STAGES_MICROOPQUEUESTAGE_H
diff --git a/llvm/include/llvm/MCA/Stages/RetireStage.h b/llvm/include/llvm/MCA/Stages/RetireStage.h
index f4713688d25f..6844ad4826d3 100644
--- a/llvm/include/llvm/MCA/Stages/RetireStage.h
+++ b/llvm/include/llvm/MCA/Stages/RetireStage.h
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_RETIRE_STAGE_H
-#define LLVM_MCA_RETIRE_STAGE_H
+#ifndef LLVM_MCA_STAGES_RETIRESTAGE_H
+#define LLVM_MCA_STAGES_RETIRESTAGE_H
#include "llvm/MCA/HardwareUnits/LSUnit.h"
#include "llvm/MCA/HardwareUnits/RegisterFile.h"
@@ -46,4 +46,4 @@ class RetireStage final : public Stage {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_RETIRE_STAGE_H
+#endif // LLVM_MCA_STAGES_RETIRESTAGE_H
diff --git a/llvm/include/llvm/MCA/Stages/Stage.h b/llvm/include/llvm/MCA/Stages/Stage.h
index 46b242caa6cf..84868e89ac29 100644
--- a/llvm/include/llvm/MCA/Stages/Stage.h
+++ b/llvm/include/llvm/MCA/Stages/Stage.h
@@ -12,8 +12,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_MCA_STAGE_H
-#define LLVM_MCA_STAGE_H
+#ifndef LLVM_MCA_STAGES_STAGE_H
+#define LLVM_MCA_STAGES_STAGE_H
#include "llvm/MCA/HWEventListener.h"
#include "llvm/Support/Error.h"
@@ -84,4 +84,4 @@ class Stage {
} // namespace mca
} // namespace llvm
-#endif // LLVM_MCA_STAGE_H
+#endif // LLVM_MCA_STAGES_STAGE_H
diff --git a/llvm/include/llvm/Object/COFFImportFile.h b/llvm/include/llvm/Object/COFFImportFile.h
index f38bd898a444..0da0d8fa70c9 100644
--- a/llvm/include/llvm/Object/COFFImportFile.h
+++ b/llvm/include/llvm/Object/COFFImportFile.h
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_OBJECT_COFF_IMPORT_FILE_H
-#define LLVM_OBJECT_COFF_IMPORT_FILE_H
+#ifndef LLVM_OBJECT_COFFIMPORTFILE_H
+#define LLVM_OBJECT_COFFIMPORTFILE_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/Object/COFF.h"
diff --git a/llvm/include/llvm/Object/COFFModuleDefinition.h b/llvm/include/llvm/Object/COFFModuleDefinition.h
index ab52259fea1a..fb3d0952e3a3 100644
--- a/llvm/include/llvm/Object/COFFModuleDefinition.h
+++ b/llvm/include/llvm/Object/COFFModuleDefinition.h
@@ -15,8 +15,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_OBJECT_COFF_MODULE_DEFINITION_H
-#define LLVM_OBJECT_COFF_MODULE_DEFINITION_H
+#ifndef LLVM_OBJECT_COFFMODULEDEFINITION_H
+#define LLVM_OBJECT_COFFMODULEDEFINITION_H
#include "llvm/Object/COFF.h"
#include "llvm/Object/COFFImportFile.h"
diff --git a/llvm/include/llvm/Object/RelocationResolver.h b/llvm/include/llvm/Object/RelocationResolver.h
index 46f74e90a91b..d3b604018e89 100644
--- a/llvm/include/llvm/Object/RelocationResolver.h
+++ b/llvm/include/llvm/Object/RelocationResolver.h
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_OBJECT_RELOCVISITOR_H
-#define LLVM_OBJECT_RELOCVISITOR_H
+#ifndef LLVM_OBJECT_RELOCATIONRESOLVER_H
+#define LLVM_OBJECT_RELOCATIONRESOLVER_H
#include "llvm/ADT/Triple.h"
#include "llvm/BinaryFormat/ELF.h"
@@ -45,4 +45,4 @@ uint64_t resolveRelocation(RelocationResolver Resolver, const RelocationRef &R,
} // end namespace object
} // end namespace llvm
-#endif // LLVM_OBJECT_RELOCVISITOR_H
+#endif // LLVM_OBJECT_RELOCATIONRESOLVER_H
diff --git a/llvm/include/llvm/Object/StackMapParser.h b/llvm/include/llvm/Object/StackMapParser.h
index 4ee67112ea5e..3560675af564 100644
--- a/llvm/include/llvm/Object/StackMapParser.h
+++ b/llvm/include/llvm/Object/StackMapParser.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_STACKMAPPARSER_H
-#define LLVM_CODEGEN_STACKMAPPARSER_H
+#ifndef LLVM_OBJECT_STACKMAPPARSER_H
+#define LLVM_OBJECT_STACKMAPPARSER_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/iterator_range.h"
@@ -464,4 +464,4 @@ class StackMapParser {
} // end namespace llvm
-#endif // LLVM_CODEGEN_STACKMAPPARSER_H
+#endif // LLVM_OBJECT_STACKMAPPARSER_H
diff --git a/llvm/include/llvm/Object/TapiFile.h b/llvm/include/llvm/Object/TapiFile.h
index ab99690ff2fa..8de164ac60e7 100644
--- a/llvm/include/llvm/Object/TapiFile.h
+++ b/llvm/include/llvm/Object/TapiFile.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_OBJECT_TAPI_FILE_H
-#define LLVM_OBJECT_TAPI_FILE_H
+#ifndef LLVM_OBJECT_TAPIFILE_H
+#define LLVM_OBJECT_TAPIFILE_H
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/iterator_range.h"
@@ -60,4 +60,4 @@ class TapiFile : public SymbolicFile {
} // end namespace object.
} // end namespace llvm.
-#endif // LLVM_OBJECT_TAPI_FILE_H
+#endif // LLVM_OBJECT_TAPIFILE_H
diff --git a/llvm/include/llvm/Object/TapiUniversal.h b/llvm/include/llvm/Object/TapiUniversal.h
index 0f494fcfac42..bddfd4b781cf 100644
--- a/llvm/include/llvm/Object/TapiUniversal.h
+++ b/llvm/include/llvm/Object/TapiUniversal.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_OBJECT_TAPI_UNIVERSAL_H
-#define LLVM_OBJECT_TAPI_UNIVERSAL_H
+#ifndef LLVM_OBJECT_TAPIUNIVERSAL_H
+#define LLVM_OBJECT_TAPIUNIVERSAL_H
#include "llvm/Object/Binary.h"
#include "llvm/Object/TapiFile.h"
@@ -118,4 +118,4 @@ class TapiUniversal : public Binary {
} // end namespace object.
} // end namespace llvm.
-#endif // LLVM_OBJECT_TAPI_UNIVERSAL_H
+#endif // LLVM_OBJECT_TAPIUNIVERSAL_H
diff --git a/llvm/include/llvm/Object/WindowsMachineFlag.h b/llvm/include/llvm/Object/WindowsMachineFlag.h
index acc6afc0329c..05b8f0d52d3f 100644
--- a/llvm/include/llvm/Object/WindowsMachineFlag.h
+++ b/llvm/include/llvm/Object/WindowsMachineFlag.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TOOLDRIVERS_MACHINEFLAG_MACHINEFLAG_H
-#define LLVM_TOOLDRIVERS_MACHINEFLAG_MACHINEFLAG_H
+#ifndef LLVM_OBJECT_WINDOWSMACHINEFLAG_H
+#define LLVM_OBJECT_WINDOWSMACHINEFLAG_H
namespace llvm {
diff --git a/llvm/include/llvm/Object/WindowsResource.h b/llvm/include/llvm/Object/WindowsResource.h
index 788992814ab7..b8fad299c693 100644
--- a/llvm/include/llvm/Object/WindowsResource.h
+++ b/llvm/include/llvm/Object/WindowsResource.h
@@ -25,8 +25,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef LLVM_INCLUDE_LLVM_OBJECT_RESFILE_H
-#define LLVM_INCLUDE_LLVM_OBJECT_RESFILE_H
+#ifndef LLVM_OBJECT_WINDOWSRESOURCE_H
+#define LLVM_OBJECT_WINDOWSRESOURCE_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/BinaryFormat/COFF.h"
diff --git a/llvm/include/llvm/ObjectYAML/CodeViewYAMLTypeHashing.h b/llvm/include/llvm/ObjectYAML/CodeViewYAMLTypeHashing.h
index d6cec8d310eb..25ba27c7c7a2 100644
--- a/llvm/include/llvm/ObjectYAML/CodeViewYAMLTypeHashing.h
+++ b/llvm/include/llvm/ObjectYAML/CodeViewYAMLTypeHashing.h
@@ -58,4 +58,4 @@ LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::DebugHSection)
LLVM_YAML_DECLARE_SCALAR_TRAITS(CodeViewYAML::GlobalHash, QuotingType::None)
LLVM_YAML_IS_SEQUENCE_VECTOR(CodeViewYAML::GlobalHash)
-#endif // LLVM_OBJECTYAML_CODEVIEWYAMLTYPES_H
+#endif // LLVM_OBJECTYAML_CODEVIEWYAMLTYPEHASHING_H
diff --git a/llvm/include/llvm/ObjectYAML/yaml2obj.h b/llvm/include/llvm/ObjectYAML/yaml2obj.h
index 1f693475c946..21dabb8597d4 100644
--- a/llvm/include/llvm/ObjectYAML/yaml2obj.h
+++ b/llvm/include/llvm/ObjectYAML/yaml2obj.h
@@ -8,8 +8,8 @@
/// \file
/// Common declarations for yaml2obj
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TOOLS_YAML2OBJ_YAML2OBJ_H
-#define LLVM_TOOLS_YAML2OBJ_YAML2OBJ_H
+#ifndef LLVM_OBJECTYAML_YAML2OBJ_H
+#define LLVM_OBJECTYAML_YAML2OBJ_H
#include "llvm/ADT/STLExtras.h"
#include <memory>
diff --git a/llvm/include/llvm/ProfileData/GCOV.h b/llvm/include/llvm/ProfileData/GCOV.h
index d4f0b9120577..19ea9247a99f 100644
--- a/llvm/include/llvm/ProfileData/GCOV.h
+++ b/llvm/include/llvm/ProfileData/GCOV.h
@@ -313,4 +313,4 @@ void gcovOneInput(const GCOV::Options &options, StringRef filename,
} // end namespace llvm
-#endif // LLVM_SUPPORT_GCOV_H
+#endif // LLVM_PROFILEDATA_GCOV_H
diff --git a/llvm/include/llvm/Remarks/BitstreamRemarkContainer.h b/llvm/include/llvm/Remarks/BitstreamRemarkContainer.h
index a2282fca04ab..cc4df5845b67 100644
--- a/llvm/include/llvm/Remarks/BitstreamRemarkContainer.h
+++ b/llvm/include/llvm/Remarks/BitstreamRemarkContainer.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_REMARKS_REMARK_CONTAINER_H
-#define LLVM_REMARKS_REMARK_CONTAINER_H
+#ifndef LLVM_REMARKS_BITSTREAMREMARKCONTAINER_H
+#define LLVM_REMARKS_BITSTREAMREMARKCONTAINER_H
#include "llvm/ADT/StringRef.h"
#include "llvm/Bitstream/BitCodes.h"
@@ -103,4 +103,4 @@ constexpr StringRef RemarkArgWithoutDebugLocName = StringRef("Argument", 8);
} // end namespace remarks
} // end namespace llvm
-#endif /* LLVM_REMARKS_REMARK_CONTAINER_H */
+#endif // LLVM_REMARKS_BITSTREAMREMARKCONTAINER_H
diff --git a/llvm/include/llvm/Remarks/BitstreamRemarkParser.h b/llvm/include/llvm/Remarks/BitstreamRemarkParser.h
index f7553ba53958..6df82c59381b 100644
--- a/llvm/include/llvm/Remarks/BitstreamRemarkParser.h
+++ b/llvm/include/llvm/Remarks/BitstreamRemarkParser.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_REMARKS_BITSTREAM_REMARK_PARSER_H
-#define LLVM_REMARKS_BITSTREAM_REMARK_PARSER_H
+#ifndef LLVM_REMARKS_BITSTREAMREMARKPARSER_H
+#define LLVM_REMARKS_BITSTREAMREMARKPARSER_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
@@ -113,4 +113,4 @@ struct BitstreamParserHelper {
} // end namespace remarks
} // end namespace llvm
-#endif /* LLVM_REMARKS_BITSTREAM_REMARK_PARSER_H */
+#endif // LLVM_REMARKS_BITSTREAMREMARKPARSER_H
diff --git a/llvm/include/llvm/Remarks/BitstreamRemarkSerializer.h b/llvm/include/llvm/Remarks/BitstreamRemarkSerializer.h
index 62a175a1db0b..645a8b3c0b17 100644
--- a/llvm/include/llvm/Remarks/BitstreamRemarkSerializer.h
+++ b/llvm/include/llvm/Remarks/BitstreamRemarkSerializer.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_REMARKS_BITSTREAM_REMARK_SERIALIZER_H
-#define LLVM_REMARKS_BITSTREAM_REMARK_SERIALIZER_H
+#ifndef LLVM_REMARKS_BITSTREAMREMARKSERIALIZER_H
+#define LLVM_REMARKS_BITSTREAMREMARKSERIALIZER_H
#include "llvm/Bitstream/BitstreamWriter.h"
#include "llvm/Remarks/BitstreamRemarkContainer.h"
@@ -193,4 +193,4 @@ struct BitstreamMetaSerializer : public MetaSerializer {
} // end namespace remarks
} // end namespace llvm
-#endif /* LLVM_REMARKS_BITSTREAM_REMARK_SERIALIZER_H */
+#endif // LLVM_REMARKS_BITSTREAMREMARKSERIALIZER_H
diff --git a/llvm/include/llvm/Remarks/RemarkFormat.h b/llvm/include/llvm/Remarks/RemarkFormat.h
index a432c5adf59e..9c589eed44f3 100644
--- a/llvm/include/llvm/Remarks/RemarkFormat.h
+++ b/llvm/include/llvm/Remarks/RemarkFormat.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_REMARKS_REMARK_FORMAT_H
-#define LLVM_REMARKS_REMARK_FORMAT_H
+#ifndef LLVM_REMARKS_REMARKFORMAT_H
+#define LLVM_REMARKS_REMARKFORMAT_H
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Error.h"
@@ -33,4 +33,4 @@ Expected<Format> magicToFormat(StringRef Magic);
} // end namespace remarks
} // end namespace llvm
-#endif /* LLVM_REMARKS_REMARK_FORMAT_H */
+#endif // LLVM_REMARKS_REMARKFORMAT_H
diff --git a/llvm/include/llvm/Remarks/RemarkLinker.h b/llvm/include/llvm/Remarks/RemarkLinker.h
index 7a53c30924b8..49fd880be8ba 100644
--- a/llvm/include/llvm/Remarks/RemarkLinker.h
+++ b/llvm/include/llvm/Remarks/RemarkLinker.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_REMARKS_REMARK_LINKER_H
-#define LLVM_REMARKS_REMARK_LINKER_H
+#ifndef LLVM_REMARKS_REMARKLINKER_H
+#define LLVM_REMARKS_REMARKLINKER_H
#include "llvm/Object/ObjectFile.h"
#include "llvm/Remarks/Remark.h"
@@ -96,4 +96,4 @@ getRemarksSectionContents(const object::ObjectFile &Obj);
} // end namespace remarks
} // end namespace llvm
-#endif /* LLVM_REMARKS_REMARK_LINKER_H */
+#endif // LLVM_REMARKS_REMARKLINKER_H
diff --git a/llvm/include/llvm/Remarks/RemarkParser.h b/llvm/include/llvm/Remarks/RemarkParser.h
index d6b1fddb06ff..b838f75e530f 100644
--- a/llvm/include/llvm/Remarks/RemarkParser.h
+++ b/llvm/include/llvm/Remarks/RemarkParser.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_REMARKS_REMARK_PARSER_H
-#define LLVM_REMARKS_REMARK_PARSER_H
+#ifndef LLVM_REMARKS_REMARKPARSER_H
+#define LLVM_REMARKS_REMARKPARSER_H
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
@@ -90,4 +90,4 @@ createRemarkParserFromMeta(Format ParserFormat, StringRef Buf,
} // end namespace remarks
} // end namespace llvm
-#endif /* LLVM_REMARKS_REMARK_PARSER_H */
+#endif // LLVM_REMARKS_REMARKPARSER_H
diff --git a/llvm/include/llvm/Remarks/RemarkSerializer.h b/llvm/include/llvm/Remarks/RemarkSerializer.h
index 35752cd5f6fb..97fd224ea082 100644
--- a/llvm/include/llvm/Remarks/RemarkSerializer.h
+++ b/llvm/include/llvm/Remarks/RemarkSerializer.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_REMARKS_REMARK_SERIALIZER_H
-#define LLVM_REMARKS_REMARK_SERIALIZER_H
+#ifndef LLVM_REMARKS_REMARKSERIALIZER_H
+#define LLVM_REMARKS_REMARKSERIALIZER_H
#include "llvm/Remarks/Remark.h"
#include "llvm/Remarks/RemarkFormat.h"
@@ -85,4 +85,4 @@ createRemarkSerializer(Format RemarksFormat, SerializerMode Mode,
} // end namespace remarks
} // end namespace llvm
-#endif /* LLVM_REMARKS_REMARK_SERIALIZER_H */
+#endif // LLVM_REMARKS_REMARKSERIALIZER_H
diff --git a/llvm/include/llvm/Remarks/RemarkStringTable.h b/llvm/include/llvm/Remarks/RemarkStringTable.h
index 60cf601e05aa..fe302c64d17f 100644
--- a/llvm/include/llvm/Remarks/RemarkStringTable.h
+++ b/llvm/include/llvm/Remarks/RemarkStringTable.h
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_REMARKS_REMARK_STRING_TABLE_H
-#define LLVM_REMARKS_REMARK_STRING_TABLE_H
+#ifndef LLVM_REMARKS_REMARKSTRINGTABLE_H
+#define LLVM_REMARKS_REMARKSTRINGTABLE_H
#include "llvm/ADT/StringMap.h"
#include "llvm/Support/Allocator.h"
@@ -71,4 +71,4 @@ struct StringTable {
} // end namespace remarks
} // end namespace llvm
-#endif /* LLVM_REMARKS_REMARK_STRING_TABLE_H */
+#endif // LLVM_REMARKS_REMARKSTRINGTABLE_H
diff --git a/llvm/include/llvm/Remarks/YAMLRemarkSerializer.h b/llvm/include/llvm/Remarks/YAMLRemarkSerializer.h
index f1213beab15d..4dfe1841b51d 100644
--- a/llvm/include/llvm/Remarks/YAMLRemarkSerializer.h
+++ b/llvm/include/llvm/Remarks/YAMLRemarkSerializer.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_REMARKS_YAML_REMARK_SERIALIZER_H
-#define LLVM_REMARKS_YAML_REMARK_SERIALIZER_H
+#ifndef LLVM_REMARKS_YAMLREMARKSERIALIZER_H
+#define LLVM_REMARKS_YAMLREMARKSERIALIZER_H
#include "llvm/Remarks/RemarkSerializer.h"
#include "llvm/Support/YAMLTraits.h"
@@ -105,4 +105,4 @@ struct YAMLStrTabMetaSerializer : public YAMLMetaSerializer {
} // end namespace remarks
} // end namespace llvm
-#endif /* LLVM_REMARKS_REMARK_SERIALIZER_H */
+#endif // LLVM_REMARKS_YAMLREMARKSERIALIZER_H
diff --git a/llvm/include/llvm/Support/AArch64TargetParser.h b/llvm/include/llvm/Support/AArch64TargetParser.h
index 7c9e245e3889..5772c03b0956 100644
--- a/llvm/include/llvm/Support/AArch64TargetParser.h
+++ b/llvm/include/llvm/Support/AArch64TargetParser.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_AARCH64TARGETPARSERCOMMON_H
-#define LLVM_SUPPORT_AARCH64TARGETPARSERCOMMON_H
+#ifndef LLVM_SUPPORT_AARCH64TARGETPARSER_H
+#define LLVM_SUPPORT_AARCH64TARGETPARSER_H
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
diff --git a/llvm/include/llvm/Support/BinaryByteStream.h b/llvm/include/llvm/Support/BinaryByteStream.h
index 7acce9a03888..ca5bb5abecfc 100644
--- a/llvm/include/llvm/Support/BinaryByteStream.h
+++ b/llvm/include/llvm/Support/BinaryByteStream.h
@@ -270,4 +270,4 @@ class FileBufferByteStream : public WritableBinaryStream {
} // end namespace llvm
-#endif // LLVM_SUPPORT_BYTESTREAM_H
+#endif // LLVM_SUPPORT_BINARYBYTESTREAM_H
diff --git a/llvm/include/llvm/Support/CachePruning.h b/llvm/include/llvm/Support/CachePruning.h
index 10d6372f9163..6351b5c85937 100644
--- a/llvm/include/llvm/Support/CachePruning.h
+++ b/llvm/include/llvm/Support/CachePruning.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_CACHE_PRUNING_H
-#define LLVM_SUPPORT_CACHE_PRUNING_H
+#ifndef LLVM_SUPPORT_CACHEPRUNING_H
+#define LLVM_SUPPORT_CACHEPRUNING_H
#include "llvm/ADT/Optional.h"
#include <chrono>
diff --git a/llvm/include/llvm/Support/CodeGenCoverage.h b/llvm/include/llvm/Support/CodeGenCoverage.h
index 0b1af779ffb0..a5b1796ca422 100644
--- a/llvm/include/llvm/Support/CodeGenCoverage.h
+++ b/llvm/include/llvm/Support/CodeGenCoverage.h
@@ -36,4 +36,4 @@ class CodeGenCoverage {
};
} // namespace llvm
-#endif // ifndef LLVM_SUPPORT_CODEGENCOVERAGE_H
+#endif // LLVM_SUPPORT_CODEGENCOVERAGE_H
diff --git a/llvm/include/llvm/Support/Errno.h b/llvm/include/llvm/Support/Errno.h
index dc3b3322ed98..07df6765d9db 100644
--- a/llvm/include/llvm/Support/Errno.h
+++ b/llvm/include/llvm/Support/Errno.h
@@ -43,4 +43,4 @@ inline decltype(auto) RetryAfterSignal(const FailT &Fail, const Fun &F,
} // namespace sys
} // namespace llvm
-#endif // LLVM_SYSTEM_ERRNO_H
+#endif // LLVM_SUPPORT_ERRNO_H
diff --git a/llvm/include/llvm/Support/FileCollector.h b/llvm/include/llvm/Support/FileCollector.h
index 8ea344a347d3..264fb55c9dba 100644
--- a/llvm/include/llvm/Support/FileCollector.h
+++ b/llvm/include/llvm/Support/FileCollector.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_FILE_COLLECTOR_H
-#define LLVM_SUPPORT_FILE_COLLECTOR_H
+#ifndef LLVM_SUPPORT_FILECOLLECTOR_H
+#define LLVM_SUPPORT_FILECOLLECTOR_H
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringMap.h"
@@ -144,4 +144,4 @@ class FileCollector : public FileCollectorBase {
} // end namespace llvm
-#endif // LLVM_SUPPORT_FILE_COLLECTOR_H
+#endif // LLVM_SUPPORT_FILECOLLECTOR_H
diff --git a/llvm/include/llvm/Support/FormatVariadicDetails.h b/llvm/include/llvm/Support/FormatVariadicDetails.h
index d5e67b756a47..1a5eb3f3b4ae 100644
--- a/llvm/include/llvm/Support/FormatVariadicDetails.h
+++ b/llvm/include/llvm/Support/FormatVariadicDetails.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_FORMATVARIADIC_DETAILS_H
-#define LLVM_SUPPORT_FORMATVARIADIC_DETAILS_H
+#ifndef LLVM_SUPPORT_FORMATVARIADICDETAILS_H
+#define LLVM_SUPPORT_FORMATVARIADICDETAILS_H
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/llvm/include/llvm/Support/GenericIteratedDominanceFrontier.h b/llvm/include/llvm/Support/GenericIteratedDominanceFrontier.h
index a8fca70159f5..3bafeb48f64a 100644
--- a/llvm/include/llvm/Support/GenericIteratedDominanceFrontier.h
+++ b/llvm/include/llvm/Support/GenericIteratedDominanceFrontier.h
@@ -20,8 +20,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_GENERIC_IDF_H
-#define LLVM_SUPPORT_GENERIC_IDF_H
+#ifndef LLVM_SUPPORT_GENERICITERATEDDOMINANCEFRONTIER_H
+#define LLVM_SUPPORT_GENERICITERATEDDOMINANCEFRONTIER_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallPtrSet.h"
diff --git a/llvm/include/llvm/Support/GlobPattern.h b/llvm/include/llvm/Support/GlobPattern.h
index b79de6f41c49..96e2a15ae20f 100644
--- a/llvm/include/llvm/Support/GlobPattern.h
+++ b/llvm/include/llvm/Support/GlobPattern.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_GLOB_PATTERN_H
-#define LLVM_SUPPORT_GLOB_PATTERN_H
+#ifndef LLVM_SUPPORT_GLOBPATTERN_H
+#define LLVM_SUPPORT_GLOBPATTERN_H
#include "llvm/ADT/BitVector.h"
#include "llvm/ADT/Optional.h"
@@ -54,4 +54,4 @@ class GlobPattern {
};
}
-#endif // LLVM_SUPPORT_GLOB_PATTERN_H
+#endif // LLVM_SUPPORT_GLOBPATTERN_H
diff --git a/llvm/include/llvm/Support/InitLLVM.h b/llvm/include/llvm/Support/InitLLVM.h
index 879dc1514d10..c82d0dcbc62b 100644
--- a/llvm/include/llvm/Support/InitLLVM.h
+++ b/llvm/include/llvm/Support/InitLLVM.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_LLVM_H
-#define LLVM_SUPPORT_LLVM_H
+#ifndef LLVM_SUPPORT_INITLLVM_H
+#define LLVM_SUPPORT_INITLLVM_H
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/SmallVector.h"
diff --git a/llvm/include/llvm/Support/LEB128.h b/llvm/include/llvm/Support/LEB128.h
index da43035a47d9..9c419c82a19e 100644
--- a/llvm/include/llvm/Support/LEB128.h
+++ b/llvm/include/llvm/Support/LEB128.h
@@ -205,4 +205,4 @@ extern unsigned getSLEB128Size(int64_t Value);
} // namespace llvm
-#endif // LLVM_SYSTEM_LEB128_H
+#endif // LLVM_SUPPORT_LEB128_H
diff --git a/llvm/include/llvm/Support/MachineValueType.h b/llvm/include/llvm/Support/MachineValueType.h
index 1c600d0108b6..d4834683e3f6 100644
--- a/llvm/include/llvm/Support/MachineValueType.h
+++ b/llvm/include/llvm/Support/MachineValueType.h
@@ -1398,4 +1398,4 @@ namespace llvm {
} // end namespace llvm
-#endif // LLVM_CODEGEN_MACHINEVALUETYPE_H
+#endif // LLVM_SUPPORT_MACHINEVALUETYPE_H
diff --git a/llvm/include/llvm/Support/NativeFormatting.h b/llvm/include/llvm/Support/NativeFormatting.h
index e664d05f24db..80cb554ca2f3 100644
--- a/llvm/include/llvm/Support/NativeFormatting.h
+++ b/llvm/include/llvm/Support/NativeFormatting.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_NATIVE_FORMATTING_H
-#define LLVM_SUPPORT_NATIVE_FORMATTING_H
+#ifndef LLVM_SUPPORT_NATIVEFORMATTING_H
+#define LLVM_SUPPORT_NATIVEFORMATTING_H
#include "llvm/ADT/Optional.h"
#include <cstdint>
diff --git a/llvm/include/llvm/Support/Signposts.h b/llvm/include/llvm/Support/Signposts.h
index 8036b1f53663..984bad265d68 100644
--- a/llvm/include/llvm/Support/Signposts.h
+++ b/llvm/include/llvm/Support/Signposts.h
@@ -41,4 +41,4 @@ class SignpostEmitter {
} // end namespace llvm
-#endif // ifndef LLVM_SUPPORT_SIGNPOSTS_H
+#endif // LLVM_SUPPORT_SIGNPOSTS_H
diff --git a/llvm/include/llvm/Support/SmallVectorMemoryBuffer.h b/llvm/include/llvm/Support/SmallVectorMemoryBuffer.h
index 62900b740b81..9aa4e9aec266 100644
--- a/llvm/include/llvm/Support/SmallVectorMemoryBuffer.h
+++ b/llvm/include/llvm/Support/SmallVectorMemoryBuffer.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_EXECUTIONENGINE_OBJECTMEMORYBUFFER_H
-#define LLVM_EXECUTIONENGINE_OBJECTMEMORYBUFFER_H
+#ifndef LLVM_SUPPORT_SMALLVECTORMEMORYBUFFER_H
+#define LLVM_SUPPORT_SMALLVECTORMEMORYBUFFER_H
#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/MemoryBuffer.h"
diff --git a/llvm/include/llvm/Support/TarWriter.h b/llvm/include/llvm/Support/TarWriter.h
index 71164e2ef961..48d810ac65e3 100644
--- a/llvm/include/llvm/Support/TarWriter.h
+++ b/llvm/include/llvm/Support/TarWriter.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_TAR_WRITER_H
-#define LLVM_SUPPORT_TAR_WRITER_H
+#ifndef LLVM_SUPPORT_TARWRITER_H
+#define LLVM_SUPPORT_TARWRITER_H
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSet.h"
diff --git a/llvm/include/llvm/Support/TaskQueue.h b/llvm/include/llvm/Support/TaskQueue.h
index 6901a550b62f..d89ce2b42d21 100644
--- a/llvm/include/llvm/Support/TaskQueue.h
+++ b/llvm/include/llvm/Support/TaskQueue.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_TASK_QUEUE_H
-#define LLVM_SUPPORT_TASK_QUEUE_H
+#ifndef LLVM_SUPPORT_TASKQUEUE_H
+#define LLVM_SUPPORT_TASKQUEUE_H
#include "llvm/Config/llvm-config.h"
#include "llvm/Support/ThreadPool.h"
@@ -135,4 +135,4 @@ class TaskQueue {
};
} // namespace llvm
-#endif // LLVM_SUPPORT_TASK_QUEUE_H
+#endif // LLVM_SUPPORT_TASKQUEUE_H
diff --git a/llvm/include/llvm/Support/ThreadPool.h b/llvm/include/llvm/Support/ThreadPool.h
index 528fb32525eb..9d319eb71bbe 100644
--- a/llvm/include/llvm/Support/ThreadPool.h
+++ b/llvm/include/llvm/Support/ThreadPool.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_THREAD_POOL_H
-#define LLVM_SUPPORT_THREAD_POOL_H
+#ifndef LLVM_SUPPORT_THREADPOOL_H
+#define LLVM_SUPPORT_THREADPOOL_H
#include "llvm/Config/llvm-config.h"
#include "llvm/Support/Threading.h"
@@ -102,4 +102,4 @@ class ThreadPool {
};
}
-#endif // LLVM_SUPPORT_THREAD_POOL_H
+#endif // LLVM_SUPPORT_THREADPOOL_H
diff --git a/llvm/include/llvm/Support/TimeProfiler.h b/llvm/include/llvm/Support/TimeProfiler.h
index b6f8a647e3ee..84794a25f78e 100644
--- a/llvm/include/llvm/Support/TimeProfiler.h
+++ b/llvm/include/llvm/Support/TimeProfiler.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_TIME_PROFILER_H
-#define LLVM_SUPPORT_TIME_PROFILER_H
+#ifndef LLVM_SUPPORT_TIMEPROFILER_H
+#define LLVM_SUPPORT_TIMEPROFILER_H
#include "llvm/Support/Error.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/llvm/include/llvm/Support/TypeSize.h b/llvm/include/llvm/Support/TypeSize.h
index 4085e06d2584..6d824a439ded 100644
--- a/llvm/include/llvm/Support/TypeSize.h
+++ b/llvm/include/llvm/Support/TypeSize.h
@@ -528,4 +528,4 @@ template <> struct DenseMapInfo<ElementCount> {
} // end namespace llvm
-#endif // LLVM_SUPPORT_TypeSize_H
+#endif // LLVM_SUPPORT_TYPESIZE_H
diff --git a/llvm/include/llvm/Support/WithColor.h b/llvm/include/llvm/Support/WithColor.h
index eea4a7229339..1908c6eb8ea3 100644
--- a/llvm/include/llvm/Support/WithColor.h
+++ b/llvm/include/llvm/Support/WithColor.h
@@ -136,4 +136,4 @@ class WithColor {
} // end namespace llvm
-#endif // LLVM_LIB_DEBUGINFO_WITHCOLOR_H
+#endif // LLVM_SUPPORT_WITHCOLOR_H
diff --git a/llvm/include/llvm/Support/X86DisassemblerDecoderCommon.h b/llvm/include/llvm/Support/X86DisassemblerDecoderCommon.h
index 5697ff9a01dc..db8206cf2e3d 100644
--- a/llvm/include/llvm/Support/X86DisassemblerDecoderCommon.h
+++ b/llvm/include/llvm/Support/X86DisassemblerDecoderCommon.h
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_TARGET_X86_DISASSEMBLER_X86DISASSEMBLERDECODERCOMMON_H
-#define LLVM_LIB_TARGET_X86_DISASSEMBLER_X86DISASSEMBLERDECODERCOMMON_H
+#ifndef LLVM_SUPPORT_X86DISASSEMBLERDECODERCOMMON_H
+#define LLVM_SUPPORT_X86DISASSEMBLERDECODERCOMMON_H
#include "llvm/Support/DataTypes.h"
diff --git a/llvm/include/llvm/Support/X86TargetParser.h b/llvm/include/llvm/Support/X86TargetParser.h
index 2d5083023a11..75f07092e7b2 100644
--- a/llvm/include/llvm/Support/X86TargetParser.h
+++ b/llvm/include/llvm/Support/X86TargetParser.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_X86TARGETPARSERCOMMON_H
-#define LLVM_SUPPORT_X86TARGETPARSERCOMMON_H
+#ifndef LLVM_SUPPORT_X86TARGETPARSER_H
+#define LLVM_SUPPORT_X86TARGETPARSER_H
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringMap.h"
diff --git a/llvm/include/llvm/Target/CGPassBuilderOption.h b/llvm/include/llvm/Target/CGPassBuilderOption.h
index c3a221e01ceb..09001d704f92 100644
--- a/llvm/include/llvm/Target/CGPassBuilderOption.h
+++ b/llvm/include/llvm/Target/CGPassBuilderOption.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_PASSBUILDER_OPTION_H
-#define LLVM_CODEGEN_PASSBUILDER_OPTION_H
+#ifndef LLVM_TARGET_CGPASSBUILDEROPTION_H
+#define LLVM_TARGET_CGPASSBUILDEROPTION_H
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/StringRef.h"
@@ -62,4 +62,4 @@ CGPassBuilderOption getCGPassBuilderOption();
} // namespace llvm
-#endif // LLVM_CODEGEN_PASSBUILDER_OPTION_H
+#endif // LLVM_TARGET_CGPASSBUILDEROPTION_H
diff --git a/llvm/include/llvm/Target/TargetLoweringObjectFile.h b/llvm/include/llvm/Target/TargetLoweringObjectFile.h
index ff27ceaeac35..cad43f5a9e46 100644
--- a/llvm/include/llvm/Target/TargetLoweringObjectFile.h
+++ b/llvm/include/llvm/Target/TargetLoweringObjectFile.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CODEGEN_TARGETLOWERINGOBJECTFILE_H
-#define LLVM_CODEGEN_TARGETLOWERINGOBJECTFILE_H
+#ifndef LLVM_TARGET_TARGETLOWERINGOBJECTFILE_H
+#define LLVM_TARGET_TARGETLOWERINGOBJECTFILE_H
#include "llvm/MC/MCObjectFileInfo.h"
#include <cstdint>
@@ -278,4 +278,4 @@ class TargetLoweringObjectFile : public MCObjectFileInfo {
} // end namespace llvm
-#endif // LLVM_CODEGEN_TARGETLOWERINGOBJECTFILE_H
+#endif // LLVM_TARGET_TARGETLOWERINGOBJECTFILE_H
diff --git a/llvm/include/llvm/TextAPI/MachO/ArchitectureSet.h b/llvm/include/llvm/TextAPI/MachO/ArchitectureSet.h
index c48a4a702363..74e091ade9c2 100644
--- a/llvm/include/llvm/TextAPI/MachO/ArchitectureSet.h
+++ b/llvm/include/llvm/TextAPI/MachO/ArchitectureSet.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TEXTAPI_MACHO_ARCHITECTURE_SET_H
-#define LLVM_TEXTAPI_MACHO_ARCHITECTURE_SET_H
+#ifndef LLVM_TEXTAPI_MACHO_ARCHITECTURESET_H
+#define LLVM_TEXTAPI_MACHO_ARCHITECTURESET_H
#include "llvm/TextAPI/MachO/Architecture.h"
#include <cstddef>
@@ -163,4 +163,4 @@ raw_ostream &operator<<(raw_ostream &OS, ArchitectureSet Set);
} // end namespace MachO.
} // end namespace llvm.
-#endif // LLVM_TEXTAPI_MACHO_ARCHITECTURE_SET_H
+#endif // LLVM_TEXTAPI_MACHO_ARCHITECTURESET_H
diff --git a/llvm/include/llvm/TextAPI/MachO/InterfaceFile.h b/llvm/include/llvm/TextAPI/MachO/InterfaceFile.h
index 09d2b8c3cdf0..e49c5e5b9ebb 100644
--- a/llvm/include/llvm/TextAPI/MachO/InterfaceFile.h
+++ b/llvm/include/llvm/TextAPI/MachO/InterfaceFile.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TEXTAPI_MACHO_INTERFACE_FILE_H
-#define LLVM_TEXTAPI_MACHO_INTERFACE_FILE_H
+#ifndef LLVM_TEXTAPI_MACHO_INTERFACEFILE_H
+#define LLVM_TEXTAPI_MACHO_INTERFACEFILE_H
#include "llvm/ADT/BitmaskEnum.h"
#include "llvm/ADT/DenseMap.h"
@@ -430,4 +430,4 @@ class InterfaceFile {
} // end namespace MachO.
} // end namespace llvm.
-#endif // LLVM_TEXTAPI_MACHO_INTERFACE_FILE_H
+#endif // LLVM_TEXTAPI_MACHO_INTERFACEFILE_H
diff --git a/llvm/include/llvm/TextAPI/MachO/PackedVersion.h b/llvm/include/llvm/TextAPI/MachO/PackedVersion.h
index 0d9158ae5f0d..b98a3b1c8b5f 100644
--- a/llvm/include/llvm/TextAPI/MachO/PackedVersion.h
+++ b/llvm/include/llvm/TextAPI/MachO/PackedVersion.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TEXTAPI_MACHO_PACKED_VERSION_H
-#define LLVM_TEXTAPI_MACHO_PACKED_VERSION_H
+#ifndef LLVM_TEXTAPI_MACHO_PACKEDVERSION_H
+#define LLVM_TEXTAPI_MACHO_PACKEDVERSION_H
#include <cstdint>
#include <utility>
@@ -64,4 +64,4 @@ inline raw_ostream &operator<<(raw_ostream &OS, const PackedVersion &Version) {
} // end namespace MachO.
} // end namespace llvm.
-#endif // LLVM_TEXTAPI_MACHO_PACKED_VERSION_H
+#endif // LLVM_TEXTAPI_MACHO_PACKEDVERSION_H
diff --git a/llvm/include/llvm/TextAPI/MachO/TextAPIReader.h b/llvm/include/llvm/TextAPI/MachO/TextAPIReader.h
index 889b8aad0e9a..a403bab8465d 100644
--- a/llvm/include/llvm/TextAPI/MachO/TextAPIReader.h
+++ b/llvm/include/llvm/TextAPI/MachO/TextAPIReader.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TEXTAPI_MACHO_READER_H
-#define LLVM_TEXTAPI_MACHO_READER_H
+#ifndef LLVM_TEXTAPI_MACHO_TEXTAPIREADER_H
+#define LLVM_TEXTAPI_MACHO_TEXTAPIREADER_H
#include "llvm/Support/Error.h"
@@ -30,4 +30,4 @@ class TextAPIReader {
} // end namespace MachO.
} // end namespace llvm.
-#endif // LLVM_TEXTAPI_MACHO_READER_H
+#endif // LLVM_TEXTAPI_MACHO_TEXTAPIREADER_H
diff --git a/llvm/include/llvm/TextAPI/MachO/TextAPIWriter.h b/llvm/include/llvm/TextAPI/MachO/TextAPIWriter.h
index 109ac8e3c371..763805168ae6 100644
--- a/llvm/include/llvm/TextAPI/MachO/TextAPIWriter.h
+++ b/llvm/include/llvm/TextAPI/MachO/TextAPIWriter.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TEXTAPI_MACHO_WRITER_H
-#define LLVM_TEXTAPI_MACHO_WRITER_H
+#ifndef LLVM_TEXTAPI_MACHO_TEXTAPIWRITER_H
+#define LLVM_TEXTAPI_MACHO_TEXTAPIWRITER_H
namespace llvm {
@@ -28,4 +28,4 @@ class TextAPIWriter {
} // end namespace MachO.
} // end namespace llvm.
-#endif // LLVM_TEXTAPI_MACHO_WRITER_H
+#endif // LLVM_TEXTAPI_MACHO_TEXTAPIWRITER_H
diff --git a/llvm/include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h b/llvm/include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
index e5e24e0b6311..03ead4bc0714 100644
--- a/llvm/include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
+++ b/llvm/include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
@@ -14,8 +14,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_AGGRESSIVE_INSTCOMBINE_INSTCOMBINE_H
-#define LLVM_TRANSFORMS_AGGRESSIVE_INSTCOMBINE_INSTCOMBINE_H
+#ifndef LLVM_TRANSFORMS_AGGRESSIVEINSTCOMBINE_AGGRESSIVEINSTCOMBINE_H
+#define LLVM_TRANSFORMS_AGGRESSIVEINSTCOMBINE_AGGRESSIVEINSTCOMBINE_H
#include "llvm/IR/PassManager.h"
diff --git a/llvm/include/llvm/Transforms/IPO/Annotation2Metadata.h b/llvm/include/llvm/Transforms/IPO/Annotation2Metadata.h
index cf7137b088c5..dee2759d854f 100644
--- a/llvm/include/llvm/Transforms/IPO/Annotation2Metadata.h
+++ b/llvm/include/llvm/Transforms/IPO/Annotation2Metadata.h
@@ -27,4 +27,4 @@ struct Annotation2MetadataPass : public PassInfoMixin<Annotation2MetadataPass> {
} // end namespace llvm
-#endif // LLVM_TRANSFORMS_IPO_SCCP_H
+#endif // LLVM_TRANSFORMS_IPO_ANNOTATION2METADATA_H
diff --git a/llvm/include/llvm/Transforms/IPO/Attributor.h b/llvm/include/llvm/Transforms/IPO/Attributor.h
index dbaf945986e4..8a5507bc36fd 100644
--- a/llvm/include/llvm/Transforms/IPO/Attributor.h
+++ b/llvm/include/llvm/Transforms/IPO/Attributor.h
@@ -3794,4 +3794,4 @@ enum AttributorRunOption {
} // end namespace llvm
-#endif // LLVM_TRANSFORMS_IPO_FUNCTIONATTRS_H
+#endif // LLVM_TRANSFORMS_IPO_ATTRIBUTOR_H
diff --git a/llvm/include/llvm/Transforms/IPO/OpenMPOpt.h b/llvm/include/llvm/Transforms/IPO/OpenMPOpt.h
index 9b72ee0afd28..9d0ef747883c 100644
--- a/llvm/include/llvm/Transforms/IPO/OpenMPOpt.h
+++ b/llvm/include/llvm/Transforms/IPO/OpenMPOpt.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_IPO_OPENMP_OPT_H
-#define LLVM_TRANSFORMS_IPO_OPENMP_OPT_H
+#ifndef LLVM_TRANSFORMS_IPO_OPENMPOPT_H
+#define LLVM_TRANSFORMS_IPO_OPENMPOPT_H
#include "llvm/Analysis/CGSCCPassManager.h"
#include "llvm/Analysis/LazyCallGraph.h"
@@ -73,4 +73,4 @@ class OpenMPOptPass : public PassInfoMixin<OpenMPOptPass> {
} // end namespace llvm
-#endif // LLVM_TRANSFORMS_IPO_OPENMP_OPT_H
+#endif // LLVM_TRANSFORMS_IPO_OPENMPOPT_H
diff --git a/llvm/include/llvm/Transforms/IPO/SampleProfile.h b/llvm/include/llvm/Transforms/IPO/SampleProfile.h
index 3d929b974044..2b05aaf320cf 100644
--- a/llvm/include/llvm/Transforms/IPO/SampleProfile.h
+++ b/llvm/include/llvm/Transforms/IPO/SampleProfile.h
@@ -40,4 +40,4 @@ class SampleProfileLoaderPass : public PassInfoMixin<SampleProfileLoaderPass> {
} // end namespace llvm
-#endif // LLVM_TRANSFORMS_SAMPLEPROFILE_H
+#endif // LLVM_TRANSFORMS_IPO_SAMPLEPROFILE_H
diff --git a/llvm/include/llvm/Transforms/IPO/SyntheticCountsPropagation.h b/llvm/include/llvm/Transforms/IPO/SyntheticCountsPropagation.h
index 0637d629bd29..5338ac9b0ebc 100644
--- a/llvm/include/llvm/Transforms/IPO/SyntheticCountsPropagation.h
+++ b/llvm/include/llvm/Transforms/IPO/SyntheticCountsPropagation.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_IPO_SYNTHETIC_COUNTS_PROPAGATION_H
-#define LLVM_TRANSFORMS_IPO_SYNTHETIC_COUNTS_PROPAGATION_H
+#ifndef LLVM_TRANSFORMS_IPO_SYNTHETICCOUNTSPROPAGATION_H
+#define LLVM_TRANSFORMS_IPO_SYNTHETICCOUNTSPROPAGATION_H
#include "llvm/IR/PassManager.h"
diff --git a/llvm/include/llvm/Transforms/Instrumentation/AddressSanitizer.h b/llvm/include/llvm/Transforms/Instrumentation/AddressSanitizer.h
index 53ad0cbf9968..e2ea36095d14 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/AddressSanitizer.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/AddressSanitizer.h
@@ -11,8 +11,8 @@
// AddressSanitizer pass to use the new PassManager infrastructure.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_INSTRUMENTATION_ADDRESSSANITIZERPASS_H
-#define LLVM_TRANSFORMS_INSTRUMENTATION_ADDRESSSANITIZERPASS_H
+#ifndef LLVM_TRANSFORMS_INSTRUMENTATION_ADDRESSSANITIZER_H
+#define LLVM_TRANSFORMS_INSTRUMENTATION_ADDRESSSANITIZER_H
#include "llvm/IR/Function.h"
#include "llvm/IR/Module.h"
diff --git a/llvm/include/llvm/Transforms/Instrumentation/CGProfile.h b/llvm/include/llvm/Transforms/Instrumentation/CGProfile.h
index 4cb45fd42f80..c56e4c78cad5 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/CGProfile.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/CGProfile.h
@@ -9,8 +9,8 @@
/// This file provides the interface for LLVM's Call Graph Profile pass.
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_CGPROFILE_H
-#define LLVM_TRANSFORMS_CGPROFILE_H
+#ifndef LLVM_TRANSFORMS_INSTRUMENTATION_CGPROFILE_H
+#define LLVM_TRANSFORMS_INSTRUMENTATION_CGPROFILE_H
#include "llvm/ADT/MapVector.h"
#include "llvm/IR/PassManager.h"
@@ -22,4 +22,4 @@ class CGProfilePass : public PassInfoMixin<CGProfilePass> {
};
} // end namespace llvm
-#endif // LLVM_TRANSFORMS_CGPROFILE_H
+#endif // LLVM_TRANSFORMS_INSTRUMENTATION_CGPROFILE_H
diff --git a/llvm/include/llvm/Transforms/Instrumentation/GCOVProfiler.h b/llvm/include/llvm/Transforms/Instrumentation/GCOVProfiler.h
index 2766cc5e6263..e5b4520f36a2 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/GCOVProfiler.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/GCOVProfiler.h
@@ -9,8 +9,8 @@
/// This file provides the interface for the GCOV style profiler pass.
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_GCOVPROFILER_H
-#define LLVM_TRANSFORMS_GCOVPROFILER_H
+#ifndef LLVM_TRANSFORMS_INSTRUMENTATION_GCOVPROFILER_H
+#define LLVM_TRANSFORMS_INSTRUMENTATION_GCOVPROFILER_H
#include "llvm/IR/PassManager.h"
#include "llvm/Transforms/Instrumentation.h"
diff --git a/llvm/include/llvm/Transforms/Instrumentation/HWAddressSanitizer.h b/llvm/include/llvm/Transforms/Instrumentation/HWAddressSanitizer.h
index 68b47320f650..76e02f06435c 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/HWAddressSanitizer.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/HWAddressSanitizer.h
@@ -11,8 +11,8 @@
// legacy HWAddressSanitizer pass to use the new PassManager infrastructure.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_INSTRUMENTATION_HWADDRESSSANITIZERPASS_H
-#define LLVM_TRANSFORMS_INSTRUMENTATION_HWADDRESSSANITIZERPASS_H
+#ifndef LLVM_TRANSFORMS_INSTRUMENTATION_HWADDRESSSANITIZER_H
+#define LLVM_TRANSFORMS_INSTRUMENTATION_HWADDRESSSANITIZER_H
#include "llvm/IR/Function.h"
#include "llvm/IR/PassManager.h"
diff --git a/llvm/include/llvm/Transforms/Instrumentation/InstrOrderFile.h b/llvm/include/llvm/Transforms/Instrumentation/InstrOrderFile.h
index f1245d8fd785..f0f375e0acf6 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/InstrOrderFile.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/InstrOrderFile.h
@@ -9,8 +9,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_INSTRORDERFILE_H
-#define LLVM_TRANSFORMS_INSTRORDERFILE_H
+#ifndef LLVM_TRANSFORMS_INSTRUMENTATION_INSTRORDERFILE_H
+#define LLVM_TRANSFORMS_INSTRUMENTATION_INSTRORDERFILE_H
#include "llvm/IR/PassManager.h"
@@ -25,4 +25,4 @@ class InstrOrderFilePass : public PassInfoMixin<InstrOrderFilePass> {
} // end namespace llvm
-#endif // LLVM_TRANSFORMS_INSTRORDERFILE_H
+#endif // LLVM_TRANSFORMS_INSTRUMENTATION_INSTRORDERFILE_H
diff --git a/llvm/include/llvm/Transforms/Instrumentation/InstrProfiling.h b/llvm/include/llvm/Transforms/Instrumentation/InstrProfiling.h
index 5ce72cd59ac2..5242211138f5 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/InstrProfiling.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/InstrProfiling.h
@@ -10,8 +10,8 @@
/// pass.
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_INSTRPROFILING_H
-#define LLVM_TRANSFORMS_INSTRPROFILING_H
+#ifndef LLVM_TRANSFORMS_INSTRUMENTATION_INSTRPROFILING_H
+#define LLVM_TRANSFORMS_INSTRUMENTATION_INSTRPROFILING_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/StringRef.h"
@@ -124,4 +124,4 @@ class InstrProfiling : public PassInfoMixin<InstrProfiling> {
} // end namespace llvm
-#endif // LLVM_TRANSFORMS_INSTRPROFILING_H
+#endif // LLVM_TRANSFORMS_INSTRUMENTATION_INSTRPROFILING_H
diff --git a/llvm/include/llvm/Transforms/Instrumentation/PGOInstrumentation.h b/llvm/include/llvm/Transforms/Instrumentation/PGOInstrumentation.h
index 21cf291d82d1..875a17094d2e 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/PGOInstrumentation.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/PGOInstrumentation.h
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_PGOINSTRUMENTATION_H
-#define LLVM_TRANSFORMS_PGOINSTRUMENTATION_H
+#ifndef LLVM_TRANSFORMS_INSTRUMENTATION_PGOINSTRUMENTATION_H
+#define LLVM_TRANSFORMS_INSTRUMENTATION_PGOINSTRUMENTATION_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/IR/PassManager.h"
@@ -97,4 +97,4 @@ void setIrrLoopHeaderMetadata(Module *M, Instruction *TI, uint64_t Count);
} // end namespace llvm
-#endif // LLVM_TRANSFORMS_PGOINSTRUMENTATION_H
+#endif // LLVM_TRANSFORMS_INSTRUMENTATION_PGOINSTRUMENTATION_H
diff --git a/llvm/include/llvm/Transforms/Instrumentation/PoisonChecking.h b/llvm/include/llvm/Transforms/Instrumentation/PoisonChecking.h
index 606d3c255359..4ec7ec809db7 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/PoisonChecking.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/PoisonChecking.h
@@ -6,9 +6,8 @@
//
//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TRANSFORMS_INSTRUMENTATION_POISON_CHECKING_H
-#define LLVM_TRANSFORMS_INSTRUMENTATION_POISON_CHECKING_H
+#ifndef LLVM_TRANSFORMS_INSTRUMENTATION_POISONCHECKING_H
+#define LLVM_TRANSFORMS_INSTRUMENTATION_POISONCHECKING_H
#include "llvm/IR/PassManager.h"
@@ -21,5 +20,4 @@ struct PoisonCheckingPass : public PassInfoMixin<PoisonCheckingPass> {
}
-
-#endif // LLVM_TRANSFORMS_INSTRUMENTATION_POISON_CHECKING_H
+#endif // LLVM_TRANSFORMS_INSTRUMENTATION_POISONCHECKING_H
diff --git a/llvm/include/llvm/Transforms/Scalar/AnnotationRemarks.h b/llvm/include/llvm/Transforms/Scalar/AnnotationRemarks.h
index f1619766dcf4..dd7629434141 100644
--- a/llvm/include/llvm/Transforms/Scalar/AnnotationRemarks.h
+++ b/llvm/include/llvm/Transforms/Scalar/AnnotationRemarks.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_SCALAR_ANNOTATION_REMARKS_H
-#define LLVM_TRANSFORMS_SCALAR_ANNOTATION_REMARKS_H
+#ifndef LLVM_TRANSFORMS_SCALAR_ANNOTATIONREMARKS_H
+#define LLVM_TRANSFORMS_SCALAR_ANNOTATIONREMARKS_H
#include "llvm/IR/Function.h"
#include "llvm/IR/PassManager.h"
@@ -23,4 +23,4 @@ struct AnnotationRemarksPass : public PassInfoMixin<AnnotationRemarksPass> {
};
} // namespace llvm
-#endif // LLVM_TRANSFORMS_SCALAR_ANNOTATION_REMARKS_H
+#endif // LLVM_TRANSFORMS_SCALAR_ANNOTATIONREMARKS_H
diff --git a/llvm/include/llvm/Transforms/Scalar/CallSiteSplitting.h b/llvm/include/llvm/Transforms/Scalar/CallSiteSplitting.h
index 74cbf84b64b2..ee2b6f264086 100644
--- a/llvm/include/llvm/Transforms/Scalar/CallSiteSplitting.h
+++ b/llvm/include/llvm/Transforms/Scalar/CallSiteSplitting.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_SCALAR_CALLSITESPLITTING__H
-#define LLVM_TRANSFORMS_SCALAR_CALLSITESPLITTING__H
+#ifndef LLVM_TRANSFORMS_SCALAR_CALLSITESPLITTING_H
+#define LLVM_TRANSFORMS_SCALAR_CALLSITESPLITTING_H
#include "llvm/IR/Function.h"
#include "llvm/IR/PassManager.h"
@@ -20,4 +20,4 @@ struct CallSiteSplittingPass : PassInfoMixin<CallSiteSplittingPass> {
};
} // end namespace llvm
-#endif // LLVM_TRANSFORMS_SCALAR_CALLSITESPLITTING__H
+#endif // LLVM_TRANSFORMS_SCALAR_CALLSITESPLITTING_H
diff --git a/llvm/include/llvm/Transforms/Scalar/GuardWidening.h b/llvm/include/llvm/Transforms/Scalar/GuardWidening.h
index 06dc9ac97bec..d08d042ab055 100644
--- a/llvm/include/llvm/Transforms/Scalar/GuardWidening.h
+++ b/llvm/include/llvm/Transforms/Scalar/GuardWidening.h
@@ -12,9 +12,8 @@
//
//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TRANSFORMS_SCALAR_GUARD_WIDENING_H
-#define LLVM_TRANSFORMS_SCALAR_GUARD_WIDENING_H
+#ifndef LLVM_TRANSFORMS_SCALAR_GUARDWIDENING_H
+#define LLVM_TRANSFORMS_SCALAR_GUARDWIDENING_H
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/IR/PassManager.h"
@@ -31,5 +30,4 @@ struct GuardWideningPass : public PassInfoMixin<GuardWideningPass> {
};
}
-
-#endif // LLVM_TRANSFORMS_SCALAR_GUARD_WIDENING_H
+#endif // LLVM_TRANSFORMS_SCALAR_GUARDWIDENING_H
diff --git a/llvm/include/llvm/Transforms/Scalar/InstSimplifyPass.h b/llvm/include/llvm/Transforms/Scalar/InstSimplifyPass.h
index f36695a8c2b7..f5781e085f7b 100644
--- a/llvm/include/llvm/Transforms/Scalar/InstSimplifyPass.h
+++ b/llvm/include/llvm/Transforms/Scalar/InstSimplifyPass.h
@@ -11,8 +11,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_UTILS_INSTSIMPLIFYPASS_H
-#define LLVM_TRANSFORMS_UTILS_INSTSIMPLIFYPASS_H
+#ifndef LLVM_TRANSFORMS_SCALAR_INSTSIMPLIFYPASS_H
+#define LLVM_TRANSFORMS_SCALAR_INSTSIMPLIFYPASS_H
#include "llvm/IR/PassManager.h"
@@ -38,4 +38,4 @@ class InstSimplifyPass : public PassInfoMixin<InstSimplifyPass> {
} // end namespace llvm
-#endif // LLVM_TRANSFORMS_UTILS_INSTSIMPLIFYPASS_H
+#endif // LLVM_TRANSFORMS_SCALAR_INSTSIMPLIFYPASS_H
diff --git a/llvm/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h b/llvm/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h
index ce97b9e4c386..0c885b957b0f 100644
--- a/llvm/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h
+++ b/llvm/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h
@@ -24,4 +24,4 @@ struct LowerGuardIntrinsicPass : PassInfoMixin<LowerGuardIntrinsicPass> {
}
-#endif //LLVM_TRANSFORMS_SCALAR_LOWERGUARDINTRINSIC_H
+#endif // LLVM_TRANSFORMS_SCALAR_LOWERGUARDINTRINSIC_H
diff --git a/llvm/include/llvm/Transforms/Scalar/LowerMatrixIntrinsics.h b/llvm/include/llvm/Transforms/Scalar/LowerMatrixIntrinsics.h
index a2a31d302ccb..dd574e4f32c6 100644
--- a/llvm/include/llvm/Transforms/Scalar/LowerMatrixIntrinsics.h
+++ b/llvm/include/llvm/Transforms/Scalar/LowerMatrixIntrinsics.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_SCALAR_LOWERMATRIXINTRINSICSPASS_H
-#define LLVM_TRANSFORMS_SCALAR_LOWERMATRIXINTRINSICSPASS_H
+#ifndef LLVM_TRANSFORMS_SCALAR_LOWERMATRIXINTRINSICS_H
+#define LLVM_TRANSFORMS_SCALAR_LOWERMATRIXINTRINSICS_H
#include "llvm/IR/PassManager.h"
diff --git a/llvm/include/llvm/Transforms/Scalar/LowerWidenableCondition.h b/llvm/include/llvm/Transforms/Scalar/LowerWidenableCondition.h
index 7c1e64b8f3a9..81c6f00e27fd 100644
--- a/llvm/include/llvm/Transforms/Scalar/LowerWidenableCondition.h
+++ b/llvm/include/llvm/Transforms/Scalar/LowerWidenableCondition.h
@@ -23,4 +23,4 @@ struct LowerWidenableConditionPass : PassInfoMixin<LowerWidenableConditionPass>
}
-#endif //LLVM_TRANSFORMS_SCALAR_LOWERWIDENABLECONDITION_H
+#endif // LLVM_TRANSFORMS_SCALAR_LOWERWIDENABLECONDITION_H
diff --git a/llvm/include/llvm/Transforms/Scalar/MakeGuardsExplicit.h b/llvm/include/llvm/Transforms/Scalar/MakeGuardsExplicit.h
index 525174734303..a20b31f3ab5e 100644
--- a/llvm/include/llvm/Transforms/Scalar/MakeGuardsExplicit.h
+++ b/llvm/include/llvm/Transforms/Scalar/MakeGuardsExplicit.h
@@ -43,4 +43,4 @@ struct MakeGuardsExplicitPass : public PassInfoMixin<MakeGuardsExplicitPass> {
} // namespace llvm
-#endif //LLVM_TRANSFORMS_SCALAR_MAKEGUARDSEXPLICIT_H
+#endif // LLVM_TRANSFORMS_SCALAR_MAKEGUARDSEXPLICIT_H
diff --git a/llvm/include/llvm/Transforms/Scalar/RewriteStatepointsForGC.h b/llvm/include/llvm/Transforms/Scalar/RewriteStatepointsForGC.h
index 12773c16dcc2..29845ce3b62d 100644
--- a/llvm/include/llvm/Transforms/Scalar/RewriteStatepointsForGC.h
+++ b/llvm/include/llvm/Transforms/Scalar/RewriteStatepointsForGC.h
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_SCALAR_REWRITE_STATEPOINTS_FOR_GC_H
-#define LLVM_TRANSFORMS_SCALAR_REWRITE_STATEPOINTS_FOR_GC_H
+#ifndef LLVM_TRANSFORMS_SCALAR_REWRITESTATEPOINTSFORGC_H
+#define LLVM_TRANSFORMS_SCALAR_REWRITESTATEPOINTSFORGC_H
#include "llvm/IR/PassManager.h"
@@ -35,4 +35,4 @@ struct RewriteStatepointsForGC : public PassInfoMixin<RewriteStatepointsForGC> {
} // namespace llvm
-#endif // LLVM_TRANSFORMS_SCALAR_REWRITE_STATEPOINTS_FOR_GC_H
+#endif // LLVM_TRANSFORMS_SCALAR_REWRITESTATEPOINTSFORGC_H
diff --git a/llvm/include/llvm/Transforms/Scalar/ScalarizeMaskedMemIntrin.h b/llvm/include/llvm/Transforms/Scalar/ScalarizeMaskedMemIntrin.h
index 19339ca13242..e4002159edbd 100644
--- a/llvm/include/llvm/Transforms/Scalar/ScalarizeMaskedMemIntrin.h
+++ b/llvm/include/llvm/Transforms/Scalar/ScalarizeMaskedMemIntrin.h
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
//
-#ifndef LLVM_TRANSFORMS_SCALAR_SCALARIZE_MASKED_MEMINTRIN_H
-#define LLVM_TRANSFORMS_SCALAR_SCALARIZE_MASKED_MEMINTRIN_H
+#ifndef LLVM_TRANSFORMS_SCALAR_SCALARIZEMASKEDMEMINTRIN_H
+#define LLVM_TRANSFORMS_SCALAR_SCALARIZEMASKEDMEMINTRIN_H
#include "llvm/IR/PassManager.h"
diff --git a/llvm/include/llvm/Transforms/Scalar/SpeculativeExecution.h b/llvm/include/llvm/Transforms/Scalar/SpeculativeExecution.h
index 14da86483213..41de544e7c9c 100644
--- a/llvm/include/llvm/Transforms/Scalar/SpeculativeExecution.h
+++ b/llvm/include/llvm/Transforms/Scalar/SpeculativeExecution.h
@@ -88,4 +88,4 @@ class SpeculativeExecutionPass
};
}
-#endif //LLVM_TRANSFORMS_SCALAR_SPECULATIVEEXECUTION_H
+#endif // LLVM_TRANSFORMS_SCALAR_SPECULATIVEEXECUTION_H
diff --git a/llvm/include/llvm/Transforms/Utils/CanonicalizeAliases.h b/llvm/include/llvm/Transforms/Utils/CanonicalizeAliases.h
index 8f23a041a24e..fdb390db3aff 100644
--- a/llvm/include/llvm/Transforms/Utils/CanonicalizeAliases.h
+++ b/llvm/include/llvm/Transforms/Utils/CanonicalizeAliases.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_UTILS_CANONICALIZE_ALIASES_H
-#define LLVM_TRANSFORMS_UTILS_CANONICALIZE_ALIASES_H
+#ifndef LLVM_TRANSFORMS_UTILS_CANONICALIZEALIASES_H
+#define LLVM_TRANSFORMS_UTILS_CANONICALIZEALIASES_H
#include "llvm/IR/Module.h"
#include "llvm/IR/PassManager.h"
@@ -28,4 +28,4 @@ class CanonicalizeAliasesPass : public PassInfoMixin<CanonicalizeAliasesPass> {
} // end namespace llvm
-#endif // LLVM_TRANSFORMS_UTILS_CANONICALIZE_ALIASESH
+#endif // LLVM_TRANSFORMS_UTILS_CANONICALIZEALIASES_H
diff --git a/llvm/include/llvm/Transforms/Utils/CanonicalizeFreezeInLoops.h b/llvm/include/llvm/Transforms/Utils/CanonicalizeFreezeInLoops.h
index 3481a098abd7..9de032935f88 100644
--- a/llvm/include/llvm/Transforms/Utils/CanonicalizeFreezeInLoops.h
+++ b/llvm/include/llvm/Transforms/Utils/CanonicalizeFreezeInLoops.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_UTILS_CANONICALIZE_FREEZES_IN_LOOPS_H
-#define LLVM_TRANSFORMS_UTILS_CANONICALIZE_FREEZES_IN_LOOPS_H
+#ifndef LLVM_TRANSFORMS_UTILS_CANONICALIZEFREEZEINLOOPS_H
+#define LLVM_TRANSFORMS_UTILS_CANONICALIZEFREEZEINLOOPS_H
#include "llvm/Analysis/LoopAnalysisManager.h"
#include "llvm/Analysis/LoopInfo.h"
@@ -30,4 +30,4 @@ class CanonicalizeFreezeInLoopsPass
} // end namespace llvm
-#endif // LLVM_TRANSFORMS_UTILS_CANONICALIZE_FREEZES_IN_LOOPS_H
+#endif // LLVM_TRANSFORMS_UTILS_CANONICALIZEFREEZEINLOOPS_H
diff --git a/llvm/include/llvm/Transforms/Utils/Debugify.h b/llvm/include/llvm/Transforms/Utils/Debugify.h
index 30e7d8e87adf..44620de96ab4 100644
--- a/llvm/include/llvm/Transforms/Utils/Debugify.h
+++ b/llvm/include/llvm/Transforms/Utils/Debugify.h
@@ -10,8 +10,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORM_UTILS_DEBUGIFY_H
-#define LLVM_TRANSFORM_UTILS_DEBUGIFY_H
+#ifndef LLVM_TRANSFORMS_UTILS_DEBUGIFY_H
+#define LLVM_TRANSFORMS_UTILS_DEBUGIFY_H
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/StringRef.h"
@@ -148,4 +148,4 @@ class DebugifyCustomPassManager : public legacy::PassManager {
};
} // namespace llvm
-#endif // LLVM_TRANSFORM_UTILS_DEBUGIFY_H
+#endif // LLVM_TRANSFORMS_UTILS_DEBUGIFY_H
diff --git a/llvm/include/llvm/Transforms/Utils/HelloWorld.h b/llvm/include/llvm/Transforms/Utils/HelloWorld.h
index 6c753032f913..e29dda54586e 100644
--- a/llvm/include/llvm/Transforms/Utils/HelloWorld.h
+++ b/llvm/include/llvm/Transforms/Utils/HelloWorld.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_HELLONEW_HELLOWORLD_H
-#define LLVM_TRANSFORMS_HELLONEW_HELLOWORLD_H
+#ifndef LLVM_TRANSFORMS_UTILS_HELLOWORLD_H
+#define LLVM_TRANSFORMS_UTILS_HELLOWORLD_H
#include "llvm/IR/PassManager.h"
@@ -20,4 +20,4 @@ class HelloWorldPass : public PassInfoMixin<HelloWorldPass> {
} // namespace llvm
-#endif // LLVM_TRANSFORMS_HELLONEW_HELLOWORLD_H
+#endif // LLVM_TRANSFORMS_UTILS_HELLOWORLD_H
diff --git a/llvm/include/llvm/Transforms/Utils/ModuleUtils.h b/llvm/include/llvm/Transforms/Utils/ModuleUtils.h
index 65added8b7e1..a2de0a9d1e65 100644
--- a/llvm/include/llvm/Transforms/Utils/ModuleUtils.h
+++ b/llvm/include/llvm/Transforms/Utils/ModuleUtils.h
@@ -120,4 +120,4 @@ void setVectorVariantNames(CallInst *CI,
} // End VFABI namespace
} // End llvm namespace
-#endif // LLVM_TRANSFORMS_UTILS_MODULEUTILS_H
+#endif // LLVM_TRANSFORMS_UTILS_MODULEUTILS_H
diff --git a/llvm/include/llvm/Transforms/Utils/NameAnonGlobals.h b/llvm/include/llvm/Transforms/Utils/NameAnonGlobals.h
index 659ebe33ffa6..03d8840a22d2 100644
--- a/llvm/include/llvm/Transforms/Utils/NameAnonGlobals.h
+++ b/llvm/include/llvm/Transforms/Utils/NameAnonGlobals.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_UTILS_NAMEANONGLOBALSS_H
-#define LLVM_TRANSFORMS_UTILS_NAMEANONGLOBALSS_H
+#ifndef LLVM_TRANSFORMS_UTILS_NAMEANONGLOBALS_H
+#define LLVM_TRANSFORMS_UTILS_NAMEANONGLOBALS_H
#include "llvm/IR/Module.h"
#include "llvm/IR/PassManager.h"
diff --git a/llvm/include/llvm/Transforms/Utils/ScalarEvolutionExpander.h b/llvm/include/llvm/Transforms/Utils/ScalarEvolutionExpander.h
index f4b98c874b13..e0653c9e403c 100644
--- a/llvm/include/llvm/Transforms/Utils/ScalarEvolutionExpander.h
+++ b/llvm/include/llvm/Transforms/Utils/ScalarEvolutionExpander.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_ANALYSIS_SCALAREVOLUTIONEXPANDER_H
-#define LLVM_ANALYSIS_SCALAREVOLUTIONEXPANDER_H
+#ifndef LLVM_TRANSFORMS_UTILS_SCALAREVOLUTIONEXPANDER_H
+#define LLVM_TRANSFORMS_UTILS_SCALAREVOLUTIONEXPANDER_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/DenseSet.h"
diff --git a/llvm/include/llvm/Transforms/Utils/SymbolRewriter.h b/llvm/include/llvm/Transforms/Utils/SymbolRewriter.h
index ce9dcaf2b74f..1c6f90faf2b4 100644
--- a/llvm/include/llvm/Transforms/Utils/SymbolRewriter.h
+++ b/llvm/include/llvm/Transforms/Utils/SymbolRewriter.h
@@ -138,4 +138,4 @@ class RewriteSymbolPass : public PassInfoMixin<RewriteSymbolPass> {
} // end namespace llvm
-#endif //LLVM_TRANSFORMS_UTILS_SYMBOLREWRITER_H
+#endif // LLVM_TRANSFORMS_UTILS_SYMBOLREWRITER_H
diff --git a/llvm/include/llvm/Transforms/Vectorize/VectorCombine.h b/llvm/include/llvm/Transforms/Vectorize/VectorCombine.h
index 15e2331141ff..b7809aa24cae 100644
--- a/llvm/include/llvm/Transforms/Vectorize/VectorCombine.h
+++ b/llvm/include/llvm/Transforms/Vectorize/VectorCombine.h
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TRANSFORMS_VECTOR_VECTORCOMBINE_H
-#define LLVM_TRANSFORMS_VECTOR_VECTORCOMBINE_H
+#ifndef LLVM_TRANSFORMS_VECTORIZE_VECTORCOMBINE_H
+#define LLVM_TRANSFORMS_VECTORIZE_VECTORCOMBINE_H
#include "llvm/IR/PassManager.h"
@@ -26,5 +26,4 @@ struct VectorCombinePass : public PassInfoMixin<VectorCombinePass> {
};
}
-#endif // LLVM_TRANSFORMS_VECTOR_VECTORCOMBINE_H
-
+#endif // LLVM_TRANSFORMS_VECTORIZE_VECTORCOMBINE_H
diff --git a/llvm/include/llvm/WindowsManifest/WindowsManifestMerger.h b/llvm/include/llvm/WindowsManifest/WindowsManifestMerger.h
index 935c930ad91d..31f4daeb7019 100644
--- a/llvm/include/llvm/WindowsManifest/WindowsManifestMerger.h
+++ b/llvm/include/llvm/WindowsManifest/WindowsManifestMerger.h
@@ -22,8 +22,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef LLVM_INCLUDE_LLVM_SUPPORT_WINDOWS_MANIFEST_MERGER_H
-#define LLVM_INCLUDE_LLVM_SUPPORT_WINDOWS_MANIFEST_MERGER_H
+#ifndef LLVM_WINDOWSMANIFEST_WINDOWSMANIFESTMERGER_H
+#define LLVM_WINDOWSMANIFEST_WINDOWSMANIFESTMERGER_H
#include "llvm/Support/Error.h"
diff --git a/llvm/include/llvm/XRay/BlockIndexer.h b/llvm/include/llvm/XRay/BlockIndexer.h
index dafd2b5a5230..eabc4e3f5c6e 100644
--- a/llvm/include/llvm/XRay/BlockIndexer.h
+++ b/llvm/include/llvm/XRay/BlockIndexer.h
@@ -10,8 +10,8 @@
// thread and a range of records representing a block.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_XRAY_BLOCKINDEXER_H_
-#define LLVM_LIB_XRAY_BLOCKINDEXER_H_
+#ifndef LLVM_XRAY_BLOCKINDEXER_H
+#define LLVM_XRAY_BLOCKINDEXER_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/XRay/FDRRecords.h"
@@ -65,4 +65,4 @@ class BlockIndexer : public RecordVisitor {
} // namespace xray
} // namespace llvm
-#endif // LLVM_LIB_XRAY_BLOCKINDEXER_H_
+#endif // LLVM_XRAY_BLOCKINDEXER_H
diff --git a/llvm/include/llvm/XRay/BlockPrinter.h b/llvm/include/llvm/XRay/BlockPrinter.h
index 949258085332..9215d64e73b9 100644
--- a/llvm/include/llvm/XRay/BlockPrinter.h
+++ b/llvm/include/llvm/XRay/BlockPrinter.h
@@ -10,8 +10,8 @@
// easier human consumption.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_INCLUDE_LLVM_XRAY_BLOCKPRINTER_H_
-#define LLVM_INCLUDE_LLVM_XRAY_BLOCKPRINTER_H_
+#ifndef LLVM_XRAY_BLOCKPRINTER_H
+#define LLVM_XRAY_BLOCKPRINTER_H
#include "llvm/Support/raw_ostream.h"
#include "llvm/XRay/FDRRecords.h"
@@ -58,4 +58,4 @@ class BlockPrinter : public RecordVisitor {
} // namespace xray
} // namespace llvm
-#endif // LLVM_INCLUDE_LLVM_XRAY_BLOCKPRINTER_H_
+#endif // LLVM_XRAY_BLOCKPRINTER_H
diff --git a/llvm/include/llvm/XRay/BlockVerifier.h b/llvm/include/llvm/XRay/BlockVerifier.h
index c848fdf084bc..0175584d8235 100644
--- a/llvm/include/llvm/XRay/BlockVerifier.h
+++ b/llvm/include/llvm/XRay/BlockVerifier.h
@@ -10,8 +10,8 @@
// associated with a block, following the FDR mode log format's specifications.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_INCLUDE_LLVM_XRAY_BLOCKVERIFIER_H_
-#define LLVM_INCLUDE_LLVM_XRAY_BLOCKVERIFIER_H_
+#ifndef LLVM_XRAY_BLOCKVERIFIER_H
+#define LLVM_XRAY_BLOCKVERIFIER_H
#include "llvm/XRay/FDRRecords.h"
#include <array>
@@ -68,4 +68,4 @@ class BlockVerifier : public RecordVisitor {
} // namespace xray
} // namespace llvm
-#endif // LLVM_INCLUDE_LLVM_XRAY_BLOCKVERIFIER_H_
+#endif // LLVM_XRAY_BLOCKVERIFIER_H
diff --git a/llvm/include/llvm/XRay/FDRLogBuilder.h b/llvm/include/llvm/XRay/FDRLogBuilder.h
index 3f49dc6dcb9d..f07c446ce1e5 100644
--- a/llvm/include/llvm/XRay/FDRLogBuilder.h
+++ b/llvm/include/llvm/XRay/FDRLogBuilder.h
@@ -5,8 +5,8 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_INCLUDE_LLVM_XRAY_FDRLOGBUILDER_H_
-#define LLVM_INCLUDE_LLVM_XRAY_FDRLOGBUILDER_H_
+#ifndef LLVM_XRAY_FDRLOGBUILDER_H
+#define LLVM_XRAY_FDRLOGBUILDER_H
#include "llvm/XRay/FDRRecords.h"
@@ -37,4 +37,4 @@ class LogBuilder {
} // namespace xray
} // namespace llvm
-#endif // LLVM_INCLUDE_LLVM_XRAY_FDRLOGBUILDER_H_
+#endif // LLVM_XRAY_FDRLOGBUILDER_H
diff --git a/llvm/include/llvm/XRay/FDRRecordConsumer.h b/llvm/include/llvm/XRay/FDRRecordConsumer.h
index 4fbb1d41d0da..91020b0a4fef 100644
--- a/llvm/include/llvm/XRay/FDRRecordConsumer.h
+++ b/llvm/include/llvm/XRay/FDRRecordConsumer.h
@@ -5,8 +5,8 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_INCLUDE_LLVM_XRAY_FDRRECORDCONSUMER_H_
-#define LLVM_INCLUDE_LLVM_XRAY_FDRRECORDCONSUMER_H_
+#ifndef LLVM_XRAY_FDRRECORDCONSUMER_H
+#define LLVM_XRAY_FDRRECORDCONSUMER_H
#include "llvm/Support/Error.h"
#include "llvm/XRay/FDRRecords.h"
@@ -51,4 +51,4 @@ class PipelineConsumer : public RecordConsumer {
} // namespace xray
} // namespace llvm
-#endif // LLVM_INCLUDE_LLVM_XRAY_FDRRECORDCONSUMER_H_
+#endif // LLVM_XRAY_FDRRECORDCONSUMER_H
diff --git a/llvm/include/llvm/XRay/FDRRecordProducer.h b/llvm/include/llvm/XRay/FDRRecordProducer.h
index 043d91568f4e..25c123aec1b2 100644
--- a/llvm/include/llvm/XRay/FDRRecordProducer.h
+++ b/llvm/include/llvm/XRay/FDRRecordProducer.h
@@ -5,8 +5,8 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_INCLUDE_LLVM_XRAY_FDRRECORDPRODUCER_H_
-#define LLVM_INCLUDE_LLVM_XRAY_FDRRECORDPRODUCER_H_
+#ifndef LLVM_XRAY_FDRRECORDPRODUCER_H
+#define LLVM_XRAY_FDRRECORDPRODUCER_H
#include "llvm/Support/Error.h"
#include "llvm/XRay/FDRRecords.h"
@@ -47,4 +47,4 @@ class FileBasedRecordProducer : public RecordProducer {
} // namespace xray
} // namespace llvm
-#endif // LLVM_INCLUDE_LLVM_XRAY_FDRRECORDPRODUCER_H_
+#endif // LLVM_XRAY_FDRRECORDPRODUCER_H
diff --git a/llvm/include/llvm/XRay/FDRRecords.h b/llvm/include/llvm/XRay/FDRRecords.h
index d53e6aa812f2..9c318805d61b 100644
--- a/llvm/include/llvm/XRay/FDRRecords.h
+++ b/llvm/include/llvm/XRay/FDRRecords.h
@@ -10,8 +10,8 @@
// of records we encounter in XRay flight data recorder mode traces.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_XRAY_FDRRECORDS_H_
-#define LLVM_LIB_XRAY_FDRRECORDS_H_
+#ifndef LLVM_XRAY_FDRRECORDS_H
+#define LLVM_XRAY_FDRRECORDS_H
#include <cstdint>
#include <string>
@@ -446,4 +446,4 @@ class RecordInitializer : public RecordVisitor {
} // namespace xray
} // namespace llvm
-#endif // LLVM_LIB_XRAY_FDRRECORDS_H_
+#endif // LLVM_XRAY_FDRRECORDS_H
diff --git a/llvm/include/llvm/XRay/FDRTraceExpander.h b/llvm/include/llvm/XRay/FDRTraceExpander.h
index f3c36cf4cf66..4a0bd24cfa9b 100644
--- a/llvm/include/llvm/XRay/FDRTraceExpander.h
+++ b/llvm/include/llvm/XRay/FDRTraceExpander.h
@@ -10,8 +10,8 @@
// from a sequence of FDR mode records in arrival order into a collection.
//
//===----------------------------------------------------------------------===//
-#ifndef INCLUDE_LLVM_XRAY_FDRTRACEEXPANDER_H_
-#define INCLUDE_LLVM_XRAY_FDRTRACEEXPANDER_H_
+#ifndef LLVM_XRAY_FDRTRACEEXPANDER_H
+#define LLVM_XRAY_FDRTRACEEXPANDER_H
#include "llvm/ADT/STLExtras.h"
#include "llvm/XRay/FDRRecords.h"
@@ -59,4 +59,4 @@ class TraceExpander : public RecordVisitor {
} // namespace xray
} // namespace llvm
-#endif // INCLUDE_LLVM_XRAY_FDRTRACEEXPANDER_H_
+#endif // LLVM_XRAY_FDRTRACEEXPANDER_H
diff --git a/llvm/include/llvm/XRay/FDRTraceWriter.h b/llvm/include/llvm/XRay/FDRTraceWriter.h
index 2498877e27c1..40d5f5af91c9 100644
--- a/llvm/include/llvm/XRay/FDRTraceWriter.h
+++ b/llvm/include/llvm/XRay/FDRTraceWriter.h
@@ -9,8 +9,8 @@
// Test a utility that can write out XRay FDR Mode formatted trace files.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_INCLUDE_LLVM_XRAY_FDRTRACEWRITER_H_
-#define LLVM_INCLUDE_LLVM_XRAY_FDRTRACEWRITER_H_
+#ifndef LLVM_XRAY_FDRTRACEWRITER_H
+#define LLVM_XRAY_FDRTRACEWRITER_H
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/EndianStream.h"
@@ -52,4 +52,4 @@ class FDRTraceWriter : public RecordVisitor {
} // namespace xray
} // namespace llvm
-#endif // LLVM_INCLUDE_LLVM_XRAY_FDRTRACEWRITER_H_
+#endif // LLVM_XRAY_FDRTRACEWRITER_H
diff --git a/llvm/include/llvm/XRay/FileHeaderReader.h b/llvm/include/llvm/XRay/FileHeaderReader.h
index 30878f3e99e8..485d26d71456 100644
--- a/llvm/include/llvm/XRay/FileHeaderReader.h
+++ b/llvm/include/llvm/XRay/FileHeaderReader.h
@@ -10,8 +10,8 @@
// sources.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_XRAY_FILEHEADERREADER_H_
-#define LLVM_LIB_XRAY_FILEHEADERREADER_H_
+#ifndef LLVM_XRAY_FILEHEADERREADER_H
+#define LLVM_XRAY_FILEHEADERREADER_H
#include "llvm/Support/DataExtractor.h"
#include "llvm/Support/Error.h"
@@ -29,4 +29,4 @@ Expected<XRayFileHeader> readBinaryFormatHeader(DataExtractor &HeaderExtractor,
} // namespace xray
} // namespace llvm
-#endif // LLVM_LIB_XRAY_FILEHEADERREADER_H_
+#endif // LLVM_XRAY_FILEHEADERREADER_H
diff --git a/llvm/include/llvm/XRay/Graph.h b/llvm/include/llvm/XRay/Graph.h
index d368f7e724d8..d599ec361165 100644
--- a/llvm/include/llvm/XRay/Graph.h
+++ b/llvm/include/llvm/XRay/Graph.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_XRAY_GRAPH_T_H
-#define LLVM_XRAY_GRAPH_T_H
+#ifndef LLVM_XRAY_GRAPH_H
+#define LLVM_XRAY_GRAPH_H
#include <initializer_list>
#include <stdint.h>
diff --git a/llvm/include/llvm/XRay/InstrumentationMap.h b/llvm/include/llvm/XRay/InstrumentationMap.h
index aae90345cbb7..c95d40654270 100644
--- a/llvm/include/llvm/XRay/InstrumentationMap.h
+++ b/llvm/include/llvm/XRay/InstrumentationMap.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_XRAY_INSTRUMENTATION_MAP_H
-#define LLVM_XRAY_INSTRUMENTATION_MAP_H
+#ifndef LLVM_XRAY_INSTRUMENTATIONMAP_H
+#define LLVM_XRAY_INSTRUMENTATIONMAP_H
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/StringRef.h"
@@ -135,4 +135,4 @@ template <> struct MappingTraits<xray::YAMLXRaySledEntry> {
LLVM_YAML_IS_SEQUENCE_VECTOR(xray::YAMLXRaySledEntry)
-#endif // LLVM_XRAY_INSTRUMENTATION_MAP_H
+#endif // LLVM_XRAY_INSTRUMENTATIONMAP_H
diff --git a/llvm/include/llvm/XRay/RecordPrinter.h b/llvm/include/llvm/XRay/RecordPrinter.h
index 7c7b7a32c56d..f7b809c062f2 100644
--- a/llvm/include/llvm/XRay/RecordPrinter.h
+++ b/llvm/include/llvm/XRay/RecordPrinter.h
@@ -10,8 +10,8 @@
// data in an adhoc format, suitable for human inspection.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_INCLUDE_LLVM_XRAY_RECORDPRINTER_H_
-#define LLVM_INCLUDE_LLVM_XRAY_RECORDPRINTER_H_
+#ifndef LLVM_XRAY_RECORDPRINTER_H
+#define LLVM_XRAY_RECORDPRINTER_H
#include "llvm/Support/raw_ostream.h"
#include "llvm/XRay/FDRRecords.h"
@@ -46,4 +46,4 @@ class RecordPrinter : public RecordVisitor {
} // namespace xray
} // namespace llvm
-#endif // LLVM_INCLUDE_LLVM_XRAY_RECORDPRINTER_H
+#endif // LLVM_XRAY_RECORDPRINTER_H
diff --git a/llvm/include/llvm/XRay/XRayRecord.h b/llvm/include/llvm/XRay/XRayRecord.h
index 546b02303b6a..bb3c346d05e7 100644
--- a/llvm/include/llvm/XRay/XRayRecord.h
+++ b/llvm/include/llvm/XRay/XRayRecord.h
@@ -11,8 +11,8 @@
// xray project.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_XRAY_XRAY_RECORD_H
-#define LLVM_XRAY_XRAY_RECORD_H
+#ifndef LLVM_XRAY_XRAYRECORD_H
+#define LLVM_XRAY_XRAYRECORD_H
#include <cstdint>
#include <vector>
@@ -101,4 +101,4 @@ struct XRayRecord {
} // namespace xray
} // namespace llvm
-#endif // LLVM_XRAY_XRAY_RECORD_H
+#endif // LLVM_XRAY_XRAYRECORD_H
diff --git a/llvm/include/llvm/XRay/YAMLXRayRecord.h b/llvm/include/llvm/XRay/YAMLXRayRecord.h
index bc8b03548d6e..606260693fc4 100644
--- a/llvm/include/llvm/XRay/YAMLXRayRecord.h
+++ b/llvm/include/llvm/XRay/YAMLXRayRecord.h
@@ -9,8 +9,8 @@
// Types and traits specialisations for YAML I/O of XRay log entries.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_XRAY_YAML_XRAY_RECORD_H
-#define LLVM_XRAY_YAML_XRAY_RECORD_H
+#ifndef LLVM_XRAY_YAMLXRAYRECORD_H
+#define LLVM_XRAY_YAMLXRAYRECORD_H
#include <type_traits>
@@ -104,4 +104,4 @@ template <> struct MappingTraits<xray::YAMLXRayTrace> {
LLVM_YAML_IS_SEQUENCE_VECTOR(xray::YAMLXRayRecord)
-#endif // LLVM_XRAY_YAML_XRAY_RECORD_H
+#endif // LLVM_XRAY_YAMLXRAYRECORD_H
More information about the llvm-commits
mailing list