From b99083e60325a28063fb588f458a871151971fdc Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Wed, 2 Jan 2013 10:28:36 +0000 Subject: [PATCH] Re-sort #include lines using the llvm/utils/sort_includes.py script. Removes a duplicate #include as well as cleaning up some sort order regressions since I last ran the script over Clang. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@171364 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Frontend/MultiplexConsumer.h | 1 - lib/CodeGen/BackendUtil.cpp | 2 +- lib/CodeGen/CGOpenCLRuntime.cpp | 2 +- lib/Format/Format.cpp | 3 +-- lib/StaticAnalyzer/Core/PlistDiagnostics.cpp | 2 +- lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp | 2 +- tools/libclang/CIndexCodeCompletion.cpp | 1 - tools/libclang/CXComment.cpp | 4 ++-- tools/libclang/Indexing.cpp | 4 ++-- 9 files changed, 9 insertions(+), 12 deletions(-) diff --git a/include/clang/Frontend/MultiplexConsumer.h b/include/clang/Frontend/MultiplexConsumer.h index 80f3e37258..6ea7547c71 100644 --- a/include/clang/Frontend/MultiplexConsumer.h +++ b/include/clang/Frontend/MultiplexConsumer.h @@ -15,7 +15,6 @@ #ifndef CLANG_FRONTEND_MULTIPLEXCONSUMER_H #define CLANG_FRONTEND_MULTIPLEXCONSUMER_H -#include "clang/Basic/LLVM.h" #include "clang/Basic/LLVM.h" #include "clang/Sema/SemaConsumer.h" #include "llvm/ADT/OwningPtr.h" diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp index 4568a2c1c9..f9d3a178d9 100644 --- a/lib/CodeGen/BackendUtil.cpp +++ b/lib/CodeGen/BackendUtil.cpp @@ -22,7 +22,6 @@ #include "llvm/MC/SubtargetFeature.h" #include "llvm/Module.h" #include "llvm/PassManager.h" -#include "llvm/TargetTransformInfo.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FormattedStream.h" #include "llvm/Support/PrettyStackTrace.h" @@ -32,6 +31,7 @@ #include "llvm/Target/TargetLibraryInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" +#include "llvm/TargetTransformInfo.h" #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/IPO/PassManagerBuilder.h" #include "llvm/Transforms/Instrumentation.h" diff --git a/lib/CodeGen/CGOpenCLRuntime.cpp b/lib/CodeGen/CGOpenCLRuntime.cpp index 6052c51e22..c6d74decb2 100644 --- a/lib/CodeGen/CGOpenCLRuntime.cpp +++ b/lib/CodeGen/CGOpenCLRuntime.cpp @@ -15,8 +15,8 @@ #include "CGOpenCLRuntime.h" #include "CodeGenFunction.h" -#include "llvm/GlobalValue.h" #include "llvm/DerivedTypes.h" +#include "llvm/GlobalValue.h" #include using namespace clang; diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index b304e2bf3d..49913aee2e 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -18,10 +18,9 @@ #include "clang/Format/Format.h" #include "UnwrappedLineParser.h" -#include "clang/Basic/SourceManager.h" #include "clang/Basic/OperatorPrecedence.h" +#include "clang/Basic/SourceManager.h" #include "clang/Lex/Lexer.h" - #include namespace clang { diff --git a/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp b/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp index 28266728a1..326b624d5e 100644 --- a/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp +++ b/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp @@ -12,12 +12,12 @@ //===----------------------------------------------------------------------===// #include "clang/StaticAnalyzer/Core/AnalyzerOptions.h" -#include "clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h" #include "clang/Basic/FileManager.h" #include "clang/Basic/SourceManager.h" #include "clang/Basic/Version.h" #include "clang/Lex/Preprocessor.h" #include "clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h" +#include "clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Support/Casting.h" diff --git a/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp b/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp index 07aa5b074a..c2c5256d9c 100644 --- a/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp +++ b/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp @@ -37,9 +37,9 @@ #include "clang/StaticAnalyzer/Frontend/CheckerRegistration.h" #include "llvm/ADT/DepthFirstIterator.h" #include "llvm/ADT/OwningPtr.h" +#include "llvm/ADT/PostOrderIterator.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/Statistic.h" -#include "llvm/ADT/PostOrderIterator.h" #include "llvm/Support/Path.h" #include "llvm/Support/Program.h" #include "llvm/Support/Timer.h" diff --git a/tools/libclang/CIndexCodeCompletion.cpp b/tools/libclang/CIndexCodeCompletion.cpp index c1ee6097c9..df3ed9044c 100644 --- a/tools/libclang/CIndexCodeCompletion.cpp +++ b/tools/libclang/CIndexCodeCompletion.cpp @@ -16,7 +16,6 @@ #include "CIndexDiagnostic.h" #include "CXCursor.h" #include "CXString.h" -#include "CXString.h" #include "CXTranslationUnit.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclObjC.h" diff --git a/tools/libclang/CXComment.cpp b/tools/libclang/CXComment.cpp index 754f79612b..d831885e27 100644 --- a/tools/libclang/CXComment.cpp +++ b/tools/libclang/CXComment.cpp @@ -20,12 +20,12 @@ #include "clang/AST/CommentVisitor.h" #include "clang/AST/Decl.h" #include "clang/AST/PrettyPrinter.h" +#include "clang/Format/Format.h" +#include "clang/Lex/Lexer.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" -#include "clang/Format/Format.h" -#include "clang/Lex/Lexer.h" #include using namespace clang; diff --git a/tools/libclang/Indexing.cpp b/tools/libclang/Indexing.cpp index df6f7be9fa..e3c2470036 100644 --- a/tools/libclang/Indexing.cpp +++ b/tools/libclang/Indexing.cpp @@ -21,10 +21,10 @@ #include "clang/Frontend/CompilerInvocation.h" #include "clang/Frontend/FrontendAction.h" #include "clang/Frontend/Utils.h" +#include "clang/Lex/HeaderSearch.h" #include "clang/Lex/PPCallbacks.h" -#include "clang/Lex/Preprocessor.h" #include "clang/Lex/PPConditionalDirectiveRecord.h" -#include "clang/Lex/HeaderSearch.h" +#include "clang/Lex/Preprocessor.h" #include "clang/Sema/SemaConsumer.h" #include "llvm/Support/CrashRecoveryContext.h" #include "llvm/Support/MemoryBuffer.h" -- 2.40.0