Merge branch 'main' into Windows-shared-library

Author: mcbarton

.github/workflows/MacOS.yml

@@ -57,7 +57,7 @@ jobs:
             cling: On
             cling-version: '1.0'
             llvm_enable_projects: "clang"
-            llvm_targets_to_build: "host"
+            llvm_targets_to_build: "host;NVPTX"
           - name: osx13-x86-clang-clang-repl-19
             os: macos-13
             compiler: clang
@@ -93,7 +93,7 @@ jobs:
             cling: On
             cling-version: '1.0'
             llvm_enable_projects: "clang"
-            llvm_targets_to_build: "host"
+            llvm_targets_to_build: "host;NVPTX"
 
     steps:
     - uses: actions/checkout@v4
@@ -256,7 +256,7 @@ jobs:
                 -DLLVM_ENABLE_LIBXML2=OFF                           \
                 -G Ninja                                            \
                 ../llvm
-          ninja clang clang-repl -j ${{ env.ncpus }}
+          ninja clang clangInterpreter clangStaticAnalyzerCore -j ${{ env.ncpus }}
         fi
         cd ../
         rm -rf $(find . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".")

.github/workflows/Ubuntu.yml

@@ -58,6 +58,42 @@ jobs:
             cling-version: '1.0'
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
+          - name: ubu22-arm-gcc12-clang-repl-19
+            os: ubuntu-22.04-arm
+            compiler: gcc-12
+            clang-runtime: '19'
+            cling: Off
+            llvm_enable_projects: "clang"
+            llvm_targets_to_build: "host;NVPTX"
+          - name: ubu22-arm-gcc12-clang-repl-18
+            os: ubuntu-22.04-arm
+            compiler: gcc-12
+            clang-runtime: '18'
+            cling: Off
+            llvm_enable_projects: "clang"
+            llvm_targets_to_build: "host;NVPTX"
+          - name: ubu22-arm-gcc12-clang-repl-17
+            os: ubuntu-22.04-arm
+            compiler: gcc-12
+            clang-runtime: '17'
+            cling: Off
+            llvm_enable_projects: "clang"
+            llvm_targets_to_build: "host;NVPTX"
+          - name: ubu22-arm-gcc12-clang-repl-16
+            os: ubuntu-22.04-arm
+            compiler: gcc-12
+            clang-runtime: '16'
+            cling: Off
+            llvm_enable_projects: "clang"
+            llvm_targets_to_build: "host;NVPTX"
+          - name: ubu22-arm-gcc9-clang13-cling
+            os: ubuntu-22.04-arm
+            compiler: gcc-9
+            clang-runtime: '13'
+            cling: On
+            cling-version: '1.0'
+            llvm_enable_projects: "clang"
+            llvm_targets_to_build: "host;NVPTX"
 
     steps:
     - uses: actions/checkout@v4
@@ -271,6 +307,33 @@ jobs:
             cling: On
             cling-version: '1.0'
             cppyy: On
+          - name: ubu22-arm-gcc12-clang-repl-19
+            os: ubuntu-22.04-arm
+            compiler: gcc-12
+            clang-runtime: '19'
+            cling: Off
+          - name: ubu22-arm-gcc12-clang-repl-18
+            os: ubuntu-22.04-arm
+            compiler: gcc-12
+            clang-runtime: '18'
+            cling: Off
+          - name: ubu22-arm-gcc12-clang-repl-17
+            os: ubuntu-22.04-arm
+            compiler: gcc-12
+            clang-runtime: '17'
+            cling: Off
+          - name: ubu22-arm-gcc12-clang-repl-16
+            os: ubuntu-22.04-arm
+            compiler: gcc-12
+            clang-runtime: '16'
+            cling: Off
+            cppyy: Off
+          - name: ubu22-arm-gcc9-clang13-cling
+            os: ubuntu-22.04-arm
+            compiler: gcc-9
+            clang-runtime: '13'
+            cling: On
+            cling-version: '1.0'
 
     steps:
     - uses: actions/checkout@v4
