Resolving comments

Author: kr-2003

.github/actions/Build_LLVM/action.yml

@@ -61,7 +61,7 @@ runs:
                 -DLLVM_INCLUDE_EXAMPLES=OFF                     \
                 -DLLVM_INCLUDE_TESTS=OFF                        \
                 ../llvm
-          ninja clang clangInterpreter clangStaticAnalyzerCore -j ${{ env.ncpus }}
+          ninja clang clangInterpreter clangStaticAnalyzerCore
           if [[ "${{ matrix.oop-jit }}" == "On" ]]; then
             if [[ "${{ matrix.os }}" == macos* ]]; then
               SUFFIX="_osx"

.github/actions/Build_and_Test_CppInterOp/action.yml

@@ -60,13 +60,8 @@ runs:
           os="${{ matrix.os }}"
           if [[ "${os}" != "macos"* ]]; then
             CLANG_VERSION="${{ matrix.clang-runtime }}"
-            if [[ "${{ matrix.cling }}" == "On" ]]; then
-              CLANG_INTERPRETER="cling"
-            else
-              CLANG_INTERPRETER="clang"
-            fi
-            SUPPRESSION_FILE="../etc/${CLANG_INTERPRETER}${CLANG_VERSION}-valgrind.supp"
-            if [[ "$CLANG_VERSION" == "20" ]]; then
+            if [[ "$CLANG_VERSION" == "20" && "${{ matrix.cling }}" == "Off" ]]; then
+              SUPPRESSION_FILE="../etc/clang${CLANG_VERSION}-valgrind.supp"
               valgrind --show-error-list=yes --track-origins=yes --error-exitcode=1 \
                 --show-leak-kinds=definite,possible \
                 --suppressions="${SUPPRESSION_FILE}" \

CMakeLists.txt

@@ -298,15 +298,15 @@ include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
 separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS})
 add_definitions(${LLVM_DEFINITIONS_LIST})
 
-string(REGEX REPLACE "/lib/cmake/llvm$" "" LLVM_BUILD_LIB_DIR "${LLVM_DIR}")
-add_definitions(-DLLVM_BUILD_LIB_DIR="${LLVM_BUILD_LIB_DIR}")
+string(REGEX REPLACE "/lib/cmake/llvm$" "" LLVM_BINARY_LIB_DIR "${LLVM_DIR}")
+add_definitions(-DLLVM_BINARY_LIB_DIR="${LLVM_BINARY_LIB_DIR}")
 
 if(LLVM_BUILT_WITH_OOP_JIT)
   if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") OR
      (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64"))
     add_definitions(-DLLVM_BUILT_WITH_OOP_JIT)
   else()
-    message(FATAL_ERROR "LLVM_BUILT_WITH_OOP_JIT is only supported on Darwin arm64 or Linux x86_64. Build aborted.")
+    message(FATAL_ERROR "LLVM_BUILT_WITH_OOP_JIT is only supported on MacOS arm64 or Linux x86_64. Build aborted.")
   endif()
 endif()
 

etc/clang20-valgrind.supp

@@ -15,4 +15,4 @@
    fun:_ZZN4llvm3orc23AsynchronousSymbolQuery14handleCompleteERNS0_16ExecutionSessionEEN20RunQueryCompleteTask3runEv
    fun:_ZNSt6thread11_State_implINS_8_InvokerISt5tupleIJZN4llvm3orc31DynamicThreadPoolTaskDispatcher8dispatchESt10unique_ptrINS4_4TaskESt14default_deleteIS7_EEEUlvE_EEEEE6_M_runEv
    obj:/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.30
-}
+}

lib/CppInterOp/Compatibility.h

@@ -261,7 +261,7 @@ createClangInterpreter(std::vector<const char*>& args, int stdin_fd = -1,
     DeviceCI->LoadRequestedPlugins();
 
   bool outOfProcess;
-#if defined(_WIN32)
+#if defined(_WIN32) || !defined(LLVM_BUILT_WITH_OOP_JIT)
   outOfProcess = false;
 #else
   outOfProcess = std::any_of(args.begin(), args.end(), [](const char* arg) {
@@ -275,7 +275,7 @@ createClangInterpreter(std::vector<const char*>& args, int stdin_fd = -1,
   if (outOfProcess) {
     OutOfProcessConfig.IsOutOfProcess = true;
     OutOfProcessConfig.OOPExecutor =
-        LLVM_BUILD_LIB_DIR "/bin/llvm-jitlink-executor";
+        LLVM_BINARY_LIB_DIR "/bin/llvm-jitlink-executor";
     OutOfProcessConfig.UseSharedMemory = false;
     OutOfProcessConfig.SlabAllocateSize = 0;
     OutOfProcessConfig.CustomizeFork = [stdin_fd, stdout_fd,
@@ -289,10 +289,10 @@ createClangInterpreter(std::vector<const char*>& args, int stdin_fd = -1,
     };
 
 #ifdef __APPLE__
-    std::string OrcRuntimePath = LLVM_BUILD_LIB_DIR "/lib/clang/" STRINGIFY(
+    std::string OrcRuntimePath = LLVM_BINARY_LIB_DIR "/lib/clang/" STRINGIFY(
         LLVM_VERSION_MAJOR) "/lib/darwin/liborc_rt_osx.a";
 #else
-    std::string OrcRuntimePath = LLVM_BUILD_LIB_DIR "/lib/clang/" STRINGIFY(
+    std::string OrcRuntimePath = LLVM_BINARY_LIB_DIR "/lib/clang/" STRINGIFY(
         LLVM_VERSION_MAJOR) "/lib/x86_64-unknown-linux-gnu/liborc_rt.a";
 #endif
     OutOfProcessConfig.OrcRuntimePath = OrcRuntimePath;

lib/CppInterOp/CppInterOpInterpreter.h

@@ -225,7 +225,7 @@ class Interpreter {
     auto io_ctx = std::make_unique<IOContext>();
     bool outOfProcess = false;
 
-#if defined(_WIN32)
+#if defined(_WIN32) || !defined(LLVM_BUILT_WITH_OOP_JIT)
     outOfProcess = false;
 #else
     outOfProcess = std::any_of(vargs.begin(), vargs.end(), [](const char* arg) {

unittests/CppInterOp/InterpreterTest.cpp

@@ -163,8 +163,7 @@ TYPED_TEST(CppInterOpTest, InterpreterTestProcess) {
 
 TYPED_TEST(CppInterOpTest, InterpreterTestEmscriptenExceptionHandling) {
 #ifndef EMSCRIPTEN
-  GTEST_SKIP() << "This test is intended to check exception handling for "
-                  "Emscripten builds.";
+  GTEST_SKIP() << "This test is intended to check exception handling for Emscripten builds.";
 #endif
 
   std::vector<const char*> Args = {