From d7bc93eac61ad5c2bc205e1a05e3b10eeade919e Mon Sep 17 00:00:00 2001 From: Eric Liu Date: Fri, 18 May 2018 18:33:08 +0000 Subject: [PATCH] Revert "Move #include manipulation code to new lib/Tooling/Inclusions." This reverts commit r332720. This break build bot with modules. Need to investigate. Revert the change to unbreak bots. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@332751 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Format/Format.h | 2 +- .../Tooling/{Inclusions => Core}/HeaderIncludes.h | 8 ++++---- .../Tooling/{Inclusions => Core}/IncludeStyle.h | 6 +++--- lib/Format/CMakeLists.txt | 1 - lib/Format/Format.cpp | 2 +- lib/Tooling/CMakeLists.txt | 1 - lib/Tooling/Core/CMakeLists.txt | 2 ++ lib/Tooling/{Inclusions => Core}/HeaderIncludes.cpp | 2 +- lib/Tooling/{Inclusions => Core}/IncludeStyle.cpp | 3 ++- lib/Tooling/Inclusions/CMakeLists.txt | 12 ------------ unittests/Tooling/HeaderIncludesTest.cpp | 2 +- 11 files changed, 15 insertions(+), 26 deletions(-) rename include/clang/Tooling/{Inclusions => Core}/HeaderIncludes.h (96%) rename include/clang/Tooling/{Inclusions => Core}/IncludeStyle.h (96%) rename lib/Tooling/{Inclusions => Core}/HeaderIncludes.cpp (99%) rename lib/Tooling/{Inclusions => Core}/IncludeStyle.cpp (95%) delete mode 100644 lib/Tooling/Inclusions/CMakeLists.txt diff --git a/include/clang/Format/Format.h b/include/clang/Format/Format.h index 7565487541..b4d99f0754 100644 --- a/include/clang/Format/Format.h +++ b/include/clang/Format/Format.h @@ -16,8 +16,8 @@ #define LLVM_CLANG_FORMAT_FORMAT_H #include "clang/Basic/LangOptions.h" +#include "clang/Tooling/Core/IncludeStyle.h" #include "clang/Tooling/Core/Replacement.h" -#include "clang/Tooling/Inclusions/IncludeStyle.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/Support/Regex.h" #include diff --git a/include/clang/Tooling/Inclusions/HeaderIncludes.h b/include/clang/Tooling/Core/HeaderIncludes.h similarity index 96% rename from include/clang/Tooling/Inclusions/HeaderIncludes.h rename to include/clang/Tooling/Core/HeaderIncludes.h index d99a328316..1aaa3de441 100644 --- a/include/clang/Tooling/Inclusions/HeaderIncludes.h +++ b/include/clang/Tooling/Core/HeaderIncludes.h @@ -7,12 +7,12 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLING_INCLUSIONS_HEADERINCLUDES_H -#define LLVM_CLANG_TOOLING_INCLUSIONS_HEADERINCLUDES_H +#ifndef LLVM_CLANG_TOOLING_CORE_HEADERINCLUDES_H +#define LLVM_CLANG_TOOLING_CORE_HEADERINCLUDES_H #include "clang/Basic/SourceManager.h" #include "clang/Tooling/Core/Replacement.h" -#include "clang/Tooling/Inclusions/IncludeStyle.h" +#include "clang/Tooling/Core/IncludeStyle.h" #include "llvm/Support/Path.h" #include "llvm/Support/Regex.h" #include @@ -134,4 +134,4 @@ private: } // namespace tooling } // namespace clang -#endif // LLVM_CLANG_TOOLING_INCLUSIONS_HEADERINCLUDES_H +#endif // LLVM_CLANG_TOOLING_CORE_HEADERINCLUDES_H diff --git a/include/clang/Tooling/Inclusions/IncludeStyle.h b/include/clang/Tooling/Core/IncludeStyle.h similarity index 96% rename from include/clang/Tooling/Inclusions/IncludeStyle.h rename to include/clang/Tooling/Core/IncludeStyle.h index 42d6e1a5cf..ed7bd08ce0 100644 --- a/include/clang/Tooling/Inclusions/IncludeStyle.h +++ b/include/clang/Tooling/Core/IncludeStyle.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLING_INCLUSIONS_INCLUDESTYLE_H -#define LLVM_CLANG_TOOLING_INCLUSIONS_INCLUDESTYLE_H +#ifndef LLVM_CLANG_TOOLING_CORE_INCLUDESTYLE_H +#define LLVM_CLANG_TOOLING_CORE_INCLUDESTYLE_H #include "llvm/Support/YAMLTraits.h" #include @@ -130,4 +130,4 @@ struct ScalarEnumerationTraits< } // namespace yaml } // namespace llvm -#endif // LLVM_CLANG_TOOLING_INCLUSIONS_INCLUDESTYLE_H +#endif // LLVM_CLANG_TOOLING_CORE_INCLUDESTYLE_H diff --git a/lib/Format/CMakeLists.txt b/lib/Format/CMakeLists.txt index 0019d045cd..42e6d53d9f 100644 --- a/lib/Format/CMakeLists.txt +++ b/lib/Format/CMakeLists.txt @@ -20,5 +20,4 @@ add_clang_library(clangFormat clangBasic clangLex clangToolingCore - clangToolingInclusions ) diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index d1a5dc8e6c..c6de92b3ca 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -31,7 +31,7 @@ #include "clang/Basic/SourceManager.h" #include "clang/Basic/VirtualFileSystem.h" #include "clang/Lex/Lexer.h" -#include "clang/Tooling/Inclusions/HeaderIncludes.h" +#include "clang/Tooling/Core/HeaderIncludes.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Allocator.h" diff --git a/lib/Tooling/CMakeLists.txt b/lib/Tooling/CMakeLists.txt index 031d8b51de..eaae49b431 100644 --- a/lib/Tooling/CMakeLists.txt +++ b/lib/Tooling/CMakeLists.txt @@ -4,7 +4,6 @@ set(LLVM_LINK_COMPONENTS ) add_subdirectory(Core) -add_subdirectory(Inclusions) add_subdirectory(Refactoring) add_subdirectory(ASTDiff) diff --git a/lib/Tooling/Core/CMakeLists.txt b/lib/Tooling/Core/CMakeLists.txt index f7f423c522..84d17984b4 100644 --- a/lib/Tooling/Core/CMakeLists.txt +++ b/lib/Tooling/Core/CMakeLists.txt @@ -2,6 +2,8 @@ set(LLVM_LINK_COMPONENTS support) add_clang_library(clangToolingCore Diagnostic.cpp + HeaderIncludes.cpp + IncludeStyle.cpp Lookup.cpp Replacement.cpp diff --git a/lib/Tooling/Inclusions/HeaderIncludes.cpp b/lib/Tooling/Core/HeaderIncludes.cpp similarity index 99% rename from lib/Tooling/Inclusions/HeaderIncludes.cpp rename to lib/Tooling/Core/HeaderIncludes.cpp index 99c0866a68..d974d16f01 100644 --- a/lib/Tooling/Inclusions/HeaderIncludes.cpp +++ b/lib/Tooling/Core/HeaderIncludes.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Tooling/Inclusions/HeaderIncludes.h" +#include "clang/Tooling/Core/HeaderIncludes.h" #include "clang/Basic/SourceManager.h" #include "clang/Lex/Lexer.h" diff --git a/lib/Tooling/Inclusions/IncludeStyle.cpp b/lib/Tooling/Core/IncludeStyle.cpp similarity index 95% rename from lib/Tooling/Inclusions/IncludeStyle.cpp rename to lib/Tooling/Core/IncludeStyle.cpp index 3597710f1f..74eec481c2 100644 --- a/lib/Tooling/Inclusions/IncludeStyle.cpp +++ b/lib/Tooling/Core/IncludeStyle.cpp @@ -7,7 +7,8 @@ // //===----------------------------------------------------------------------===// -#include "clang/Tooling/Inclusions/IncludeStyle.h" +#include "clang/Tooling/Core/IncludeStyle.h" + using clang::tooling::IncludeStyle; diff --git a/lib/Tooling/Inclusions/CMakeLists.txt b/lib/Tooling/Inclusions/CMakeLists.txt deleted file mode 100644 index 00afb50f3a..0000000000 --- a/lib/Tooling/Inclusions/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set(LLVM_LINK_COMPONENTS support) - -add_clang_library(clangToolingInclusions - HeaderIncludes.cpp - IncludeStyle.cpp - - LINK_LIBS - clangBasic - clangLex - clangRewrite - clangToolingCore - ) diff --git a/unittests/Tooling/HeaderIncludesTest.cpp b/unittests/Tooling/HeaderIncludesTest.cpp index ff68f75a6e..4407221f8a 100644 --- a/unittests/Tooling/HeaderIncludesTest.cpp +++ b/unittests/Tooling/HeaderIncludesTest.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Tooling/Inclusions/HeaderIncludes.h" +#include "clang/Tooling/Core/HeaderIncludes.h" #include "../Tooling/ReplacementTest.h" #include "../Tooling/RewriterTestContext.h" #include "clang/Format/Format.h" -- 2.50.1