https://github.com/weliveindetail updated
https://github.com/llvm/llvm-project/pull/84174
From 0d7f6a8e72caeada251c661f5804d9766345e052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Gr=C3=A4nitz?= <stefan.graen...@gmail.com>
Date: Wed, 6 Mar 2024 16:46:56 +0100
Subject: [PATCH] [clang-repl] Pass triple to IncrementalCompilerBuilder as
explicit argument
With out-of-process execution the target triple can be different from the one
on the host. We need an interface to configure it.
---
clang/include/clang/Interpreter/Interpreter.h | 5 ++-
clang/lib/Interpreter/Interpreter.cpp | 12 ++++---
clang/unittests/Interpreter/CMakeLists.txt | 1 +
.../IncrementalCompilerBuilderTest.cpp | 35 +++++++++++++++++++
4 files changed, 47 insertions(+), 6 deletions(-)
create mode 100644
clang/unittests/Interpreter/IncrementalCompilerBuilderTest.cpp
diff --git a/clang/include/clang/Interpreter/Interpreter.h
b/clang/include/clang/Interpreter/Interpreter.h
index 292fa566ae7037..c8f932e95c4798 100644
--- a/clang/include/clang/Interpreter/Interpreter.h
+++ b/clang/include/clang/Interpreter/Interpreter.h
@@ -48,6 +48,8 @@ class IncrementalCompilerBuilder {
UserArgs = Args;
}
+ void SetTargetTriple(std::string TT) { TargetTriple = TT; }
+
// General C++
llvm::Expected<std::unique_ptr<CompilerInstance>> CreateCpp();
@@ -62,11 +64,12 @@ class IncrementalCompilerBuilder {
private:
static llvm::Expected<std::unique_ptr<CompilerInstance>>
- create(std::vector<const char *> &ClangArgv);
+ create(std::string TT, std::vector<const char *> &ClangArgv);
llvm::Expected<std::unique_ptr<CompilerInstance>> createCuda(bool device);
std::vector<const char *> UserArgs;
+ std::optional<std::string> TargetTriple;
llvm::StringRef OffloadArch;
llvm::StringRef CudaSDKPath;
diff --git a/clang/lib/Interpreter/Interpreter.cpp
b/clang/lib/Interpreter/Interpreter.cpp
index 9f97a3c6b0be9e..37696b28976428 100644
--- a/clang/lib/Interpreter/Interpreter.cpp
+++ b/clang/lib/Interpreter/Interpreter.cpp
@@ -132,7 +132,8 @@ CreateCI(const llvm::opt::ArgStringList &Argv) {
} // anonymous namespace
llvm::Expected<std::unique_ptr<CompilerInstance>>
-IncrementalCompilerBuilder::create(std::vector<const char *> &ClangArgv) {
+IncrementalCompilerBuilder::create(std::string TT,
+ std::vector<const char *> &ClangArgv) {
// If we don't know ClangArgv0 or the address of main() at this point, try
// to guess it anyway (it's possible on some platforms).
@@ -162,8 +163,7 @@ IncrementalCompilerBuilder::create(std::vector<const char
*> &ClangArgv) {
TextDiagnosticBuffer *DiagsBuffer = new TextDiagnosticBuffer;
DiagnosticsEngine Diags(DiagID, &*DiagOpts, DiagsBuffer);
- driver::Driver Driver(/*MainBinaryName=*/ClangArgv[0],
- llvm::sys::getProcessTriple(), Diags);
+ driver::Driver Driver(/*MainBinaryName=*/ClangArgv[0], TT, Diags);
Driver.setCheckInputsExist(false); // the input comes from mem buffers
llvm::ArrayRef<const char *> RF = llvm::ArrayRef(ClangArgv);
std::unique_ptr<driver::Compilation>
Compilation(Driver.BuildCompilation(RF));
@@ -185,7 +185,8 @@ IncrementalCompilerBuilder::CreateCpp() {
Argv.push_back("-xc++");
Argv.insert(Argv.end(), UserArgs.begin(), UserArgs.end());
- return IncrementalCompilerBuilder::create(Argv);
+ std::string TT = TargetTriple ? *TargetTriple :
llvm::sys::getProcessTriple();
+ return IncrementalCompilerBuilder::create(TT, Argv);
}
llvm::Expected<std::unique_ptr<CompilerInstance>>
@@ -213,7 +214,8 @@ IncrementalCompilerBuilder::createCuda(bool device) {
Argv.insert(Argv.end(), UserArgs.begin(), UserArgs.end());
- return IncrementalCompilerBuilder::create(Argv);
+ std::string TT = TargetTriple ? *TargetTriple :
llvm::sys::getProcessTriple();
+ return IncrementalCompilerBuilder::create(TT, Argv);
}
llvm::Expected<std::unique_ptr<CompilerInstance>>
diff --git a/clang/unittests/Interpreter/CMakeLists.txt
b/clang/unittests/Interpreter/CMakeLists.txt
index 712641afb976dd..0ddedb283e07d1 100644
--- a/clang/unittests/Interpreter/CMakeLists.txt
+++ b/clang/unittests/Interpreter/CMakeLists.txt
@@ -7,6 +7,7 @@ set(LLVM_LINK_COMPONENTS
)
add_clang_unittest(ClangReplInterpreterTests
+ IncrementalCompilerBuilderTest.cpp
IncrementalProcessingTest.cpp
InterpreterTest.cpp
CodeCompletionTest.cpp
diff --git a/clang/unittests/Interpreter/IncrementalCompilerBuilderTest.cpp
b/clang/unittests/Interpreter/IncrementalCompilerBuilderTest.cpp
new file mode 100644
index 00000000000000..1cc0223465c8fa
--- /dev/null
+++ b/clang/unittests/Interpreter/IncrementalCompilerBuilderTest.cpp
@@ -0,0 +1,35 @@
+//=== unittests/Interpreter/IncrementalCompilerBuilderTest.cpp
------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "clang/Basic/TargetOptions.h"
+#include "clang/Frontend/CompilerInstance.h"
+#include "clang/Interpreter/Interpreter.h"
+#include "llvm/Support/Error.h"
+#include "gtest/gtest.h"
+
+using namespace llvm;
+using namespace clang;
+
+namespace {
+
+TEST(IncrementalCompilerBuilder, SetCompilerArgs) {
+ std::vector<const char *> ClangArgv = {"-Xclang", "-ast-dump-all"};
+ auto CB = clang::IncrementalCompilerBuilder();
+ CB.SetCompilerArgs(ClangArgv);
+ auto CI = cantFail(CB.CreateCpp());
+ EXPECT_TRUE(CI->getFrontendOpts().ASTDumpAll);
+}
+
+TEST(IncrementalCompilerBuilder, SetTargetTriple) {
+ auto CB = clang::IncrementalCompilerBuilder();
+ CB.SetTargetTriple("armv6-none-eabi");
+ auto CI = cantFail(CB.CreateCpp());
+ EXPECT_EQ(CI->getTargetOpts().Triple, "armv6-none-unknown-eabi");
+}
+
+} // end anonymous namespace
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
