[clang-tools-extra] 2f79acb - [clangd] Unbreak mac build differently 0c96a92d8666b8

[Nico Weber via cfe-commits]

Author: Nico Weber
Date: 2021-07-01T10:51:27-04:00
New Revision: 2f79acb7b701c41494abff588b5f03a74ea2e11d

URL: https://github.com/llvm/llvm-project/commit/2f79acb7b701c41494abff588b5f03a74ea2e11d
DIFF: https://github.com/llvm/llvm-project/commit/2f79acb7b701c41494abff588b5f03a74ea2e11d.diff

LOG: [clangd] Unbreak mac build differently 0c96a92d8666b8

This reverts b56e5f8a10c1 (and follow-up f6db88535cb) and instead
restores the state we had before 0c96a92d8666b8: ClangdMain.cpp
includes Features.inc before including Transport.h.

This is a bit ugly, but it matches the former state and making Transport.h
include Features.h means that xpc/ needs to be able to find the generated
Features.inc, wich is also a bit ugly.

Added: 
    

Modified: 
    clang-tools-extra/clangd/Transport.h
    clang-tools-extra/clangd/tool/ClangdMain.cpp
    llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clangd/Transport.h b/clang-tools-extra/clangd/Transport.h
index b3db4eba85f93..ae6da722d91b1 100644
--- a/clang-tools-extra/clangd/Transport.h
+++ b/clang-tools-extra/clangd/Transport.h
@@ -18,7 +18,6 @@
 #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_TRANSPORT_H_
 #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_TRANSPORT_H_
 
-#include "Features.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/JSON.h"
 #include "llvm/Support/raw_ostream.h"

diff  --git a/clang-tools-extra/clangd/tool/ClangdMain.cpp b/clang-tools-extra/clangd/tool/ClangdMain.cpp
index 8db52c65061c8..c03dd927970d4 100644
--- a/clang-tools-extra/clangd/tool/ClangdMain.cpp
+++ b/clang-tools-extra/clangd/tool/ClangdMain.cpp
@@ -6,11 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+// Must be before Transport.h include.
+#include "Features.h"
+
 #include "ClangdLSPServer.h"
 #include "CodeComplete.h"
 #include "Config.h"
 #include "ConfigProvider.h"
-#include "Features.h"
 #include "PathMapping.h"
 #include "Protocol.h"
 #include "TidyProvider.h"

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn
index 921e0dbedeb54..0d375392ae257 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn
@@ -16,7 +16,6 @@ static_library("transport") {
   deps = [
     ":conversions",
     "//clang-tools-extra/clangd",
-    "//clang-tools-extra/clangd:features",
     "//clang-tools-extra/clangd/support",
     "//llvm/lib/Support",
   ]