@@ -411,7 +474,7 @@ jobs:
           cmake --build . --target sphinx-cppinterop --parallel ${{ env.ncpus }}
         else
           cmake --build . --target check-cppinterop --parallel ${{ env.ncpus }}
-          valgrind --show-error-list=yes --track-origins=yes --error-exitcode=1 unittests/CppInterOp/CppInterOpTests
+          valgrind --show-error-list=yes --track-origins=yes --error-exitcode=1 unittests/CppInterOp/CppInterOpTests/unittests/bin/${{ env.BUILD_TYPE }}/CppInterOpTests
         fi
         cd ..
         # We need CB_PYTHON_DIR later

.github/workflows/deploy-pages.yml

@@ -187,8 +187,6 @@ jobs:
           micromamba activate xeus-lite-host
           python -m pip install jupyterlite-xeus jupyterlite-core jupyterlab notebook libarchive-c
           jupyter lite build --XeusAddon.prefix=${{ env.PREFIX }} --contents notebooks/xeus-cpp-lite-demo.ipynb --output-dir dist
-          cp ${{ env.PREFIX }}/bin/xcpp.data dist/extensions/@jupyterlite/xeus/static
-          cp ${{ env.PREFIX }}/lib/libclangCppInterOp.so dist/extensions/@jupyterlite/xeus/static
 
     - name: Upload artifact
       uses: actions/upload-pages-artifact@v3

.github/workflows/emscripten.yml

@@ -29,6 +29,14 @@ jobs:
             llvm_enable_projects: "clang;lld"
             llvm_targets_to_build: "WebAssembly"
             emsdk_ver: "3.1.45"
+          - name: ubu22-arm-gcc12-clang-repl-19-emscripten
+            os: ubuntu-22.04-arm
+            compiler: gcc-12
+            clang-runtime: '19'
+            cling: Off
+            llvm_enable_projects: "clang;lld"
+            llvm_targets_to_build: "WebAssembly"
+            emsdk_ver: "3.1.45"
           - name: osx15-arm-clang-clang-repl-19-emscripten
             os: macos-15
             compiler: clang
@@ -331,7 +339,22 @@ jobs:
                         ../llvm
           emmake ninja clang clang-repl lld -j ${{ env.ncpus }}
         fi
-        cd ../..
+        cd ../
+        rm -rf $(find . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".")
+        if [[ "${cling_on}" == "ON" ]]; then
+          cd ./llvm/
+          rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name "utils" ! -name ".")
+          cd ../clang/
+          rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name "utils" ! -name ".")
+          cd ../..
+        else # repl
+          cd ./llvm/
+          rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name ".")
+          cd ../clang/
+          rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name ".")
+          cd ../..
+        fi
+
 
     - name: Build LLVM/Cling on Windows systems if the cache is invalid
       if: ${{ runner.os == 'windows' && steps.cache.outputs.cache-hit != 'true' }}
@@ -451,6 +474,13 @@ jobs:
             cling: Off
             micromamba_shell_init: bash
             emsdk_ver: "3.1.45"
+          - name: ubu22-arm-gcc12-clang-repl-19-emscripten_wasm
+            os: ubuntu-22.04-arm
+            compiler: gcc-12
+            clang-runtime: '19'
+            cling: Off
+            micromamba_shell_init: bash
+            emsdk_ver: "3.1.45"
           - name: osx15-arm-clang-clang-repl-19-emscripten_wasm
             os: macos-15
             compiler: clang
@@ -571,6 +601,7 @@ jobs:
                 -DCODE_COVERAGE=${{ env.CODE_COVERAGE }}        \
                 -DCMAKE_INSTALL_PREFIX=$PREFIX         \
                 -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON            \
+                -DLLVM_ENABLE_WERROR=On                      \
                 ../
         else
           emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}    \
