From 9f20a4c6cea7315af0e01ac58e5fdbb9c0eb8006 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Mon, 13 Jan 2014 08:04:33 +0000 Subject: Re-sort #include lines again, prior to moving headers around. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199080 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/MCJIT/MCJIT.cpp | 2 +- lib/Target/X86/X86TargetObjectFile.cpp | 2 +- lib/Transforms/Scalar/SampleProfile.cpp | 6 +++--- tools/gold/gold-plugin.cpp | 4 ++-- tools/llc/llc.cpp | 4 ++-- tools/lli/ChildTarget/ChildTarget.cpp | 1 - tools/lli/ChildTarget/Unix/ChildTarget.inc | 2 +- tools/lli/RemoteMemoryManager.h | 3 +-- tools/lli/RemoteTargetExternal.cpp | 2 -- tools/lli/RemoteTargetExternal.h | 8 +++----- tools/lli/Unix/RemoteTargetExternal.inc | 2 +- tools/llvm-lto/llvm-lto.cpp | 2 +- tools/llvm-readobj/ARMEHABIPrinter.h | 1 - tools/llvm-readobj/COFFDumper.cpp | 7 ++----- tools/llvm-readobj/ELFDumper.cpp | 3 +-- tools/llvm-readobj/MachODumper.cpp | 1 - tools/llvm-readobj/ObjDumper.cpp | 2 -- tools/llvm-readobj/StreamWriter.h | 2 +- tools/llvm-readobj/llvm-readobj.cpp | 3 --- tools/llvm-symbolizer/LLVMSymbolize.cpp | 1 - tools/lto/lto.cpp | 4 ++-- 21 files changed, 22 insertions(+), 40 deletions(-) diff --git a/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/lib/ExecutionEngine/MCJIT/MCJIT.cpp index 2d5b59f83f..507dae2e51 100644 --- a/lib/ExecutionEngine/MCJIT/MCJIT.cpp +++ b/lib/ExecutionEngine/MCJIT/MCJIT.cpp @@ -21,8 +21,8 @@ #include "llvm/IR/Mangler.h" #include "llvm/IR/Module.h" #include "llvm/MC/MCAsmInfo.h" -#include "llvm/PassManager.h" #include "llvm/Object/Archive.h" +#include "llvm/PassManager.h" #include "llvm/Support/DynamicLibrary.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MemoryBuffer.h" diff --git a/lib/Target/X86/X86TargetObjectFile.cpp b/lib/Target/X86/X86TargetObjectFile.cpp index dc006130ce..709fc97256 100644 --- a/lib/Target/X86/X86TargetObjectFile.cpp +++ b/lib/Target/X86/X86TargetObjectFile.cpp @@ -8,10 +8,10 @@ //===----------------------------------------------------------------------===// #include "X86TargetObjectFile.h" +#include "llvm/IR/Mangler.h" #include "llvm/MC/MCContext.h" #include "llvm/MC/MCExpr.h" #include "llvm/MC/MCSectionELF.h" -#include "llvm/IR/Mangler.h" #include "llvm/Support/Dwarf.h" using namespace llvm; diff --git a/lib/Transforms/Scalar/SampleProfile.cpp b/lib/Transforms/Scalar/SampleProfile.cpp index 47da32a5f2..bcb0792f91 100644 --- a/lib/Transforms/Scalar/SampleProfile.cpp +++ b/lib/Transforms/Scalar/SampleProfile.cpp @@ -24,15 +24,16 @@ #define DEBUG_TYPE "sample-profile" +#include "llvm/Transforms/Scalar.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/OwningPtr.h" -#include "llvm/ADT/SmallSet.h" #include "llvm/ADT/SmallPtrSet.h" +#include "llvm/ADT/SmallSet.h" #include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringRef.h" #include "llvm/Analysis/Dominators.h" -#include "llvm/Analysis/PostDominators.h" #include "llvm/Analysis/LoopInfo.h" +#include "llvm/Analysis/PostDominators.h" #include "llvm/DebugInfo.h" #include "llvm/IR/Constants.h" #include "llvm/IR/Function.h" @@ -49,7 +50,6 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Regex.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Transforms/Scalar.h" using namespace llvm; diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp index ab721570c9..e194038b7d 100644 --- a/tools/gold/gold-plugin.cpp +++ b/tools/gold/gold-plugin.cpp @@ -13,10 +13,9 @@ //===----------------------------------------------------------------------===// #include "llvm/Config/config.h" // plugin-api.h requires HAVE_STDINT_H -#include #include "llvm-c/lto.h" -#include "llvm/ADT/StringSet.h" #include "llvm/ADT/OwningPtr.h" +#include "llvm/ADT/StringSet.h" #include "llvm/Support/Errno.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/MemoryBuffer.h" @@ -29,6 +28,7 @@ #include #include #include +#include #include // Support Windows/MinGW crazyness. diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp index d1dd6d6a6d..6373d20811 100644 --- a/tools/llc/llc.cpp +++ b/tools/llc/llc.cpp @@ -15,12 +15,12 @@ #include "llvm/ADT/Triple.h" -#include "llvm/IR/IRPrintingPasses.h" -#include "llvm/IR/LLVMContext.h" #include "llvm/CodeGen/CommandFlags.h" #include "llvm/CodeGen/LinkAllAsmWriterComponents.h" #include "llvm/CodeGen/LinkAllCodegenComponents.h" #include "llvm/IR/DataLayout.h" +#include "llvm/IR/IRPrintingPasses.h" +#include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" #include "llvm/IRReader/IRReader.h" #include "llvm/MC/SubtargetFeature.h" diff --git a/tools/lli/ChildTarget/ChildTarget.cpp b/tools/lli/ChildTarget/ChildTarget.cpp index c177a047db..dba8966cf4 100644 --- a/tools/lli/ChildTarget/ChildTarget.cpp +++ b/tools/lli/ChildTarget/ChildTarget.cpp @@ -1,5 +1,4 @@ #include "llvm/Config/config.h" - #include "../RemoteTargetMessage.h" #include #include diff --git a/tools/lli/ChildTarget/Unix/ChildTarget.inc b/tools/lli/ChildTarget/Unix/ChildTarget.inc index cc95810dc8..c71e422c1a 100644 --- a/tools/lli/ChildTarget/Unix/ChildTarget.inc +++ b/tools/lli/ChildTarget/Unix/ChildTarget.inc @@ -12,9 +12,9 @@ // //===----------------------------------------------------------------------===// -#include #include #include +#include #ifdef HAVE_SYS_MMAN_H #include diff --git a/tools/lli/RemoteMemoryManager.h b/tools/lli/RemoteMemoryManager.h index 5d0456f509..b9691f4470 100644 --- a/tools/lli/RemoteMemoryManager.h +++ b/tools/lli/RemoteMemoryManager.h @@ -15,6 +15,7 @@ #ifndef REMOTEMEMORYMANAGER_H #define REMOTEMEMORYMANAGER_H +#include "RemoteTarget.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ExecutionEngine/JITMemoryManager.h" @@ -22,8 +23,6 @@ #include "llvm/Support/Memory.h" #include -#include "RemoteTarget.h" - namespace llvm { class RemoteMemoryManager : public JITMemoryManager { diff --git a/tools/lli/RemoteTargetExternal.cpp b/tools/lli/RemoteTargetExternal.cpp index f8c581d574..809488c9e3 100644 --- a/tools/lli/RemoteTargetExternal.cpp +++ b/tools/lli/RemoteTargetExternal.cpp @@ -13,10 +13,8 @@ //===----------------------------------------------------------------------===// #include "llvm/Config/config.h" - #include "RemoteTarget.h" #include "RemoteTargetExternal.h" - #include "llvm/ADT/StringRef.h" #include "llvm/Support/DataTypes.h" #include "llvm/Support/Memory.h" diff --git a/tools/lli/RemoteTargetExternal.h b/tools/lli/RemoteTargetExternal.h index a4bfad2f12..63548eb52d 100644 --- a/tools/lli/RemoteTargetExternal.h +++ b/tools/lli/RemoteTargetExternal.h @@ -15,18 +15,16 @@ #ifndef LLI_REMOTETARGETEXTERNAL_H #define LLI_REMOTETARGETEXTERNAL_H -#include "llvm/Config/config.h" - +#include "RemoteTarget.h" +#include "RemoteTargetMessage.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" +#include "llvm/Config/config.h" #include "llvm/Support/DataTypes.h" #include "llvm/Support/Memory.h" #include #include -#include "RemoteTarget.h" -#include "RemoteTargetMessage.h" - namespace llvm { class RemoteTargetExternal : public RemoteTarget { diff --git a/tools/lli/Unix/RemoteTargetExternal.inc b/tools/lli/Unix/RemoteTargetExternal.inc index 9c1a4cc315..481c1d5156 100644 --- a/tools/lli/Unix/RemoteTargetExternal.inc +++ b/tools/lli/Unix/RemoteTargetExternal.inc @@ -12,10 +12,10 @@ // //===----------------------------------------------------------------------===// -#include #include #include #include +#include namespace { diff --git a/tools/llvm-lto/llvm-lto.cpp b/tools/llvm-lto/llvm-lto.cpp index 0fc68ae3ad..4a421f9e76 100644 --- a/tools/llvm-lto/llvm-lto.cpp +++ b/tools/llvm-lto/llvm-lto.cpp @@ -20,8 +20,8 @@ #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Signals.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/TargetSelect.h" +#include "llvm/Support/raw_ostream.h" using namespace llvm; diff --git a/tools/llvm-readobj/ARMEHABIPrinter.h b/tools/llvm-readobj/ARMEHABIPrinter.h index 94c35b2e38..6311948a16 100644 --- a/tools/llvm-readobj/ARMEHABIPrinter.h +++ b/tools/llvm-readobj/ARMEHABIPrinter.h @@ -11,7 +11,6 @@ #define LLVM_READOBJ_ARMEHABI_PRINTER_H #include "StreamWriter.h" - #include "llvm/Object/ELF.h" #include "llvm/Object/ELFTypes.h" #include "llvm/Support/ARMEHABI.h" diff --git a/tools/llvm-readobj/COFFDumper.cpp b/tools/llvm-readobj/COFFDumper.cpp index 411846b867..1a6384afa0 100644 --- a/tools/llvm-readobj/COFFDumper.cpp +++ b/tools/llvm-readobj/COFFDumper.cpp @@ -13,25 +13,22 @@ //===----------------------------------------------------------------------===// #include "llvm-readobj.h" -#include "ObjDumper.h" - #include "Error.h" +#include "ObjDumper.h" #include "StreamWriter.h" - #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallString.h" #include "llvm/Object/COFF.h" #include "llvm/Object/ObjectFile.h" +#include "llvm/Support/COFF.h" #include "llvm/Support/Casting.h" #include "llvm/Support/Compiler.h" -#include "llvm/Support/COFF.h" #include "llvm/Support/DataExtractor.h" #include "llvm/Support/Format.h" #include "llvm/Support/SourceMgr.h" #include "llvm/Support/Win64EH.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" - #include #include #include diff --git a/tools/llvm-readobj/ELFDumper.cpp b/tools/llvm-readobj/ELFDumper.cpp index 77405714a4..feb77fd564 100644 --- a/tools/llvm-readobj/ELFDumper.cpp +++ b/tools/llvm-readobj/ELFDumper.cpp @@ -13,11 +13,10 @@ //===----------------------------------------------------------------------===// #include "llvm-readobj.h" +#include "ARMEHABIPrinter.h" #include "Error.h" #include "ObjDumper.h" #include "StreamWriter.h" -#include "ARMEHABIPrinter.h" - #include "llvm/ADT/SmallString.h" #include "llvm/Object/ELFObjectFile.h" #include "llvm/Support/Compiler.h" diff --git a/tools/llvm-readobj/MachODumper.cpp b/tools/llvm-readobj/MachODumper.cpp index b97166b4c1..6626f4082f 100644 --- a/tools/llvm-readobj/MachODumper.cpp +++ b/tools/llvm-readobj/MachODumper.cpp @@ -15,7 +15,6 @@ #include "Error.h" #include "ObjDumper.h" #include "StreamWriter.h" - #include "llvm/ADT/SmallString.h" #include "llvm/Object/MachO.h" #include "llvm/Support/Casting.h" diff --git a/tools/llvm-readobj/ObjDumper.cpp b/tools/llvm-readobj/ObjDumper.cpp index 61f511740a..f500a05815 100644 --- a/tools/llvm-readobj/ObjDumper.cpp +++ b/tools/llvm-readobj/ObjDumper.cpp @@ -13,10 +13,8 @@ //===----------------------------------------------------------------------===// #include "ObjDumper.h" - #include "Error.h" #include "StreamWriter.h" - #include "llvm/ADT/StringRef.h" #include "llvm/Object/ObjectFile.h" #include "llvm/Support/raw_ostream.h" diff --git a/tools/llvm-readobj/StreamWriter.h b/tools/llvm-readobj/StreamWriter.h index 129f6e7933..7771d71ef7 100644 --- a/tools/llvm-readobj/StreamWriter.h +++ b/tools/llvm-readobj/StreamWriter.h @@ -11,8 +11,8 @@ #define LLVM_READOBJ_STREAMWRITER_H #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/StringRef.h" #include "llvm/ADT/SmallVector.h" +#include "llvm/ADT/StringRef.h" #include "llvm/Support/DataTypes.h" #include "llvm/Support/Endian.h" #include "llvm/Support/raw_ostream.h" diff --git a/tools/llvm-readobj/llvm-readobj.cpp b/tools/llvm-readobj/llvm-readobj.cpp index c09be74dc7..2d9f3e50ce 100644 --- a/tools/llvm-readobj/llvm-readobj.cpp +++ b/tools/llvm-readobj/llvm-readobj.cpp @@ -20,11 +20,9 @@ //===----------------------------------------------------------------------===// #include "llvm-readobj.h" - #include "Error.h" #include "ObjDumper.h" #include "StreamWriter.h" - #include "llvm/Object/Archive.h" #include "llvm/Object/ObjectFile.h" #include "llvm/Support/Casting.h" @@ -38,7 +36,6 @@ #include "llvm/Support/TargetRegistry.h" #include "llvm/Support/TargetSelect.h" #include "llvm/Support/system_error.h" - #include diff --git a/tools/llvm-symbolizer/LLVMSymbolize.cpp b/tools/llvm-symbolizer/LLVMSymbolize.cpp index 320ab3fcbc..0e6e80a21b 100644 --- a/tools/llvm-symbolizer/LLVMSymbolize.cpp +++ b/tools/llvm-symbolizer/LLVMSymbolize.cpp @@ -21,7 +21,6 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" - #include #include diff --git a/tools/lto/lto.cpp b/tools/lto/lto.cpp index 7bfddcd9ec..59b778dcc9 100644 --- a/tools/lto/lto.cpp +++ b/tools/lto/lto.cpp @@ -13,11 +13,11 @@ //===----------------------------------------------------------------------===// #include "llvm-c/lto.h" +#include "llvm-c/Core.h" +#include "llvm-c/Target.h" #include "llvm/CodeGen/CommandFlags.h" #include "llvm/LTO/LTOCodeGenerator.h" #include "llvm/LTO/LTOModule.h" -#include "llvm-c/Core.h" -#include "llvm-c/Target.h" // extra command-line flags needed for LTOCodeGenerator static cl::opt -- cgit v1.2.3