Permalink
Browse files

Sort the #include lines for tools/...

Again, tools are trickier to pick the main module header for than
library source files. I've started to follow the pattern of using
LLVMContext.h when it is included as a stub for program source files.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169252 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information...
1 parent 4ffd89f commit f010c464a11444733ec67e31aace8bcebeaf2588 @chandlerc chandlerc committed Dec 4, 2012
Showing with 208 additions and 222 deletions.
  1. +2 −2 tools/bugpoint/BugDriver.cpp
  2. +1 −1 tools/bugpoint/BugDriver.h
  3. +6 −6 tools/bugpoint/CrashDebugger.cpp
  4. +8 −8 tools/bugpoint/ExtractFunction.cpp
  5. +3 −3 tools/bugpoint/ListReducer.h
  6. +3 −3 tools/bugpoint/Miscompilation.cpp
  7. +5 −5 tools/bugpoint/OptimizerDriver.cpp
  8. +2 −2 tools/bugpoint/ToolRunner.cpp
  9. +1 −1 tools/bugpoint/ToolRunner.h
  10. +3 −3 tools/bugpoint/bugpoint.cpp
  11. +3 −6 tools/gold/gold-plugin.cpp
  12. +7 −7 tools/llc/llc.cpp
  13. +1 −1 tools/lli/RemoteTarget.h
  14. +9 −9 tools/lli/lli.cpp
  15. +4 −4 tools/llvm-ar/llvm-ar.cpp
  16. +3 −3 tools/llvm-as/llvm-as.cpp
  17. +2 −3 tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
  18. +1 −2 tools/llvm-diff/DiffConsumer.cpp
  19. +2 −3 tools/llvm-diff/DiffConsumer.h
  20. +1 −2 tools/llvm-diff/DiffLog.cpp
  21. +5 −7 tools/llvm-diff/DifferenceEngine.cpp
  22. +2 −3 tools/llvm-diff/DifferenceEngine.h
  23. +4 −6 tools/llvm-diff/llvm-diff.cpp
  24. +5 −5 tools/llvm-dis/llvm-dis.cpp
  25. +2 −2 tools/llvm-dwarfdump/llvm-dwarfdump.cpp
  26. +8 −8 tools/llvm-extract/llvm-extract.cpp
  27. +2 −2 tools/llvm-jitlistener/llvm-jitlistener.cpp
  28. +6 −6 tools/llvm-link/llvm-link.cpp
  29. +2 −2 tools/llvm-mc/Disassembler.cpp
  30. +8 −8 tools/llvm-mc/llvm-mc.cpp
  31. +4 −4 tools/llvm-nm/llvm-nm.cpp
  32. +3 −3 tools/llvm-objdump/MachODump.cpp
  33. +4 −4 tools/llvm-objdump/llvm-objdump.cpp
  34. +7 −7 tools/llvm-prof/llvm-prof.cpp
  35. +3 −3 tools/llvm-ranlib/llvm-ranlib.cpp
  36. +6 −6 tools/llvm-readobj/llvm-readobj.cpp
  37. +3 −3 tools/llvm-rtdyld/llvm-rtdyld.cpp
  38. +1 −1 tools/llvm-size/llvm-size.cpp
  39. +8 −8 tools/llvm-stress/llvm-stress.cpp
  40. +0 −1 tools/llvm-symbolizer/llvm-symbolizer.cpp
  41. +16 −16 tools/lto/LTOCodeGenerator.cpp
  42. +3 −3 tools/lto/LTOCodeGenerator.h
  43. +6 −6 tools/lto/LTOModule.cpp
  44. +5 −5 tools/lto/LTOModule.h
  45. +2 −3 tools/lto/lto.cpp
  46. +1 −1 tools/opt/AnalysisWrappers.cpp
  47. +3 −3 tools/opt/GraphPrinters.cpp
  48. +3 −3 tools/opt/PrintSCC.cpp
  49. +19 −19 tools/opt/opt.cpp