@@ -582,6 +613,7 @@ jobs:
                 -DCODE_COVERAGE=${{ env.CODE_COVERAGE }}    \
                 -DCMAKE_INSTALL_PREFIX=$PREFIX      \
                 -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON            \
+                -DLLVM_ENABLE_WERROR=On                      \
                 ../
         fi
         

.gitignore

@@ -33,3 +33,9 @@ install
 
 # CLion files
 .idea
+
+# VSCode files
+.vscode
+
+# Default Virtual Environments
+.venv

CMakeLists.txt

@@ -462,32 +462,52 @@ endif()
 if(MSVC)
 
   set(MSVC_EXPORTLIST
-   ??_7type_info@@6B@
-   ?nothrow@std@@3Unothrow_t@1@B
-   _Init_thread_header
-   _Init_thread_footer
-   ??_7type_info@@6B@
-   ?_Facet_Register@std@@YAXPEAV_Facet_base@1@@Z
+    _Init_thread_header
+    _Init_thread_footer
+    ?nothrow@std@@3Unothrow_t@1@B
+    ??_7type_info@@6B@
   )
 
-  set(MSVC_EXPORTLIST ${MSVC_EXPORTLIST}
-   ??2@YAPEAX_K@Z
-   ??3@YAXPEAX@Z
-   ??3@YAXPEAX_K@Z
-   ??_U@YAPEAX_K@Z
-   ??_V@YAXPEAX@Z
-   ??_V@YAXPEAX_K@Z
-   ??2@YAPEAX_KAEBUnothrow_t@std@@@Z
-   ??_U@YAPEAX_KAEBUnothrow_t@std@@@Z
-   ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@H@Z
-   ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@M@Z
-   ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@N@Z
-   ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@PEBX@Z
-   ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@P6AAEAV01@AEAV01@@Z@Z
-   ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@D@Z
-   ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBD@Z
-   ?_Facet_Register@std@@YAXPEAV_Facet_base@1@@Z
-  )
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    # new/delete variants needed when linking to static msvc runtime (esp. Debug)
+    set(MSVC_EXPORTLIST ${MSVC_EXPORTLIST}
+      ??2@YAPEAX_K@Z
+      ??3@YAXPEAX@Z
+      ??_U@YAPEAX_K@Z
+      ??_V@YAXPEAX@Z
+      ??3@YAXPEAX_K@Z
+      ??_V@YAXPEAX_K@Z
+      ??2@YAPEAX_KAEBUnothrow_t@std@@@Z
+      ??_U@YAPEAX_KAEBUnothrow_t@std@@@Z
+      ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@H@Z
+      ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@M@Z
+      ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@N@Z
+      ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@PEBX@Z
+      ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@P6AAEAV01@AEAV01@@Z@Z
+      ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@D@Z
+      ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBD@Z
+      ?_Facet_Register@std@@YAXPEAV_Facet_base@1@@Z
+    )
+  else()
+    set(MSVC_EXPORTLIST ${MSVC_EXPORTLIST}
+      ??2@YAPAXI@Z
+      ??3@YAXPAX@Z
+      ??3@YAXPAXI@Z
+      ??_U@YAPAXI@Z
+      ??_V@YAXPAX@Z
+      ??_V@YAXPAXI@Z
+      ??2@YAPAXIABUnothrow_t@std@@@Z
+      ??_U@YAPAXIABUnothrow_t@std@@@Z
+      ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@H@Z
+      ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@M@Z
+      ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@N@Z
+      ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@PBX@Z
+      ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@P6AAAV01@AAV01@@Z@Z
+      ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@D@Z
+      ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@PBD@Z
+      ?_Facet_Register@std@@YAXPAV_Facet_base@1@@Z
+    )
+  endif()
 
   if(MSVC_VERSION LESS 1914)
     set(MSVC_EXPORTLIST ${MSVC_EXPORTLIST} ??3@YAXPAX0@Z ??_V@YAXPAX0@Z)

Emscripten-build-instructions.md

