Merge branch 'main' into Reduce-Emscripten-shared-library-size

Author: mcbarton

.github/workflows/deploy-pages.yml

@@ -168,6 +168,14 @@ jobs:
         emrun --browser="Google Chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  CppInterOpTests.html
         echo "Running DynamicLibraryManagerTests in Google Chrome"          
         emrun --browser="Google Chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  DynamicLibraryManagerTests.html
+        sudo safaridriver --enable
+        python -m pip install selenium
+        echo "Running CppInterOpTests in Safari"
+        emrun --no_browser --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  CppInterOpTests.html &
+        python ../../../scripts/browser_tests_safari.py CppInterOpTests.html
+        echo "Running DynamicLibraryManagerTests in Safari"          
+        emrun --no_browser --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  DynamicLibraryManagerTests.html &
+        python ../../../scripts/browser_tests_safari.py DynamicLibraryManagerTests.html
 
         cd ../../
         emmake make -j ${{ env.ncpus }} install

.github/workflows/emscripten.yml

@@ -320,10 +320,12 @@ jobs:
           {
             git apply -v emscripten-clang19-2-shift-temporary-files-to-tmp-dir.patch
             git apply -v emscripten-clang19-3-remove-zdefs.patch
+            git apply -v emscripten-clang19-4-enable_exception_handling.patch
           }
           elseif ( "${{ matrix.clang-runtime }}" -imatch "20" )
           {
             git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
+            git apply -v emscripten-clang20-3-enable_exception_handling.patch
           }
           cd build
           echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:"
@@ -587,6 +589,14 @@ jobs:
           emrun --browser="Google Chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  CppInterOpTests.html
           echo "Running DynamicLibraryManagerTests in Google Chrome"          
           emrun --browser="Google Chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  DynamicLibraryManagerTests.html
+          sudo safaridriver --enable
+          python -m pip install selenium
+          echo "Running CppInterOpTests in Safari"
+          emrun --no_browser --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  CppInterOpTests.html &
+          python ../../../scripts/browser_tests_safari.py CppInterOpTests.html
+          echo "Running DynamicLibraryManagerTests in Safari"          
+          emrun --no_browser --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  DynamicLibraryManagerTests.html &
+          python ../../../scripts/browser_tests_safari.py DynamicLibraryManagerTests.html
         else
           export ARCHITECHURE=$(uname -m)
           if [[ "$ARCHITECHURE" != "aarch64" ]]; then
@@ -727,6 +737,12 @@ jobs:
           emrun --browser="Google Chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  CppInterOpTests.html
           echo "Running DynamicLibraryManagerTests in Google Chrome"          
           emrun --browser="Google Chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  DynamicLibraryManagerTests.html
+          echo "Running CppInterOpTests in Safari"
+          emrun --no_browser --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  CppInterOpTests.html &
+          python ../../../scripts/browser_tests_safari.py CppInterOpTests.html
+          echo "Running DynamicLibraryManagerTests in Safari"          
+          emrun --no_browser --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  DynamicLibraryManagerTests.html &
+          python ../../../scripts/browser_tests_safari.py DynamicLibraryManagerTests.html
         else
           export ARCHITECHURE=$(uname -m)
           if [[ "$ARCHITECHURE" != "aarch64" ]]; then

Emscripten-build-instructions.md

@@ -64,6 +64,7 @@ On Windows execute the following
 cd .\llvm-project\
 cp -r ..\patches\llvm\emscripten-clang20*
 git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
+git apply -v emscripten-clang20-3-enable_exception_handling.patch
 ```
 
 We are now in a position to build an emscripten build of llvm by executing the following on Linux
@@ -225,7 +226,7 @@ It is possible to run the Emscripten tests in a headless browser. To do this we
     cd ./unittests/CppInterOp/
 ```
 
