Re-sort #include lines using my handy dandy ./utils/sort_includes.py

script. This is in preparation for changes to lots of include lines.

llvm-svn: 229088

include/llvm/ADT/STLExtras.h

@@ -18,13 +18,13 @@
 #define LLVM_ADT_STLEXTRAS_H
 
 #include "llvm/Support/Compiler.h"
+#include <cassert>
 #include <cstddef> // for std::size_t
 #include <cstdlib> // for qsort
 #include <functional>
 #include <iterator>
 #include <memory>
 #include <utility> // for std::pair
-#include <cassert>
 
 namespace llvm {
 

include/llvm/Analysis/TargetTransformInfo.h

@@ -23,8 +23,8 @@
 #define LLVM_ANALYSIS_TARGETTRANSFORMINFO_H
 
 #include "llvm/ADT/Optional.h"
-#include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/IntrinsicInst.h"
+#include "llvm/IR/Intrinsics.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/DataTypes.h"
 

include/llvm/Analysis/TargetTransformInfoImpl.h

@@ -18,8 +18,8 @@
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/IR/CallSite.h"
 #include "llvm/IR/DataLayout.h"
-#include "llvm/IR/Operator.h"
 #include "llvm/IR/Function.h"
+#include "llvm/IR/Operator.h"
 #include "llvm/IR/Type.h"
 
 namespace llvm {

include/llvm/CodeGen/GCStrategy.h

@@ -51,9 +51,9 @@
 #define LLVM_IR_GCSTRATEGY_H
 
 #include "llvm/ADT/Optional.h"
-#include "llvm/IR/Value.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Module.h"
+#include "llvm/IR/Value.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Registry.h"
 #include <string>

include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h

@@ -10,9 +10,9 @@
 #ifndef LLVM_DEBUGINFO_PDB_CONCRETESYMBOLENUMERATOR_H
 #define LLVM_DEBUGINFO_PDB_CONCRETESYMBOLENUMERATOR_H
 
-#include <memory>
 #include "IPDBEnumChildren.h"
 #include "llvm/Support/Casting.h"
+#include <memory>
 
 namespace llvm {
 

include/llvm/DebugInfo/PDB/IPDBDataStream.h

@@ -10,10 +10,9 @@
 #ifndef LLVM_DEBUGINFO_PDB_IPDBDATASTREAM_H
 #define LLVM_DEBUGINFO_PDB_IPDBDATASTREAM_H
 
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/Optional.h"
-
 #include "PDBTypes.h"
+#include "llvm/ADT/Optional.h"
+#include "llvm/ADT/SmallVector.h"
 
 namespace llvm {
 

include/llvm/DebugInfo/PDB/IPDBEnumChildren.h

@@ -10,8 +10,8 @@
 #ifndef LLVM_DEBUGINFO_PDB_IPDBENUMCHILDREN_H
 #define LLVM_DEBUGINFO_PDB_IPDBENUMCHILDREN_H
 
-#include <memory>
 #include "PDBTypes.h"
+#include <memory>
 
 namespace llvm {
 

include/llvm/DebugInfo/PDB/IPDBRawSymbol.h

@@ -10,11 +10,10 @@
 #ifndef LLVM_DEBUGINFO_PDB_IPDBRAWSYMBOL_H
 #define LLVM_DEBUGINFO_PDB_IPDBRAWSYMBOL_H
 
-#include <memory>
-
+#include "PDBTypes.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
-#include "PDBTypes.h"
+#include <memory>
 
 namespace llvm {
 

include/llvm/DebugInfo/PDB/IPDBSession.h

@@ -10,10 +10,9 @@
 #ifndef LLVM_DEBUGINFO_PDB_IPDBSESSION_H
 #define LLVM_DEBUGINFO_PDB_IPDBSESSION_H
 
-#include <memory>
-
 #include "PDBTypes.h"
 #include "llvm/Support/Casting.h"
+#include <memory>
 
 namespace llvm {
 

include/llvm/DebugInfo/PDB/IPDBSourceFile.h

@@ -10,11 +10,10 @@
 #ifndef LLVM_DEBUGINFO_PDB_IPDBSOURCEFILE_H
 #define LLVM_DEBUGINFO_PDB_IPDBSOURCEFILE_H
 
+#include "PDBTypes.h"
 #include <memory>
 #include <string>
 
-#include "PDBTypes.h"
-
 namespace llvm {
 
 class raw_ostream;

include/llvm/DebugInfo/PDB/PDB.h

@@ -10,9 +10,8 @@
 #ifndef LLVM_DEBUGINFO_PDB_PDB_H
 #define LLVM_DEBUGINFO_PDB_PDB_H
 
-#include <memory>
-
 #include "PDBTypes.h"
+#include <memory>
 
 namespace llvm {
 class StringRef;

include/llvm/DebugInfo/PDB/PDBExtras.h

@@ -10,11 +10,9 @@
 #ifndef LLVM_DEBUGINFO_PDB_PDBEXTRAS_H
 #define LLVM_DEBUGINFO_PDB_PDBEXTRAS_H
 
-#include <unordered_map>
-
 #include "PDBTypes.h"
-
 #include "llvm/Support/raw_ostream.h"
+#include <unordered_map>
 
 namespace llvm {
 typedef std::unordered_map<PDB_SymType, int> TagStats;

include/llvm/DebugInfo/PDB/PDBSymbol.h

@@ -10,16 +10,14 @@
 #ifndef LLVM_DEBUGINFO_PDB_IPDBSYMBOL_H
 #define LLVM_DEBUGINFO_PDB_IPDBSYMBOL_H
 
-#include <unordered_map>
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
-
 #include "ConcreteSymbolEnumerator.h"
 #include "IPDBRawSymbol.h"
 #include "PDBExtras.h"
 #include "PDBTypes.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/Casting.h"
+#include <unordered_map>
 
 #define FORWARD_SYMBOL_METHOD(MethodName)                                      \
   auto MethodName() const->decltype(RawSymbol->MethodName()) {                 \

include/llvm/DebugInfo/PDB/PDBSymbolAnnotation.h

@@ -9,10 +9,9 @@
 #ifndef LLVM_DEBUGINFO_PDB_PDBSYMBOLANNOTATION_H
 #define LLVM_DEBUGINFO_PDB_PDBSYMBOLANNOTATION_H
 
-#include <string>
-
 #include "PDBSymbol.h"
 #include "PDBTypes.h"
+#include <string>
 
 namespace llvm {
 

include/llvm/DebugInfo/PDB/PDBSymbolBlock.h

@@ -9,10 +9,9 @@
 #ifndef LLVM_DEBUGINFO_PDB_PDBSYMBOLBLOCK_H
 #define LLVM_DEBUGINFO_PDB_PDBSYMBOLBLOCK_H
 
-#include <string>
-
 #include "PDBSymbol.h"
 #include "PDBTypes.h"
+#include <string>
 
 namespace llvm {
 

include/llvm/DebugInfo/PDB/PDBSymbolCompiland.h

@@ -9,10 +9,9 @@
 #ifndef LLVM_DEBUGINFO_PDB_PDBSYMBOLCOMPILAND_H
 #define LLVM_DEBUGINFO_PDB_PDBSYMBOLCOMPILAND_H
 
-#include <string>
-
 #include "PDBSymbol.h"
 #include "PDBTypes.h"
+#include <string>
 
 namespace llvm {
 

include/llvm/DebugInfo/PDB/PDBSymbolCustom.h

@@ -10,10 +10,9 @@
 #ifndef LLVM_DEBUGINFO_PDB_PDBSYMBOLCUSTOM_H
 #define LLVM_DEBUGINFO_PDB_PDBSYMBOLCUSTOM_H
 
-#include "llvm/ADT/SmallVector.h"
-
 #include "PDBSymbol.h"
 #include "PDBTypes.h"
+#include "llvm/ADT/SmallVector.h"
 
 namespace llvm {
 

include/llvm/DebugInfo/PDB/PDBSymbolExe.h

@@ -10,10 +10,9 @@
 #ifndef LLVM_DEBUGINFO_PDB_PDBSYMBOLEXE_H
 #define LLVM_DEBUGINFO_PDB_PDBSYMBOLEXE_H
 
-#include <string>
-
 #include "PDBSymbol.h"
 #include "PDBTypes.h"
+#include <string>
 
 namespace llvm {
 

include/llvm/DebugInfo/PDB/PDBSymbolThunk.h

@@ -10,10 +10,9 @@
 #ifndef LLVM_DEBUGINFO_PDB_PDBSYMBOLTHUNK_H
 #define LLVM_DEBUGINFO_PDB_PDBSYMBOLTHUNK_H
 
-#include <string>
-
 #include "PDBSymbol.h"
 #include "PDBTypes.h"
+#include <string>
 
 namespace llvm {
 

include/llvm/DebugInfo/PDB/PDBTypes.h

@@ -10,9 +10,9 @@
 #ifndef LLVM_DEBUGINFO_PDB_PDBTYPES_H
 #define LLVM_DEBUGINFO_PDB_PDBTYPES_H
 
-#include <stdint.h>
-#include <functional>
 #include "llvm/Config/llvm-config.h"
+#include <functional>
+#include <stdint.h>
 
 namespace llvm {
 

include/llvm/ExecutionEngine/Orc/CompileUtils.h

@@ -14,10 +14,10 @@
 #ifndef LLVM_EXECUTIONENGINE_ORC_COMPILEUTILS_H
 #define LLVM_EXECUTIONENGINE_ORC_COMPILEUTILS_H
 
-#include "llvm/PassManager.h"
 #include "llvm/ExecutionEngine/ObjectMemoryBuffer.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/Object/ObjectFile.h"
+#include "llvm/PassManager.h"
 #include "llvm/Target/TargetMachine.h"
 
 namespace llvm {

include/llvm/Support/GenericDomTree.h

@@ -21,9 +21,9 @@
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DepthFirstIterator.h"
 #include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/raw_ostream.h"
 #include <algorithm>

include/llvm/Transforms/Utils/VectorUtils.h

@@ -14,9 +14,9 @@
 #ifndef LLVM_TRANSFORMS_UTILS_VECTORUTILS_H
 #define LLVM_TRANSFORMS_UTILS_VECTORUTILS_H
 
+#include "llvm/Analysis/TargetLibraryInfo.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Intrinsics.h"
-#include "llvm/Analysis/TargetLibraryInfo.h"
 
 namespace llvm {
 

lib/Analysis/Lint.cpp

@@ -35,8 +35,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/Lint.h"
-#include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/SmallSet.h"
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Analysis/AssumptionCache.h"
 #include "llvm/Analysis/ConstantFolding.h"

lib/CodeGen/BasicTargetTransformInfo.cpp

@@ -16,10 +16,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/BasicTTIImpl.h"
-#include "llvm/CodeGen/Passes.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/Analysis/TargetTransformInfoImpl.h"
+#include "llvm/CodeGen/Passes.h"
 #include "llvm/Support/CommandLine.h"
 #include <utility>
 using namespace llvm;

lib/CodeGen/ErlangGC.cpp

@@ -15,8 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/GCs.h"
-#include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/GCStrategy.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/Target/TargetInstrInfo.h"

lib/CodeGen/GCMetadata.cpp

@@ -12,9 +12,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/GCMetadata.h"
+#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/Passes.h"
-#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/IR/Function.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/Pass.h"

lib/CodeGen/GCRootLowering.cpp

@@ -12,11 +12,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/GCMetadata.h"
+#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
-#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/IntrinsicInst.h"

lib/CodeGen/MachineFunctionPass.cpp

@@ -16,7 +16,6 @@
 #include "llvm/Analysis/DominanceFrontier.h"
 #include "llvm/Analysis/IVUsers.h"
 #include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/MemoryDependenceAnalysis.h"
 #include "llvm/Analysis/ScalarEvolution.h"
 #include "llvm/CodeGen/MachineFunctionAnalysis.h"

lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/GCStrategy.h"
-#include "llvm/CodeGen/SelectionDAGISel.h"
 #include "ScheduleDAGSDNodes.h"
 #include "SelectionDAGBuilder.h"
 #include "llvm/ADT/PostOrderIterator.h"
@@ -33,6 +32,7 @@
 #include "llvm/CodeGen/ScheduleHazardRecognizer.h"
 #include "llvm/CodeGen/SchedulerRegistry.h"
 #include "llvm/CodeGen/SelectionDAG.h"
+#include "llvm/CodeGen/SelectionDAGISel.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DebugInfo.h"
 #include "llvm/IR/Function.h"

lib/CodeGen/SelectionDAG/StatepointLowering.cpp

@@ -16,8 +16,8 @@
 #include "SelectionDAGBuilder.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/Statistic.h"
-#include "llvm/CodeGen/GCMetadata.h"
 #include "llvm/CodeGen/FunctionLoweringInfo.h"
+#include "llvm/CodeGen/GCMetadata.h"
 #include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/CodeGen/SelectionDAG.h"
 #include "llvm/CodeGen/StackMaps.h"

lib/CodeGen/ShadowStackGC.cpp

@@ -26,8 +26,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/GCs.h"
-#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/ADT/StringExtras.h"
+#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/IR/CallSite.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/IntrinsicInst.h"

lib/CodeGen/ShadowStackGCLowering.cpp

@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/Passes.h"
-#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/ADT/StringExtras.h"
+#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/IR/CallSite.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/IntrinsicInst.h"

lib/DebugInfo/PDB/DIA/DIADataStream.cpp

@@ -8,7 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/DebugInfo/PDB/DIA/DIADataStream.h"
-
 #include "llvm/Support/ConvertUTF.h"
 
 using namespace llvm;

lib/DebugInfo/PDB/DIA/DIAEnumDebugStreams.cpp

@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
-#include "llvm/DebugInfo/PDB/DIA/DIAEnumDebugStreams.h"
 #include "llvm/DebugInfo/PDB/DIA/DIADataStream.h"
+#include "llvm/DebugInfo/PDB/DIA/DIAEnumDebugStreams.h"
 
 using namespace llvm;
 

lib/DebugInfo/PDB/DIA/DIARawSymbol.cpp

@@ -8,10 +8,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/DebugInfo/PDB/PDBExtras.h"
 #include "llvm/DebugInfo/PDB/DIA/DIAEnumSymbols.h"
 #include "llvm/DebugInfo/PDB/DIA/DIARawSymbol.h"
 #include "llvm/DebugInfo/PDB/DIA/DIASession.h"
+#include "llvm/DebugInfo/PDB/PDBExtras.h"
 #include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/raw_ostream.h"
 

lib/DebugInfo/PDB/DIA/DIASession.cpp

@@ -8,14 +8,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolCompiland.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolExe.h"
-
 #include "llvm/DebugInfo/PDB/DIA/DIAEnumDebugStreams.h"
 #include "llvm/DebugInfo/PDB/DIA/DIAEnumSourceFiles.h"
 #include "llvm/DebugInfo/PDB/DIA/DIARawSymbol.h"
 #include "llvm/DebugInfo/PDB/DIA/DIASession.h"
 #include "llvm/DebugInfo/PDB/DIA/DIASourceFile.h"
+#include "llvm/DebugInfo/PDB/PDBSymbolCompiland.h"
+#include "llvm/DebugInfo/PDB/PDBSymbolExe.h"
 #include "llvm/Support/ConvertUTF.h"
 
 using namespace llvm;

lib/DebugInfo/PDB/PDB.cpp

@@ -8,11 +8,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Config/config.h"
-
 #include "llvm/ADT/StringRef.h"
-
-#include "llvm/DebugInfo/PDB/PDB.h"
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
+#include "llvm/DebugInfo/PDB/PDB.h"
 #if HAVE_DIA_SDK
 #include "llvm/DebugInfo/PDB/DIA/DIASession.h"
 #endif

lib/DebugInfo/PDB/PDBInterfaceAnchors.cpp

@@ -13,9 +13,9 @@
 
 #include "llvm/DebugInfo/PDB/IPDBDataStream.h"
 #include "llvm/DebugInfo/PDB/IPDBLineNumber.h"
+#include "llvm/DebugInfo/PDB/IPDBRawSymbol.h"
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/IPDBSourceFile.h"
-#include "llvm/DebugInfo/PDB/IPDBRawSymbol.h"
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbol.cpp

@@ -7,13 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <memory>
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
 #include "llvm/DebugInfo/PDB/IPDBRawSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
-
 #include "llvm/DebugInfo/PDB/PDBSymbolAnnotation.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolBlock.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolCompiland.h"
@@ -45,6 +41,8 @@
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeVTableShape.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolUnknown.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h"
+#include <memory>
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolAnnotation.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolAnnotation.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolBlock.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolBlock.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolCompiland.cpp

@@ -7,9 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-#include <vector>
-
 #include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/IPDBSourceFile.h"
@@ -18,8 +15,10 @@
 #include "llvm/DebugInfo/PDB/PDBSymbolCompiland.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h"
-#include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Support/raw_ostream.h"
+#include <utility>
+#include <vector>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolCompilandDetails.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolCompilandEnv.cpp

@@ -7,11 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/IPDBRawSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolCustom.cpp

@@ -7,11 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/IPDBRawSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolCustom.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolData.cpp

@@ -7,13 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/PDBExtras.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolData.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h"
-
 #include "llvm/Support/Format.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolExe.cpp

@@ -7,8 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
 #include "llvm/DebugInfo/PDB/PDBExtras.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
@@ -16,6 +14,7 @@
 #include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/raw_ostream.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolFunc.cpp

@@ -7,8 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
@@ -17,8 +15,8 @@
 #include "llvm/DebugInfo/PDB/PDBSymbolFuncDebugStart.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h"
-
 #include "llvm/Support/Format.h"
+#include <utility>
 
 using namespace llvm;
 PDBSymbolFunc::PDBSymbolFunc(const IPDBSession &PDBSession,

lib/DebugInfo/PDB/PDBSymbolFuncDebugEnd.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolFuncDebugEnd.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolFuncDebugStart.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolFuncDebugStart.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolLabel.cpp

@@ -7,12 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolLabel.h"
-
 #include "llvm/Support/Format.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolPublicSymbol.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolPublicSymbol.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolThunk.cpp

@@ -7,12 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolThunk.h"
-
 #include "llvm/Support/Format.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeArray.cpp

@@ -7,11 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeArray.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeBaseClass.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeBaseClass.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeBuiltin.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeCustom.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeCustom.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeDimension.cpp

@@ -8,10 +8,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeDimension.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeEnum.cpp

@@ -7,11 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeFriend.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeFriend.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeFunctionArg.cpp

@@ -7,11 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeFunctionArg.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeFunctionSig.cpp

@@ -7,14 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h"
 #include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeFunctionArg.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeManaged.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeManaged.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypePointer.cpp

@@ -8,11 +8,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypePointer.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeTypedef.cpp

@@ -8,12 +8,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h"
+#include <utility>
 using namespace llvm;
 
 PDBSymbolTypeTypedef::PDBSymbolTypeTypedef(

lib/DebugInfo/PDB/PDBSymbolTypeUDT.cpp

@@ -7,11 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeVTable.cpp

@@ -7,13 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypePointer.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeVTable.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeVTableShape.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolTypeVTableShape.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeVTableShape.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolUnknown.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolUnknown.h"
+#include <utility>
 
 using namespace llvm;
 

lib/DebugInfo/PDB/PDBSymbolUsingNamespace.cpp

@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <utility>
-
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h"
+#include <utility>
 
 using namespace llvm;
 

lib/ExecutionEngine/Orc/IndirectionUtils.cpp

@@ -1,6 +1,6 @@
 #include "llvm/ADT/Triple.h"
-#include "llvm/ExecutionEngine/Orc/IndirectionUtils.h"
 #include "llvm/ExecutionEngine/Orc/CloneSubModule.h"
+#include "llvm/ExecutionEngine/Orc/IndirectionUtils.h"
 #include "llvm/IR/CallSite.h"
 #include "llvm/IR/IRBuilder.h"
 #include <set>

lib/ExecutionEngine/Orc/OrcTargetSupport.cpp

@@ -1,6 +1,5 @@
 #include "llvm/ADT/Triple.h"
 #include "llvm/ExecutionEngine/Orc/IndirectionUtils.h"
-
 #include <array>
 
 using namespace llvm;

lib/Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp

@@ -8,12 +8,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "MCTargetDesc/ARMFixupKinds.h"
+#include "llvm/ADT/Twine.h"
 #include "llvm/MC/MCAsmBackend.h"
 #include "llvm/MC/MCFixup.h"
 #include "llvm/MC/MCFixupKindInfo.h"
 #include "llvm/MC/MCValue.h"
 #include "llvm/MC/MCWinCOFFObjectWriter.h"
-#include "llvm/ADT/Twine.h"
 #include "llvm/Support/COFF.h"
 #include "llvm/Support/Debug.h"
 

lib/Target/Mips/MCTargetDesc/MipsOptionRecord.cpp

@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "MipsOptionRecord.h"
-#include "MipsTargetStreamer.h"
 #include "MipsELFStreamer.h"
+#include "MipsTargetStreamer.h"
 #include "llvm/MC/MCSectionELF.h"
 
 using namespace llvm;

lib/Target/Mips/MipsMachineFunction.cpp

@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "MCTargetDesc/MipsBaseInfo.h"
-#include "MipsMachineFunction.h"
 #include "MipsInstrInfo.h"
+#include "MipsMachineFunction.h"
 #include "MipsSubtarget.h"
 #include "MipsTargetMachine.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"

lib/Target/Mips/MipsTargetMachine.h

@@ -14,13 +14,13 @@
 #ifndef LLVM_LIB_TARGET_MIPS_MIPSTARGETMACHINE_H
 #define LLVM_LIB_TARGET_MIPS_MIPSTARGETMACHINE_H
 
+#include "MCTargetDesc/MipsABIInfo.h"
 #include "MipsSubtarget.h"
 #include "llvm/CodeGen/BasicTTIImpl.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/CodeGen/SelectionDAGISel.h"
 #include "llvm/Target/TargetFrameLowering.h"
 #include "llvm/Target/TargetMachine.h"
-#include "MCTargetDesc/MipsABIInfo.h"
 
 namespace llvm {
 class formatted_raw_ostream;

lib/Target/PowerPC/PPCLoopPreIncPrep.cpp

@@ -22,10 +22,9 @@
 #define DEBUG_TYPE "ppc-loop-preinc-prep"
 #include "PPC.h"
 #include "PPCTargetMachine.h"
-#include "llvm/Transforms/Scalar.h"
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/Statistic.h"
-#include "llvm/ADT/STLExtras.h"
 #include "llvm/Analysis/CodeMetrics.h"
 #include "llvm/Analysis/InstructionSimplify.h"
 #include "llvm/Analysis/LoopInfo.h"
@@ -39,6 +38,7 @@
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Transforms/Utils/Local.h"
 #include "llvm/Transforms/Utils/LoopUtils.h"

tools/dsymutil/DwarfLinker.cpp

@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 #include "DebugMap.h"
-
 #include "BinaryHolder.h"
 #include "DebugMap.h"
 #include "dsymutil.h"

tools/llvm-pdbdump/llvm-pdbdump.cpp

@@ -16,20 +16,20 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Config/config.h"
-#include "llvm/DebugInfo/PDB/PDB.h"
 #include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
-#include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/IPDBRawSymbol.h"
-#include "llvm/DebugInfo/PDB/PDBSymbolExe.h"
+#include "llvm/DebugInfo/PDB/IPDBSession.h"
+#include "llvm/DebugInfo/PDB/PDB.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolCompiland.h"
+#include "llvm/DebugInfo/PDB/PDBSymbolExe.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/ManagedStatic.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/Process.h"
 #include "llvm/Support/PrettyStackTrace.h"
+#include "llvm/Support/Process.h"
 #include "llvm/Support/Signals.h"
+#include "llvm/Support/raw_ostream.h"
 
 #if defined(HAVE_DIA_SDK)
 #include <Windows.h>