@@ -153,15 +153,6 @@ python -m pip install jupyterlite-xeus jupyter_server
 jupyter lite build --XeusAddon.prefix=$PREFIX --contents xeus-cpp/notebooks/xeus-cpp-lite-demo.ipynb
 ```
 
-We now need to shift necessary files like `xcpp.data` which contains the binary representation of the file(s)  
-we want to include in our application. As of now this would contain all important files like Standard Headers,  
-Libraries etc coming out of emscripten's sysroot. Assuming we are still inside build we should do the following
-
-```bash
-cp $PREFIX/bin/xcpp.data _output/extensions/@jupyterlite/xeus/static
-cp $PREFIX/lib/libclangCppInterOp.so _output/extensions/@jupyterlite/xeus/static
-```
-
 Once the Jupyter Lite site has built you can test the website locally by executing
 
 ```bash

docs/Emscripten-build-instructions.rst

@@ -174,17 +174,6 @@ for testing execute the following
    python -m pip install jupyterlite-xeus jupyter_server
    jupyter lite build --XeusAddon.prefix=$PREFIX --contents xeus-cpp/notebooks/xeus-cpp-lite-demo.ipynb
 
-We now need to shift necessary files like `xcpp.data` which contains the
-binary representation of the file(s) we want to include in our
-application. As of now this would contain all important files like
-Standard Headers, Libraries etc coming out of emscripten's sysroot.
-Assuming we are still inside build we should do the following
-
-.. code:: bash
-
-   cp $PREFIX/bin/xcpp.data _output/extensions/@jupyterlite/xeus/static
-   cp $PREFIX/lib/libclangCppInterOp.so _output/extensions/@jupyterlite/xeus/static
-
 Once the Jupyter Lite site has built you can test the website locally by
 executing
 

include/clang/Interpreter/CppInterOp.h

@@ -185,6 +185,9 @@ namespace Cpp {
   ///\returns the version string information of the library.
   CPPINTEROP_API std::string GetVersion();
 
+  ///\returns the demangled representation of the given mangled_name
+  CPPINTEROP_API std::string Demangle(const std::string& mangled_name);
+
   /// Enables or disables the debugging printouts on stderr.
   /// Debugging output can be enabled also by the environment variable
   /// CPPINTEROP_EXTRA_INTERPRETER_ARGS. For example,
@@ -207,6 +210,10 @@ namespace Cpp {
   /// Checks if the scope is a class or not.
   CPPINTEROP_API bool IsClass(TCppScope_t scope);
 
+  /// Checks if the klass polymorphic.
+  /// which means that the class contains or inherits a virtual function
+  CPPINTEROP_API bool IsClassPolymorphic(TCppScope_t klass);
+
   // See TClingClassInfo::IsLoaded
   /// Checks if the class definition is present, or not. Performs a
   /// template instantiation if necessary.

lib/Interpreter/CMakeLists.txt

@@ -17,6 +17,14 @@ if(EMSCRIPTEN)
     LINK_LIBS
     clangInterpreter
   )
+  #FIXME: Setting no_soname=1 is needed until https://github.com/emscripten-core/emscripten/blob/ac676d5e437525d15df5fd46bc2c208ec6d376a3/cmake/Modules/Platform/Emscripten.cmake#L36
+  # is patched out of emsdk, as --soname is not recognised by emscripten. A PR to do this has been done here https://github.com/emscripten-core/emscripten/pull/23453 
+  #FIXME: A patch is needed to llvm to remove -Wl,-z,defs since it is now recognised on emscripten. What needs to be removed is here
+  # https://github.com/llvm/llvm-project/blob/128e2e446e90c3b1827cfc7d4d19e3c0976beff3/llvm/cmake/modules/HandleLLVMOptions.cmake#L318 . The PR to do try to do this is here 
+  # https://github.com/llvm/llvm-project/pull/123396
+  set_target_properties(clangCppInterOp
+  PROPERTIES NO_SONAME 1
+)
   target_link_options(clangCppInterOp PRIVATE
     PUBLIC "SHELL: -s WASM_BIGINT"
   )