release/19.x: [clang-repl] Fix generation of wasm binaries while running clang-repl in browser (#117978) #118077

llvmbot · 2024-11-29T10:08:32Z

Backport a174aa1

Requested by: @anutosh491

llvmbot · 2024-11-29T10:08:38Z

@vgvassilev What do you think about merging this PR to the release branch?

llvmbot · 2024-11-29T10:09:09Z

@llvm/pr-subscribers-clang

Author: None (llvmbot)

Changes

Backport a174aa1

Requested by: @anutosh491

Full diff: https://github.com/llvm/llvm-project/pull/118077.diff

3 Files Affected:

(modified) clang/lib/Interpreter/CMakeLists.txt (+2)
(modified) clang/lib/Interpreter/Interpreter.cpp (+1)
(modified) clang/lib/Interpreter/Wasm.cpp (+43-14)

diff --git a/clang/lib/Interpreter/CMakeLists.txt b/clang/lib/Interpreter/CMakeLists.txt
index 0a2d60757c216d..85efa4b0f984f4 100644
--- a/clang/lib/Interpreter/CMakeLists.txt
+++ b/clang/lib/Interpreter/CMakeLists.txt
@@ -15,6 +15,7 @@ set(LLVM_LINK_COMPONENTS
 if (EMSCRIPTEN AND "lld" IN_LIST LLVM_ENABLE_PROJECTS)
   set(WASM_SRC Wasm.cpp)
   set(WASM_LINK lldWasm)
+  set(COMMON_LINK lldCommon)
 endif()
 
 add_clang_library(clangInterpreter
@@ -45,6 +46,7 @@ add_clang_library(clangInterpreter
   clangSema
   clangSerialization
   ${WASM_LINK}
+  ${COMMON_LINK}
   )
 
 if ((MINGW OR CYGWIN) AND BUILD_SHARED_LIBS)
diff --git a/clang/lib/Interpreter/Interpreter.cpp b/clang/lib/Interpreter/Interpreter.cpp
index c0b8bfebb43437..985d0b7c0ef311 100644
--- a/clang/lib/Interpreter/Interpreter.cpp
+++ b/clang/lib/Interpreter/Interpreter.cpp
@@ -193,6 +193,7 @@ IncrementalCompilerBuilder::CreateCpp() {
   Argv.push_back("-target");
   Argv.push_back("wasm32-unknown-emscripten");
   Argv.push_back("-shared");
+  Argv.push_back("-fvisibility=default");
 #endif
   Argv.insert(Argv.end(), UserArgs.begin(), UserArgs.end());
 
diff --git a/clang/lib/Interpreter/Wasm.cpp b/clang/lib/Interpreter/Wasm.cpp
index 79efbaa03982d0..aa10b160ccf847 100644
--- a/clang/lib/Interpreter/Wasm.cpp
+++ b/clang/lib/Interpreter/Wasm.cpp
@@ -23,6 +23,31 @@
 #include <string>
 
 namespace lld {
+enum Flavor {
+  Invalid,
+  Gnu,     // -flavor gnu
+  MinGW,   // -flavor gnu MinGW
+  WinLink, // -flavor link
+  Darwin,  // -flavor darwin
+  Wasm,    // -flavor wasm
+};
+
+using Driver = bool (*)(llvm::ArrayRef<const char *>, llvm::raw_ostream &,
+                        llvm::raw_ostream &, bool, bool);
+
+struct DriverDef {
+  Flavor f;
+  Driver d;
+};
+
+struct Result {
+  int retCode;
+  bool canRunAgain;
+};
+
+Result lldMain(llvm::ArrayRef<const char *> args, llvm::raw_ostream &stdoutOS,
+               llvm::raw_ostream &stderrOS, llvm::ArrayRef<DriverDef> drivers);
+
 namespace wasm {
 bool link(llvm::ArrayRef<const char *> args, llvm::raw_ostream &stdoutOS,
           llvm::raw_ostream &stderrOS, bool exitEarly, bool disableOutput);
@@ -51,13 +76,14 @@ llvm::Error WasmIncrementalExecutor::addModule(PartialTranslationUnit &PTU) {
   llvm::TargetMachine *TargetMachine = Target->createTargetMachine(
       PTU.TheModule->getTargetTriple(), "", "", TO, llvm::Reloc::Model::PIC_);
   PTU.TheModule->setDataLayout(TargetMachine->createDataLayout());
-  std::string OutputFileName = PTU.TheModule->getName().str() + ".wasm";
+  std::string ObjectFileName = PTU.TheModule->getName().str() + ".o";
+  std::string BinaryFileName = PTU.TheModule->getName().str() + ".wasm";
 
   std::error_code Error;
-  llvm::raw_fd_ostream OutputFile(llvm::StringRef(OutputFileName), Error);
+  llvm::raw_fd_ostream ObjectFileOutput(llvm::StringRef(ObjectFileName), Error);
 
   llvm::legacy::PassManager PM;
-  if (TargetMachine->addPassesToEmitFile(PM, OutputFile, nullptr,
+  if (TargetMachine->addPassesToEmitFile(PM, ObjectFileOutput, nullptr,
                                          llvm::CodeGenFileType::ObjectFile)) {
     return llvm::make_error<llvm::StringError>(
         "Wasm backend cannot produce object.", llvm::inconvertibleErrorCode());
@@ -69,27 +95,30 @@ llvm::Error WasmIncrementalExecutor::addModule(PartialTranslationUnit &PTU) {
                                                llvm::inconvertibleErrorCode());
   }
 
-  OutputFile.close();
+  ObjectFileOutput.close();
 
   std::vector<const char *> LinkerArgs = {"wasm-ld",
                                           "-shared",
                                           "--import-memory",
-                                          "--no-entry",
-                                          "--export-all",
                                           "--experimental-pic",
                                           "--stack-first",
                                           "--allow-undefined",
-                                          OutputFileName.c_str(),
+                                          ObjectFileName.c_str(),
                                           "-o",
-                                          OutputFileName.c_str()};
-  int Result =
-      lld::wasm::link(LinkerArgs, llvm::outs(), llvm::errs(), false, false);
-  if (!Result)
+                                          BinaryFileName.c_str()};
+
+  const lld::DriverDef WasmDriver = {lld::Flavor::Wasm, &lld::wasm::link};
+  std::vector<lld::DriverDef> WasmDriverArgs;
+  WasmDriverArgs.push_back(WasmDriver);
+  lld::Result Result =
+      lld::lldMain(LinkerArgs, llvm::outs(), llvm::errs(), WasmDriverArgs);
+
+  if (Result.retCode)
     return llvm::make_error<llvm::StringError>(
         "Failed to link incremental module", llvm::inconvertibleErrorCode());
 
   void *LoadedLibModule =
-      dlopen(OutputFileName.c_str(), RTLD_NOW | RTLD_GLOBAL);
+      dlopen(BinaryFileName.c_str(), RTLD_NOW | RTLD_GLOBAL);
   if (LoadedLibModule == nullptr) {
     llvm::errs() << dlerror() << '\n';
     return llvm::make_error<llvm::StringError>(
@@ -109,7 +138,7 @@ llvm::Error WasmIncrementalExecutor::runCtors() const {
   return llvm::Error::success();
 }
 
-llvm::Error WasmIncrementalExecutor::cleanUp() const {
+llvm::Error WasmIncrementalExecutor::cleanUp() {
   // Can't call cleanUp through IncrementalExecutor as it
   // tries to deinitialize JIT which hasn't been initialized
   return llvm::Error::success();
@@ -117,4 +146,4 @@ llvm::Error WasmIncrementalExecutor::cleanUp() const {
 
 WasmIncrementalExecutor::~WasmIncrementalExecutor() = default;
 
-} // namespace clang
+} // namespace clang
\ No newline at end of file

vgvassilev

This is a low risk feature as it is maintained at a best effort basis at the moment. LGTM!

anutosh491 · 2024-11-29T11:07:40Z

Hi @tru

Curious to know as to when a 19.1.5 release is scheduled ?

tru · 2024-12-02T08:35:15Z

Hi @tru

Curious to know as to when a 19.1.5 release is scheduled ?

Tomorrow.

… in browser (llvm#117978) Co-authored-by: Vassil Vassilev <v.g.vassilev@gmail.com> (cherry picked from commit a174aa1)

github-actions · 2024-12-02T08:36:20Z

@anutosh491 (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR.

anutosh491 · 2024-12-02T09:00:00Z

@anutosh491 (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR.

Fixes addModule function for clang-repl allowing it to be run completely in browser.

anutosh491 · 2024-12-02T09:01:00Z

please add the release:note label to this PR.

Hi @tru, the above comment requires us to add a label for release notes. Not sure I can add a label. Can you help me out here ?

anutosh491 · 2024-12-03T05:11:00Z

Hi @tru
Curious to know as to when a 19.1.5 release is scheduled ?

Tomorrow.

Thanks for the update :)

tru · 2024-12-03T07:42:27Z

please add the release:note label to this PR.

Hi @tru, the above comment requires us to add a label for release notes. Not sure I can add a label. Can you help me out here ?

Ignore this, it should be disabled.

llvmbot added this to the LLVM 19.X Release milestone Nov 29, 2024

llvmbot requested a review from vgvassilev November 29, 2024 10:08

llvmbot mentioned this pull request Nov 29, 2024

[clang-repl] Fix generation of wasm binaries while running clang-repl in browser #117978

Merged

llvmbot added clang Clang issues not falling into any other category clang:frontend Language frontend issues, e.g. anything involving "Sema" labels Nov 29, 2024

vgvassilev approved these changes Nov 29, 2024

View reviewed changes

[clang-repl] Fix generation of wasm binaries while running clang-repl…

e6bcdea

… in browser (llvm#117978) Co-authored-by: Vassil Vassilev <v.g.vassilev@gmail.com> (cherry picked from commit a174aa1)

tru force-pushed the issue117978 branch from d181ade to e6bcdea Compare December 2, 2024 08:35

tru merged commit e6bcdea into llvm:release/19.x Dec 2, 2024
1 check was pending

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

release/19.x: [clang-repl] Fix generation of wasm binaries while running clang-repl in browser (#117978) #118077

release/19.x: [clang-repl] Fix generation of wasm binaries while running clang-repl in browser (#117978) #118077

Uh oh!

llvmbot commented Nov 29, 2024

Uh oh!

llvmbot commented Nov 29, 2024

Uh oh!

llvmbot commented Nov 29, 2024

Uh oh!

vgvassilev left a comment

Uh oh!

anutosh491 commented Nov 29, 2024 •

edited

Loading

Uh oh!

tru commented Dec 2, 2024

Uh oh!

Uh oh!

github-actions bot commented Dec 2, 2024

Uh oh!

anutosh491 commented Dec 2, 2024

Uh oh!

anutosh491 commented Dec 2, 2024

Uh oh!

anutosh491 commented Dec 3, 2024

Uh oh!

tru commented Dec 3, 2024

Uh oh!

Uh oh!

release/19.x: [clang-repl] Fix generation of wasm binaries while running clang-repl in browser (#117978) #118077

release/19.x: [clang-repl] Fix generation of wasm binaries while running clang-repl in browser (#117978) #118077

Uh oh!

Conversation

llvmbot commented Nov 29, 2024

Uh oh!

llvmbot commented Nov 29, 2024

Uh oh!

llvmbot commented Nov 29, 2024

Uh oh!

vgvassilev left a comment

Choose a reason for hiding this comment

Uh oh!

anutosh491 commented Nov 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tru commented Dec 2, 2024

Uh oh!

Uh oh!

github-actions bot commented Dec 2, 2024

Uh oh!

anutosh491 commented Dec 2, 2024

Uh oh!

anutosh491 commented Dec 2, 2024

Uh oh!

anutosh491 commented Dec 3, 2024

Uh oh!

tru commented Dec 3, 2024

Uh oh!

Uh oh!

anutosh491 commented Nov 29, 2024 •

edited

Loading