https://github.com/anutosh491 updated
https://github.com/llvm/llvm-project/pull/133037
>From dfe49e826705a5e9371e17e66e40c31602beea8e Mon Sep 17 00:00:00 2001
From: anutosh491 <andersonbhat...@gmail.com>
Date: Wed, 26 Mar 2025 10:33:37 +0530
Subject: [PATCH 1/4] Implement LoadDynamicLibrary for clang-repl wasm use
cases
---
clang/lib/Interpreter/Interpreter.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/clang/lib/Interpreter/Interpreter.cpp
b/clang/lib/Interpreter/Interpreter.cpp
index fa4c1439c9261..b4c68f340abc0 100644
--- a/clang/lib/Interpreter/Interpreter.cpp
+++ b/clang/lib/Interpreter/Interpreter.cpp
@@ -18,6 +18,7 @@
#include "llvm/Support/VirtualFileSystem.h"
#ifdef __EMSCRIPTEN__
#include "Wasm.h"
+#include <dlfcn.h>
#endif // __EMSCRIPTEN__
#include "clang/AST/ASTConsumer.h"
@@ -711,6 +712,14 @@ llvm::Error Interpreter::Undo(unsigned N) {
}
llvm::Error Interpreter::LoadDynamicLibrary(const char *name) {
+#ifdef __EMSCRIPTEN__
+ void* handle = dlopen(name, RTLD_NOW | RTLD_GLOBAL);
+ if (!handle) {
+ llvm::errs() << dlerror() << '\n';
+ return llvm::make_error<llvm::StringError>(
+ "Failed to load dynamic library", llvm::inconvertibleErrorCode());
+ }
+#else
auto EE = getExecutionEngine();
if (!EE)
return EE.takeError();
@@ -722,6 +731,7 @@ llvm::Error Interpreter::LoadDynamicLibrary(const char
*name) {
EE->getMainJITDylib().addGenerator(std::move(*DLSG));
else
return DLSG.takeError();
+#endif
return llvm::Error::success();
}
>From cb274780d84c5355c4aede7b8fe7501dc300bc02 Mon Sep 17 00:00:00 2001
From: anutosh491 <andersonbhat...@gmail.com>
Date: Wed, 26 Mar 2025 11:14:06 +0530
Subject: [PATCH 2/4] formatting
---
clang/lib/Interpreter/Interpreter.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/clang/lib/Interpreter/Interpreter.cpp
b/clang/lib/Interpreter/Interpreter.cpp
index b4c68f340abc0..f8c8d0a425659 100644
--- a/clang/lib/Interpreter/Interpreter.cpp
+++ b/clang/lib/Interpreter/Interpreter.cpp
@@ -713,11 +713,11 @@ llvm::Error Interpreter::Undo(unsigned N) {
llvm::Error Interpreter::LoadDynamicLibrary(const char *name) {
#ifdef __EMSCRIPTEN__
- void* handle = dlopen(name, RTLD_NOW | RTLD_GLOBAL);
+ void *handle = dlopen(name, RTLD_NOW | RTLD_GLOBAL);
if (!handle) {
llvm::errs() << dlerror() << '\n';
- return llvm::make_error<llvm::StringError>(
- "Failed to load dynamic library", llvm::inconvertibleErrorCode());
+ return llvm::make_error<llvm::StringError>("Failed to load dynamic
library",
+ llvm::inconvertibleErrorCode());
}
#else
auto EE = getExecutionEngine();
>From 0911ef1d634603718d5418694a02b0e9665d4552 Mon Sep 17 00:00:00 2001
From: anutosh491 <andersonbhat...@gmail.com>
Date: Thu, 27 Mar 2025 12:34:23 +0530
Subject: [PATCH 3/4] Override getSymbolAddress
---
clang/lib/Interpreter/IncrementalExecutor.h | 2 +-
clang/lib/Interpreter/Wasm.cpp | 13 +++++++++++++
clang/lib/Interpreter/Wasm.h | 2 ++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Interpreter/IncrementalExecutor.h
b/clang/lib/Interpreter/IncrementalExecutor.h
index dbd61f0b8b1eb..71d71bc3883e2 100644
--- a/clang/lib/Interpreter/IncrementalExecutor.h
+++ b/clang/lib/Interpreter/IncrementalExecutor.h
@@ -57,7 +57,7 @@ class IncrementalExecutor {
virtual llvm::Error removeModule(PartialTranslationUnit &PTU);
virtual llvm::Error runCtors() const;
virtual llvm::Error cleanUp();
- llvm::Expected<llvm::orc::ExecutorAddr>
+ virtual llvm::Expected<llvm::orc::ExecutorAddr>
getSymbolAddress(llvm::StringRef Name, SymbolNameKind NameKind) const;
llvm::orc::LLJIT &GetExecutionEngine() { return *Jit; }
diff --git a/clang/lib/Interpreter/Wasm.cpp b/clang/lib/Interpreter/Wasm.cpp
index f7cb7598c77f8..c91fe950d428d 100644
--- a/clang/lib/Interpreter/Wasm.cpp
+++ b/clang/lib/Interpreter/Wasm.cpp
@@ -144,6 +144,19 @@ llvm::Error WasmIncrementalExecutor::cleanUp() {
return llvm::Error::success();
}
+llvm::Expected<llvm::orc::ExecutorAddr>
+WasmIncrementalExecutor::getSymbolAddress(llvm::StringRef Name,
+ SymbolNameKind NameKind) const {
+ void* Sym = dlsym(RTLD_DEFAULT, Name.str().c_str());
+ if (!Sym) {
+ return llvm::make_error<llvm::StringError>(
+ "dlsym failed for symbol: " + Name.str(),
+ llvm::inconvertibleErrorCode());
+ }
+
+ return llvm::orc::ExecutorAddr::fromPtr(Sym);
+}
+
WasmIncrementalExecutor::~WasmIncrementalExecutor() = default;
} // namespace clang
diff --git a/clang/lib/Interpreter/Wasm.h b/clang/lib/Interpreter/Wasm.h
index 4632613326d39..beafb01be7d8a 100644
--- a/clang/lib/Interpreter/Wasm.h
+++ b/clang/lib/Interpreter/Wasm.h
@@ -29,6 +29,8 @@ class WasmIncrementalExecutor : public IncrementalExecutor {
llvm::Error removeModule(PartialTranslationUnit &PTU) override;
llvm::Error runCtors() const override;
llvm::Error cleanUp() override;
+ llvm::Expected<llvm::orc::ExecutorAddr>
+ getSymbolAddress(llvm::StringRef Name, SymbolNameKind NameKind) const;
~WasmIncrementalExecutor() override;
};
>From b717060a8a0cf85e2ca218d7c303ffca3888cfdf Mon Sep 17 00:00:00 2001
From: anutosh491 <andersonbhat...@gmail.com>
Date: Thu, 27 Mar 2025 13:02:01 +0530
Subject: [PATCH 4/4] code format
---
clang/lib/Interpreter/Wasm.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/clang/lib/Interpreter/Wasm.cpp b/clang/lib/Interpreter/Wasm.cpp
index c91fe950d428d..1789b2dccd0e3 100644
--- a/clang/lib/Interpreter/Wasm.cpp
+++ b/clang/lib/Interpreter/Wasm.cpp
@@ -147,11 +147,12 @@ llvm::Error WasmIncrementalExecutor::cleanUp() {
llvm::Expected<llvm::orc::ExecutorAddr>
WasmIncrementalExecutor::getSymbolAddress(llvm::StringRef Name,
SymbolNameKind NameKind) const {
- void* Sym = dlsym(RTLD_DEFAULT, Name.str().c_str());
+ void *Sym = dlsym(RTLD_DEFAULT, Name.str().c_str());
if (!Sym) {
- return llvm::make_error<llvm::StringError>(
- "dlsym failed for symbol: " + Name.str(),
- llvm::inconvertibleErrorCode());
+ return llvm::make_error<llvm::StringError>("dlsym failed for symbol: " +
+ Name.str(),
+ llvm::inconvertibleErrorCode());
+
}
return llvm::orc::ExecutorAddr::fromPtr(Sym);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
