addressing issues

Author: kr-2003

CMakeLists.txt

@@ -79,7 +79,6 @@ include(GNUInstallDirs)
 
   ## Set Cmake packages search order
 
-
   set(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL)
   set(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
 
@@ -303,7 +302,12 @@ string(REGEX REPLACE "/build/lib/cmake/llvm$" "" LLVM_SOURCE_DIR "${LLVM_DIR}")
 add_definitions(-DLLVM_SOURCE_DIR="${LLVM_SOURCE_DIR}")
 
 if(LLVM_BUILT_WITH_OOP_JIT)
-  add_definitions(-DLLVM_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.")
+  endif()
 endif()
 
 # If the llvm sources are present add them with higher priority.

README.md

@@ -163,7 +163,7 @@ cd ..\
 ##### Build Clang-REPL with Out-of-Process JIT Execution
 
 To have ``Out-of-Process JIT Execution`` enabled, run following commands to build clang and clang-repl to support this feature:
-> Only for Linux and Macos
+> Only for Linux x86_64 and Macos amr64
 ```bash
 mkdir build 
 cd build 
@@ -177,9 +177,9 @@ cmake -DLLVM_ENABLE_PROJECTS="clang;compiler-rt"                   \
               -DCLANG_ENABLE_BOOTSTRAP=OFF                        \
               ../llvm
 
-## For Linux
+## For Linux x86_64
 cmake --build . --target clang clang-repl llvm-jitlink-executor orc_rt-x86_64 --parallel $(nproc --all)
-## For MacOS
+## For MacOS arm64
 cmake --build . --target clang clang-repl llvm-jitlink-executor orc_rt_osx --parallel $(sysctl -n hw.ncpu)
 
 #### Build Cling and related dependencies

docs/InstallationAndUsage.rst

@@ -107,7 +107,7 @@ To have `Out-of-Process JIT Execution` enabled, run following commands to build
 
 .. note::
 
-   Only for Linux and Macos
+   Only for Linux x86_64 and Macos arm64
 
 .. code:: bash
 
@@ -123,10 +123,10 @@ To have `Out-of-Process JIT Execution` enabled, run following commands to build
                   -DCLANG_ENABLE_BOOTSTRAP=OFF                        \
                   ../llvm
    
-   # For Linux
+   # For Linux x86_64
    cmake --build . --target clang clang-repl llvm-jitlink-executor orc_rt-x86_64 --parallel $(nproc --all)
 
-   # For MacOS
+   # For MacOS arm64
    cmake --build . --target clang clang-repl llvm-jitlink-executor orc_rt_osx --parallel $(sysctl -n hw.ncpu)
 
 **************************************

include/CppInterOp/CppInterOp.h

@@ -912,6 +912,10 @@ CPPINTEROP_API int Undo(unsigned N = 1);
 /// Returns the process ID of the executor process.
 /// \returns the PID of the executor process.
 CPPINTEROP_API pid_t GetExecutorPID();
+
+/// Returns the process ID of the nth executor process.
+/// \returns the PID of the nth executor process.
+CPPINTEROP_API pid_t GetNthExecutorPID(int n);
 #endif
 
 } // end namespace Cpp

lib/CppInterOp/Compatibility.h

@@ -272,26 +272,23 @@ createClangInterpreter(std::vector<const char*>& args, int stdin_fd = 0,
     std::string SlabAllocateSizeString = "";
     std::unique_ptr<llvm::orc::ExecutorProcessControl> EPC;
 
-    auto DefaultForkRedirection = [=] {
-      auto redirect = [](int from, int to) {
-        if (from != to) {
-          dup2(from, to);
-          close(from);
-        }
-      };
-
-      // TODO: stdin and stderr redirection is not necessary.
-      redirect(0, STDIN_FILENO);
-      redirect(stdout_fd, STDOUT_FILENO);
-      redirect(2, STDERR_FILENO);
-
-      setvbuf(stdout, nullptr, _IONBF, 0);
-      setvbuf(stderr, nullptr, _IONBF, 0);
-    };
-
     EPC = ExitOnError(launchExecutor(OOPExecutor, UseSharedMemory,
                                      SlabAllocateSizeString,
-                                     DefaultForkRedirection));
+                                     [=] { // Lambda defined inline
+                                       auto redirect = [](int from, int to) {
+                                         if (from != to) {
+                                           dup2(from, to);
+                                           close(from);
+                                         }
+                                       };
+
+                                       redirect(0, STDIN_FILENO);
+                                       redirect(stdout_fd, STDOUT_FILENO);
+                                       redirect(2, STDERR_FILENO);
+
+                                       setvbuf(stdout, nullptr, _IONBF, 0);
+                                       setvbuf(stderr, nullptr, _IONBF, 0);
+                                     }));
 
 #ifdef __APPLE__
     std::string OrcRuntimePath =

lib/CppInterOp/CppInterOp.cpp

@@ -3969,6 +3969,13 @@ pid_t GetExecutorPID() {
 #endif
   return -1;
 }
+
+pid_t GetNthExecutorPID(int n) {
+#ifdef LLVM_BUILT_WITH_OOP_JIT
+  return compat::getNthExecutorPID(n);
+#endif
+  return -1;
+}
 #endif
 
 } // end namespace Cpp

unittests/CppInterOp/FunctionReflectionTest.cpp

@@ -2579,3 +2579,26 @@ TEST(FunctionReflectionTest, FailingTest1) {
   EXPECT_FALSE(Cpp::Declare("int x = 1;"));
   EXPECT_FALSE(Cpp::Declare("int y = x;"));
 }
+
+TEST(FunctionReflectionTest, GetExecutorPIDTest) {
+#ifdef _WIN32
+  GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
+#endif
+#ifdef EMSCRIPTEN
+  GTEST_SKIP() << "Test fails for Emscipten builds";
+#endif
+  TestUtils::CreateInterpreter();
+  pid_t pid = Cpp::GetExecutorPID();
+  if (TestUtils::use_oop_jit()) {
+    EXPECT_NE(pid, -1);
+  } else {
+    EXPECT_EQ(pid, -1);
+  }
+
+  pid = Cpp::GetNthExecutorPID(1);
+    if (TestUtils::use_oop_jit()) {
+    EXPECT_NE(pid, -1);
+  } else {
+    EXPECT_EQ(pid, -1);
+  }
+}