@@ -18,12 +18,12 @@
#include "llvm/Linker.h"
#include "llvm/Module.h"
#include "llvm/Pass.h"
-#include "llvm/Support/IRReader.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileUtilities.h"
+#include "llvm/Support/Host.h"
+#include "llvm/Support/IRReader.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/Host.h"
#include <memory>
using namespace llvm;
@@ -18,8 +18,8 @@
#include "llvm/ADT/ValueMap.h"
#include "llvm/Transforms/Utils/ValueMapper.h"
-#include <vector>
#include <string>
+#include <vector>
namespace llvm {
@@ -12,22 +12,22 @@
//===----------------------------------------------------------------------===//
#include "BugDriver.h"
-#include "ToolRunner.h"
#include "ListReducer.h"
+#include "ToolRunner.h"
+#include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/Analysis/Verifier.h"
#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
#include "llvm/Instructions.h"
#include "llvm/Module.h"
#include "llvm/Pass.h"
#include "llvm/PassManager.h"
-#include "llvm/ValueSymbolTable.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/Analysis/Verifier.h"
#include "llvm/Support/CFG.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Utils/Cloning.h"
-#include "llvm/Support/FileUtilities.h"
-#include "llvm/Support/CommandLine.h"
+#include "llvm/ValueSymbolTable.h"
#include <set>
using namespace llvm;
@@ -13,25 +13,25 @@
//===----------------------------------------------------------------------===//
#include "BugDriver.h"
+#include "llvm/Analysis/Verifier.h"
+#include "llvm/Assembly/Writer.h"
#include "llvm/Constants.h"
#include "llvm/DataLayout.h"
#include "llvm/DerivedTypes.h"
#include "llvm/LLVMContext.h"
#include "llvm/Module.h"
-#include "llvm/PassManager.h"
#include "llvm/Pass.h"
-#include "llvm/Analysis/Verifier.h"
-#include "llvm/Assembly/Writer.h"
-#include "llvm/Transforms/IPO.h"
-#include "llvm/Transforms/Scalar.h"
-#include "llvm/Transforms/Utils/Cloning.h"
-#include "llvm/Transforms/Utils/CodeExtractor.h"
+#include "llvm/PassManager.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FileUtilities.h"
-#include "llvm/Support/ToolOutputFile.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Signals.h"
+#include "llvm/Support/ToolOutputFile.h"
+#include "llvm/Transforms/IPO.h"
+#include "llvm/Transforms/Scalar.h"
+#include "llvm/Transforms/Utils/Cloning.h"
+#include "llvm/Transforms/Utils/CodeExtractor.h"
#include <set>
using namespace llvm;
@@ -15,11 +15,11 @@
#ifndef BUGPOINT_LIST_REDUCER_H
#define BUGPOINT_LIST_REDUCER_H
-#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/ErrorHandling.h"
-#include <vector>
-#include <cstdlib>
+#include "llvm/Support/raw_ostream.h"
#include <algorithm>
+#include <cstdlib>
+#include <vector>
namespace llvm {
@@ -15,17 +15,17 @@
#include "BugDriver.h"
#include "ListReducer.h"
#include "ToolRunner.h"
+#include "llvm/Analysis/Verifier.h"
+#include "llvm/Config/config.h" // for HAVE_LINK_R
#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
#include "llvm/Instructions.h"
#include "llvm/Linker.h"
#include "llvm/Module.h"
#include "llvm/Pass.h"
-#include "llvm/Analysis/Verifier.h"
-#include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileUtilities.h"
-#include "llvm/Config/config.h" // for HAVE_LINK_R
+#include "llvm/Transforms/Utils/Cloning.h"
using namespace llvm;
namespace llvm {
@@ -16,18 +16,18 @@
//===----------------------------------------------------------------------===//
#include "BugDriver.h"
+#include "llvm/Analysis/Verifier.h"
+#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/DataLayout.h"
#include "llvm/Module.h"
#include "llvm/PassManager.h"
-#include "llvm/Analysis/Verifier.h"
-#include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/SystemUtils.h"
#include "llvm/Support/Debug.h"
-#include "llvm/Support/ToolOutputFile.h"
+#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Program.h"
+#include "llvm/Support/SystemUtils.h"
+#include "llvm/Support/ToolOutputFile.h"
#define DONT_GET_PLUGIN_LOADER_OPTION
#include "llvm/Support/PluginLoader.h"
@@ -13,12 +13,12 @@
#define DEBUG_TYPE "toolrunner"
#include "ToolRunner.h"
-#include "llvm/Support/Program.h"
+#include "llvm/Config/config.h" // for HAVE_LINK_R
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FileUtilities.h"
+#include "llvm/Support/Program.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/Config/config.h" // for HAVE_LINK_R
#include <fstream>
#include <sstream>
using namespace llvm;
@@ -20,8 +20,8 @@
#include "llvm/ADT/Triple.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/SystemUtils.h"
#include "llvm/Support/Path.h"
+#include "llvm/Support/SystemUtils.h"
#include <exception>
#include <vector>
@@ -15,18 +15,18 @@
#include "BugDriver.h"
#include "ToolRunner.h"
-#include "llvm/LinkAllPasses.h"
#include "llvm/LLVMContext.h"
+#include "llvm/LinkAllPasses.h"
+#include "llvm/LinkAllVMCore.h"
#include "llvm/PassManager.h"
-#include "llvm/Support/PassNameParser.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/PassNameParser.h"
#include "llvm/Support/PluginLoader.h"
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/Process.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/Valgrind.h"
-#include "llvm/LinkAllVMCore.h"
#include "llvm/Transforms/IPO/PassManagerBuilder.h"
//Enable this macro to debug bugpoint itself.
@@ -14,17 +14,14 @@
#include "llvm/Config/config.h" // plugin-api.h requires HAVE_STDINT_H
#include "plugin-api.h"
-
#include "llvm-c/lto.h"
-
#include "llvm/ADT/OwningPtr.h"
-#include "llvm/Support/system_error.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/ToolOutputFile.h"
#include "llvm/Support/Errno.h"
+#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Program.h"
-
+#include "llvm/Support/ToolOutputFile.h"
+#include "llvm/Support/system_error.h"
#include <cerrno>
#include <cstdlib>
#include <cstring>
View
@@ -14,28 +14,28 @@
//===----------------------------------------------------------------------===//
#include "llvm/LLVMContext.h"
-#include "llvm/DataLayout.h"
-#include "llvm/Module.h"
-#include "llvm/PassManager.h"
-#include "llvm/Pass.h"
#include "llvm/ADT/Triple.h"
#include "llvm/Assembly/PrintModulePass.h"
-#include "llvm/Support/IRReader.h"
#include "llvm/CodeGen/CommandFlags.h"
#include "llvm/CodeGen/LinkAllAsmWriterComponents.h"
#include "llvm/CodeGen/LinkAllCodegenComponents.h"
+#include "llvm/DataLayout.h"
#include "llvm/MC/SubtargetFeature.h"
+#include "llvm/Module.h"
+#include "llvm/Pass.h"
+#include "llvm/PassManager.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FormattedStream.h"
+#include "llvm/Support/Host.h"
+#include "llvm/Support/IRReader.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PluginLoader.h"
#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/ToolOutputFile.h"
-#include "llvm/Support/Host.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/TargetRegistry.h"
#include "llvm/Support/TargetSelect.h"
+#include "llvm/Support/ToolOutputFile.h"
#include "llvm/Target/TargetLibraryInfo.h"
#include "llvm/Target/TargetMachine.h"
#include <memory>
View
@@ -15,8 +15,8 @@
#ifndef REMOTEPROCESS_H
#define REMOTEPROCESS_H
-#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/StringRef.h"
#include "llvm/Support/DataTypes.h"
#include "llvm/Support/Memory.h"
#include <stdlib.h>
View
@@ -14,11 +14,9 @@
//===----------------------------------------------------------------------===//
#define DEBUG_TYPE "lli"
+#include "llvm/LLVMContext.h"
#include "RecordingMemoryManager.h"
#include "RemoteTarget.h"
-#include "llvm/LLVMContext.h"
-#include "llvm/Module.h"
-#include "llvm/Type.h"
#include "llvm/ADT/Triple.h"
#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/CodeGen/LinkAllCodegenComponents.h"
@@ -29,21 +27,23 @@
#include "llvm/ExecutionEngine/JITMemoryManager.h"
#include "llvm/ExecutionEngine/MCJIT.h"
#include "llvm/ExecutionEngine/SectionMemoryManager.h"
+#include "llvm/Module.h"
#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/DynamicLibrary.h"
+#include "llvm/Support/Format.h"
#include "llvm/Support/IRReader.h"
#include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/MathExtras.h"
+#include "llvm/Support/Memory.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/PluginLoader.h"
#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/Format.h"
#include "llvm/Support/Process.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/DynamicLibrary.h"
-#include "llvm/Support/Memory.h"
-#include "llvm/Support/MathExtras.h"
+#include "llvm/Support/raw_ostream.h"
+#include "llvm/Type.h"
#include <cerrno>
#ifdef __CYGWIN__
@@ -13,19 +13,19 @@
//===----------------------------------------------------------------------===//
#include "llvm/LLVMContext.h"
-#include "llvm/Module.h"
#include "llvm/Bitcode/Archive.h"
+#include "llvm/Module.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/Format.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Signals.h"
+#include "llvm/Support/raw_ostream.h"
#include <algorithm>
#include <cstdlib>
-#include <memory>
#include <fstream>
+#include <memory>
using namespace llvm;
// Option for compatibility with AIX, not used but must allow it to be present.
@@ -16,17 +16,17 @@
//===----------------------------------------------------------------------===//
#include "llvm/LLVMContext.h"
-#include "llvm/Module.h"
-#include "llvm/Assembly/Parser.h"
#include "llvm/Analysis/Verifier.h"
+#include "llvm/Assembly/Parser.h"
#include "llvm/Bitcode/ReaderWriter.h"
+#include "llvm/Module.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PrettyStackTrace.h"
+#include "llvm/Support/Signals.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/SystemUtils.h"
#include "llvm/Support/ToolOutputFile.h"
-#include "llvm/Support/Signals.h"
#include <memory>
using namespace llvm;
@@ -37,12 +37,11 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Signals.h"
+#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/system_error.h"
-
-#include <map>
#include <algorithm>
+#include <map>
using namespace llvm;
static cl::opt<std::string>
@@ -12,9 +12,8 @@
//===----------------------------------------------------------------------===//
#include "DiffConsumer.h"
-
-#include "llvm/Module.h"
#include "llvm/Instructions.h"
+#include "llvm/Module.h"
#include "llvm/Support/ErrorHandling.h"
using namespace llvm;
@@ -15,12 +15,11 @@
#define _LLVM_DIFFCONSUMER_H_
#include "DiffLog.h"
-
-#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Casting.h"
+#include "llvm/Support/raw_ostream.h"
namespace llvm {
class Module;
Oops, something went wrong.

0 comments on commit f010c46

Please sign in to comment.