Author: kadircet
Date: Wed Jun 26 00:39:14 2019
New Revision: 364387
URL: http://llvm.org/viewvc/llvm-project?rev=364387&view=rev
Log:
[clangd] Link and initialize target infos
Added:
clang-tools-extra/trunk/clangd/test/target_info.test
Modified:
clang-tools-extra/trunk/clangd/CMakeLists.txt
clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp
Modified: clang-tools-extra/trunk/clangd/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/CMakeLists.txt?rev=364387&r1=364386&r2=364387&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/CMakeLists.txt (original)
+++ clang-tools-extra/trunk/clangd/CMakeLists.txt Wed Jun 26 00:39:14 2019
@@ -21,6 +21,7 @@ configure_file(
set(LLVM_LINK_COMPONENTS
Support
+ AllTargetsInfos
)
if(CLANG_BUILT_STANDALONE)
Added: clang-tools-extra/trunk/clangd/test/target_info.test
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/test/target_info.test?rev=364387&view=auto
==============================================================================
--- clang-tools-extra/trunk/clangd/test/target_info.test (added)
+++ clang-tools-extra/trunk/clangd/test/target_info.test Wed Jun 26 00:39:14
2019
@@ -0,0 +1,34 @@
+# Mock 'compile_commands.json' to contain a driver name targeting fuchsia OS.
+# Afterwards check that correct target is passed into clang.
+
+# RUN: rm -rf %t.dir && mkdir -p %t.dir
+
+# RUN: echo '[{"directory": "%/t.dir", "command":
"%/t.dir/x86_64-fuchsia-clang -x c++ the-file.cpp -v", "file":
"the-file.cpp"}]' > %t.dir/compile_commands.json
+
+# RUN: sed -e "s|INPUT_DIR|%/t.dir|g" %s > %t.test.1
+# On Windows, we need the URI in didOpen to look like "uri":"file:///C:/..."
+# (with the extra slash in the front), so we add it here.
+# RUN: sed -e "s|file://\([A-Z]\):/|file:///\1:/|g" %t.test.1 > %t.test
+
+# RUN: clangd -lit-test < %t.test 2>&1 | FileCheck -strict-whitespace %t.test
+{"jsonrpc":"2.0","id":0,"method":"initialize","params":{}}
+---
+{
+ "jsonrpc":"2.0",
+ "method":"textDocument/didOpen",
+ "params": {
+ "textDocument": {
+ "uri": "file://INPUT_DIR/the-file.cpp",
+ "languageId":"cpp",
+ "version":1,
+ "text":""
+ }
+ }
+}
+# Make sure we have target passed into cc1 driver, which is printed due to -v
in
+# the compile_commands.json
+# CHECK: Target: x86_64-unknown-fuchsia
+---
+{"jsonrpc":"2.0","id":10000,"method":"shutdown"}
+---
+{"jsonrpc":"2.0","method":"exit"}
Modified: clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp?rev=364387&r1=364386&r2=364387&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp (original)
+++ clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp Wed Jun 26 00:39:14 2019
@@ -24,6 +24,7 @@
#include "llvm/Support/Path.h"
#include "llvm/Support/Program.h"
#include "llvm/Support/Signals.h"
+#include "llvm/Support/TargetSelect.h"
#include "llvm/Support/raw_ostream.h"
#include <cstdlib>
#include <iostream>
@@ -329,6 +330,7 @@ int main(int argc, char *argv[]) {
using namespace clang;
using namespace clang::clangd;
+ llvm::InitializeAllTargetInfos();
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
llvm::cl::SetVersionPrinter([](llvm::raw_ostream &OS) {
OS << clang::getClangToolFullVersion("clangd") << "\n";
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