-We will run our tests in a fresh installed browser. Installing the browsers, and running the tests within the installed browsers will be platform dependent. To do this on MacOS execute the following
+We will run our tests in a fresh installed browser. Installing the browsers, and running the tests within the installed browsers will be platform dependent. To do this for Chrome and Firefox on MacOS execute the following
 
 ```bash
 wget "https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US" -O Firefox-latest.dmg
@@ -252,6 +253,19 @@ echo "Running DynamicLibraryManagerTests in Google Chrome"
 emrun --browser="Google Chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  DynamicLibraryManagerTests.html
 ```
 
+To run tests in Safari you can make use of safaridriver. How to enable this will depend on
+your MacOS operating system, and is best to consult [safaridriver](https://developer.apple.com/documentation/webkit/testing-with-webdriver-in-safari). You will also need to install the Selenium
+python package. This only needs to be enable once, and then you can execute the following to run the tests in Safari
+
+```bash
+echo "Running CppInterOpTests in Safari"
+emrun --no_browser --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  CppInterOpTests.html &
+python ../../../scripts/browser_tests_safari.py CppInterOpTests.html
+echo "Running DynamicLibraryManagerTests in Safari"          
+emrun --no_browser --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  DynamicLibraryManagerTests.html &
+python ../../../scripts/browser_tests_safari.py DynamicLibraryManagerTests.html
+```
+
 To do this on Ubuntu x86 execute the following
 
 ```bash
@@ -323,12 +337,13 @@ emmake make -j $(nproc --all) install
 ## Xeus-cpp-lite Wasm Build Instructions
 
 A project which makes use of the wasm build of CppInterOp is xeus-cpp. xeus-cpp is a C++ Jupyter kernel. Assuming you are in  
-the CppInterOp build folder, you can build the wasm version of xeus-cpp by executing (replace $LLVM_VERSION with the version
+the CppInterOp build folder, you can build the wasm version of xeus-cpp by executing (replace LLVM_VERSION with the version
 of llvm you are building against)
 
 ```bash
 cd ../..
 git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git
+export LLVM_VERSION=20
 cd ./xeus-cpp
 mkdir build
 cd build
@@ -338,7 +353,7 @@ emcmake cmake \
           -DCMAKE_INSTALL_PREFIX=$PREFIX                                 \
           -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON                            \
           -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON                         \
-          -DXEUS_CPP_RESOURCE_DIR=$LLVM_BUILD_DIR/lib/clang/$LLVM_VERSION \
+          -DXEUS_CPP_RESOURCE_DIR="$LLVM_BUILD_DIR/lib/clang/$LLVM_VERSION" \
           -DSYSROOT_PATH=$SYSROOT_PATH                                   \
           ..
  emmake make -j $(nproc --all) install

docs/Emscripten-build-instructions.rst

@@ -83,6 +83,7 @@ On Windows execute the following
    cd .\llvm-project\
    cp -r ..\patches\llvm\emscripten-clang20*
    git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
+   git apply -v emscripten-clang20-3-enable_exception_handling.patch
 
 We are now in a position to build an emscripten build of llvm by executing the following on Linux
 and osx
@@ -248,7 +249,7 @@ It is possible to run the Emscripten tests in a headless browser. To do this we
 
    cd ./unittests/CppInterOp/
 
-We will run our tests in a fresh installed browser. Installing the browsers, and running the tests within the installed browsers will be platform dependent. To do this on MacOS execute the following
+We will run our tests in a fresh installed browser. Installing the browsers, and running the tests within the installed browsers will be platform dependent. To do this for Chrome and Firefox on MacOS execute the following
 
 .. code:: bash
 
@@ -275,6 +276,19 @@ We will run our tests in a fresh installed browser. Installing the browsers, and
    echo "Running DynamicLibraryManagerTests in Google Chrome"          
    emrun --browser="Google Chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  DynamicLibraryManagerTests.html
 
+To run tests in Safari you can make use of safaridriver. How to enable this will depend on
+your MacOS operating system, and is best to consult `safaridriver <https://developer.apple.com/documentation/webkit/testing-with-webdriver-in-safari>`_. You will also need to install the Selenium
+python package. This only needs to be enable once, and then you can execute the following to run the tests in Safari
+
+.. code:: bash
+
+   echo "Running CppInterOpTests in Safari"
+   emrun --no_browser --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  CppInterOpTests.html &
+   python ../../../scripts/browser_tests_safari.py CppInterOpTests.html
+   echo "Running DynamicLibraryManagerTests in Safari"          
+   emrun --no_browser --kill_exit --timeout 60 --browser-args="--headless --no-sandbox"  DynamicLibraryManagerTests.html &
+   python ../../../scripts/browser_tests_safari.py DynamicLibraryManagerTests.html
+
 To do this on Ubuntu x86 execute the following
 
 .. code:: bash
@@ -345,12 +359,13 @@ Assuming it passes all test you can install by executing the following.
 A project which makes use of the wasm build of CppInterOp is xeus-cpp.
 xeus-cpp is a C++ Jupyter kernel. Assuming you are in the CppInterOp
 build folder, you can build the wasm version of xeus-cpp by executing
-(replace $LLVM_VERSION with the version of llvm you are building against)
+(replace LLVM_VERSION with the version of llvm you are building against)
 
 .. code:: bash
 
    cd ../..
    git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git
+   export LLVM_VERSION=20
    cd ./xeus-cpp
    mkdir build
    cd build
@@ -360,7 +375,7 @@ build folder, you can build the wasm version of xeus-cpp by executing
            -DCMAKE_INSTALL_PREFIX=$PREFIX                                 \
            -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON                            \
            -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON                         \
-	   -DXEUS_CPP_RESOURCE_DIR=$LLVM_BUILD_DIR/lib/clang/$LLVM_VERSION \
+	   -DXEUS_CPP_RESOURCE_DIR="$LLVM_BUILD_DIR/lib/clang/$LLVM_VERSION" \
            -DSYSROOT_PATH=$SYSROOT_PATH                                   \
            ..
    emmake make -j $(nproc --all) install

include/CppInterOp/CppInterOp.h

@@ -573,6 +573,9 @@ void GetEnumConstantDatamembers(TCppScope_t scope,
 CPPINTEROP_API TCppScope_t LookupDatamember(const std::string& name,
                                             TCppScope_t parent);
 
+/// Check if the given type is a lamda class
+CPPINTEROP_API bool IsLambdaClass(TCppType_t type);
+
 /// Gets the type of the variable that is passed as a parameter.
 CPPINTEROP_API TCppType_t GetVariableType(TCppScope_t var);
 

lib/CppInterOp/CppInterOp.cpp

@@ -854,9 +854,30 @@ static void GetClassDecls(TCppScope_t klass,
   for (Decl* DI : CXXRD->decls()) {
     if (auto* MD = dyn_cast<DeclType>(DI))
       methods.push_back(MD);
-    else if (auto* USD = dyn_cast<UsingShadowDecl>(DI))
-      if (auto* MD = dyn_cast<DeclType>(USD->getTargetDecl()))
+    else if (auto* USD = dyn_cast<UsingShadowDecl>(DI)) {
+      auto* MD = dyn_cast<DeclType>(USD->getTargetDecl());
+      if (!MD)
+        continue;
+
+      auto* CUSD = dyn_cast<ConstructorUsingShadowDecl>(DI);
+      if (!CUSD) {
+        methods.push_back(MD);
+        continue;
+      }
+
+      auto* CXXCD = dyn_cast_or_null<CXXConstructorDecl>(CUSD->getTargetDecl());
+      if (!CXXCD) {
         methods.push_back(MD);
+        continue;
+      }
+      if (CXXCD->isDeleted())
+        continue;
+
+      // Result is appended to the decls, i.e. CXXRD, iterator
+      // non-shadowed decl will be push_back later
+      // methods.push_back(Result);
+      getSema().findInheritingConstructor(SourceLocation(), CXXCD, CUSD);
+    }
   }
 }
 
@@ -1406,6 +1427,14 @@ TCppScope_t LookupDatamember(const std::string& name, TCppScope_t parent) {
   return 0;
 }
 
+bool IsLambdaClass(TCppType_t type) {
+  QualType QT = QualType::getFromOpaquePtr(type);
+  if (auto* CXXRD = QT->getAsCXXRecordDecl()) {
+    return CXXRD->isLambda();
+  }
+  return false;
+}
+
 TCppType_t GetVariableType(TCppScope_t var) {
   auto* D = static_cast<Decl*>(var);
 
@@ -1510,6 +1539,7 @@ intptr_t GetVariableOffset(compat::Interpreter& I, Decl* D,
         cling::Interpreter::PushTransactionRAII RAII(&getInterp());
 #endif // CPPINTEROP_USE_CLING
         getSema().InstantiateVariableDefinition(SourceLocation(), VD);
+        VD = VD->getDefinition();
       }
       if (VD->hasInit() &&
           (VD->isConstexpr() || VD->getType().isConstQualified())) {

patches/llvm/emscripten-clang19-4-enable_exception_handling.patch

@@ -0,0 +1,67 @@
+diff --git a/clang/lib/Interpreter/Interpreter.cpp b/clang/lib/Interpreter/Interpreter.cpp
+index 985d0b7c0..20a727893 100644
+--- a/clang/lib/Interpreter/Interpreter.cpp
++++ b/clang/lib/Interpreter/Interpreter.cpp
+@@ -135,6 +135,48 @@ CreateCI(const llvm::opt::ArgStringList &Argv) {
+   return std::move(Clang);
+ }
+ 
++static llvm::Error HandleFrontendOptions(const CompilerInstance &CI) {
++  const auto &FrontendOpts = CI.getFrontendOpts();
++
++  if (FrontendOpts.ShowHelp) {
++    driver::getDriverOptTable().printHelp(
++        llvm::outs(), "clang -cc1 [options] file...",
++        "LLVM 'Clang' Compiler: http://clang.llvm.org",
++        /*ShowHidden=*/false, /*ShowAllAliases=*/false,
++        llvm::opt::Visibility(driver::options::CC1Option));
++    return llvm::createStringError(llvm::errc::not_supported, "Help displayed");
++  }
++
++  if (FrontendOpts.ShowVersion) {
++    llvm::cl::PrintVersionMessage();
++    return llvm::createStringError(llvm::errc::not_supported,
++                                   "Version displayed");
++  }
++
++  if (!FrontendOpts.LLVMArgs.empty()) {
++    unsigned NumArgs = FrontendOpts.LLVMArgs.size();
++    auto Args = std::make_unique<const char *[]>(NumArgs + 2);
++    Args[0] = "clang-repl (LLVM option parsing)";
++    for (unsigned i = 0; i != NumArgs; ++i) {
++      Args[i + 1] = FrontendOpts.LLVMArgs[i].c_str();
++      // remove the leading '-' from the option name
++      if (Args[i + 1][0] == '-') {
++        auto *option = static_cast<llvm::cl::opt<bool> *>(
++            llvm::cl::getRegisteredOptions()[Args[i + 1] + 1]);
++        if (option) {
++          option->setInitialValue(true);
++        } else {
++          llvm::errs() << "Unknown LLVM option: " << Args[i + 1] << "\n";
++        }
++      }
++    }
++    Args[NumArgs + 1] = nullptr;
++    llvm::cl::ParseCommandLineOptions(NumArgs + 1, Args.get());
++  }
++
++  return llvm::Error::success();
++}
++
+ } // anonymous namespace
+ 
+ llvm::Expected<std::unique_ptr<CompilerInstance>>
+@@ -306,7 +348,12 @@ const char *const Runtimes = R"(
+ 
+ llvm::Expected<std::unique_ptr<Interpreter>>
+ Interpreter::create(std::unique_ptr<CompilerInstance> CI) {
+-  llvm::Error Err = llvm::Error::success();
++
++  llvm::Error Err = HandleFrontendOptions(*CI);
++  if (Err) {
++    return std::move(Err);
++  }
++
+   auto Interp =
+       std::unique_ptr<Interpreter>(new Interpreter(std::move(CI), Err));
+   if (Err)

patches/llvm/emscripten-clang20-3-enable_exception_handling.patch

@@ -0,0 +1,67 @@
+diff --git a/clang/lib/Interpreter/Interpreter.cpp b/clang/lib/Interpreter/Interpreter.cpp
+index 3b81f9d70..2704edb8a 100644
+--- a/clang/lib/Interpreter/Interpreter.cpp
++++ b/clang/lib/Interpreter/Interpreter.cpp
+@@ -142,6 +142,48 @@ CreateCI(const llvm::opt::ArgStringList &Argv) {
+   return std::move(Clang);
+ }
+ 
++static llvm::Error HandleFrontendOptions(const CompilerInstance &CI) {
++  const auto &FrontendOpts = CI.getFrontendOpts();
++
++  if (FrontendOpts.ShowHelp) {
++    driver::getDriverOptTable().printHelp(
++        llvm::outs(), "clang -cc1 [options] file...",
++        "LLVM 'Clang' Compiler: http://clang.llvm.org",
++        /*ShowHidden=*/false, /*ShowAllAliases=*/false,
++        llvm::opt::Visibility(driver::options::CC1Option));
++    return llvm::createStringError(llvm::errc::not_supported, "Help displayed");
++  }
++
++  if (FrontendOpts.ShowVersion) {
++    llvm::cl::PrintVersionMessage();
++    return llvm::createStringError(llvm::errc::not_supported,
++                                   "Version displayed");
++  }
++
++  if (!FrontendOpts.LLVMArgs.empty()) {
++    unsigned NumArgs = FrontendOpts.LLVMArgs.size();
++    auto Args = std::make_unique<const char *[]>(NumArgs + 2);
++    Args[0] = "clang-repl (LLVM option parsing)";
++    for (unsigned i = 0; i != NumArgs; ++i) {
++      Args[i + 1] = FrontendOpts.LLVMArgs[i].c_str();
++      // remove the leading '-' from the option name
++      if (Args[i + 1][0] == '-') {
++        auto *option = static_cast<llvm::cl::opt<bool> *>(
++            llvm::cl::getRegisteredOptions()[Args[i + 1] + 1]);
++        if (option) {
++          option->setInitialValue(true);
++        } else {
++          llvm::errs() << "Unknown LLVM option: " << Args[i + 1] << "\n";
++        }
++      }
++    }
++    Args[NumArgs + 1] = nullptr;
++    llvm::cl::ParseCommandLineOptions(NumArgs + 1, Args.get());
++  }
++
++  return llvm::Error::success();
++}
++
+ } // anonymous namespace
+ 
+ namespace clang {
+@@ -456,7 +498,12 @@ const char *const Runtimes = R"(
+ 
+ llvm::Expected<std::unique_ptr<Interpreter>>
+ Interpreter::create(std::unique_ptr<CompilerInstance> CI) {
+-  llvm::Error Err = llvm::Error::success();
++
++  llvm::Error Err = HandleFrontendOptions(*CI);
++  if (Err) {
++    return std::move(Err);
++  }
++
+   auto Interp =
+       std::unique_ptr<Interpreter>(new Interpreter(std::move(CI), Err));
+   if (Err)

scripts/browser_tests_safari.py

@@ -0,0 +1,9 @@
+import sys
+import time
+from selenium import webdriver
+
+driver = webdriver.Safari()
+driver.get("http://localhost:6931/" + sys.argv[1])
+
+time.sleep(60)
+driver.quit()