Refactor: Improve logic and remove hardcoded Clang version

SahilPatidar · SahilPatidar · commit 06132c8250fe · 2024-11-10T09:17:04.000+05:30
diff --git a/clang/include/clang/Interpreter/Interpreter.h b/clang/include/clang/Interpreter/Interpreter.h
@@ -152,7 +152,7 @@ class Interpreter {
   llvm::Error Undo(unsigned N = 1);
 
   /// Link a dynamic library
-  llvm::Error LoadDynamicLibrary(const char *name, bool UseEPC = false);
+  llvm::Error LoadDynamicLibrary(const char *name);
 
   /// \returns the \c ExecutorAddr of a \c GlobalDecl. This interface uses
   /// the CodeGenModule's internal mangling cache to avoid recomputing the
diff --git a/clang/lib/Interpreter/Interpreter.cpp b/clang/lib/Interpreter/Interpreter.cpp
@@ -718,20 +718,13 @@ llvm::Error Interpreter::Undo(unsigned N) {
   return llvm::Error::success();
 }
 
-llvm::Error Interpreter::LoadDynamicLibrary(const char *name, bool UseEPC) {
+llvm::Error Interpreter::LoadDynamicLibrary(const char *name) {
   auto EE = getExecutionEngine();
   if (!EE)
     return EE.takeError();
 
-  auto &DL = EE->getDataLayout();
-  if (UseEPC) {
-    if (auto DLSG = llvm::orc::EPCDynamicLibrarySearchGenerator::Load(
-            EE->getExecutionSession(), name))
-      EE->getMainJITDylib().addGenerator(std::move(*DLSG));
-    else
-      return DLSG.takeError();
-  } else if (auto DLSG = llvm::orc::DynamicLibrarySearchGenerator::Load(
-                 name, DL.getGlobalPrefix()))
+  if (auto DLSG = llvm::orc::EPCDynamicLibrarySearchGenerator::Load(
+          EE->getExecutionSession(), name))
     EE->getMainJITDylib().addGenerator(std::move(*DLSG));
   else
     return DLSG.takeError();
diff --git a/clang/lib/Interpreter/RemoteJITUtils.cpp b/clang/lib/Interpreter/RemoteJITUtils.cpp
@@ -5,6 +5,10 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
+//
+// FIXME: Unify this code with similar functionality in llvm-jitlink.
+//
+//===----------------------------------------------------------------------===//
 
 #include "clang/Interpreter/RemoteJITUtils.h"
 
@@ -260,4 +264,4 @@ connectTCPSocket(StringRef NetworkAddress, bool UseSharedMemory,
       std::make_unique<DynamicThreadPoolTaskDispatcher>(std::nullopt),
       std::move(S), *SockFD, *SockFD);
 #endif
-}
+}
diff --git a/clang/test/Interpreter/out-of-process.cpp b/clang/test/Interpreter/out-of-process.cpp
@@ -0,0 +1,88 @@
+// REQUIRES: host-supports-jit
+
+// RUN: cat %s | clang-repl -oop-executor -orc-runtime | FileCheck %s
+
+extern "C" int printf(const char *, ...);
+
+int intVar = 0;
+double doubleVar = 3.14;
+%undo
+double doubleVar = 2.71;
+
+auto r1 = printf("intVar = %d\n", intVar);
+// CHECK: intVar = 0
+auto r2 = printf("doubleVar = %.2f\n", doubleVar);
+// CHECK: doubleVar = 2.71
+
+// Test redefinition with inline and static functions.
+int add(int a, int b, int c) { return a + b + c; }
+%undo  // Revert to the initial version of add
+inline int add(int a, int b) { return a + b; }
+
+auto r3 = printf("add(1, 2) = %d\n", add(1, 2));
+// CHECK-NEXT: add(1, 2) = 3
+
+// Test inline and lambda functions with variations.
+inline int square(int x) { return x * x; }
+auto lambdaSquare = [](int x) { return x * x; };
+auto lambdaMult = [](int a, int b) { return a * b; };
+
+auto r4 = printf("square(4) = %d\n", square(4));
+// CHECK-NEXT: square(4) = 16
+auto lambda_r1 = printf("lambdaSquare(5) = %d\n", lambdaSquare(5));
+// CHECK-NEXT: lambdaSquare(5) = 25
+auto lambda_r2 = printf("lambdaMult(2, 3) = %d\n", lambdaMult(2, 3));
+// CHECK-NEXT: lambdaMult(2, 3) = 6
+
+%undo  // Undo previous lambda assignments
+auto lambda_r3 = lambdaMult(3, 4);  // Should fail or revert to the original lambda
+
+// Test weak and strong symbol linkage.
+int __attribute__((weak)) weakFunc() { return 42; }
+int strongFunc() { return 100; }
+%undo  // Revert the weak function
+
+auto r5 = printf("weakFunc() = %d\n", weakFunc());
+// CHECK: weakFunc() = 42
+auto r6 = printf("strongFunc() = %d\n", strongFunc());
+// CHECK-NEXT: strongFunc() = 100
+
+// Weak variable linkage with different types.
+int varA = 20;
+static __typeof(varA) weakVarA __attribute__((__weakref__("varA")));
+char charVar = 'c';
+static __typeof(charVar) weakCharVar __attribute__((__weakref__("charVar")));
+auto r7 = printf("weakVarA = %d\n", weakVarA);
+// CHECK: weakVarA = 20
+auto r8 = printf("weakCharVar = %c\n", weakCharVar);
+// CHECK-NEXT: weakCharVar = c
+
+// Test complex lambdas with captures.
+int captureVar = 5;
+auto captureLambda = [](int x) { return x + captureVar; };
+int result1 = captureLambda(10);
+%undo  // Undo capture lambda
+
+auto r9 = printf("captureLambda(10) = %d\n", result1);
+// CHECK: captureLambda(10) = 15
+
+// Multiline statement test with arithmetic operations.
+int sum = \
+  5 + \
+  10;
+int prod = sum * 2;
+auto r10 = printf("sum = %d, prod = %d\n", sum, prod);
+// CHECK: sum = 15, prod = 30
+
+// Test multiline functions and macro behavior.
+#define MULTIPLY(a, b) ((a) * (b))
+
+int complexFunc(int x) \
+{ \
+  return MULTIPLY(x, 2) + x; \
+}
+
+auto r11 = printf("complexFunc(5) = %d\n", complexFunc(5));
+// CHECK: complexFunc(5) = 15
+
+%quit
diff --git a/clang/tools/clang-repl/ClangRepl.cpp b/clang/tools/clang-repl/ClangRepl.cpp
@@ -13,6 +13,8 @@
 #include "clang/Interpreter/RemoteJITUtils.h"
 
 #include "clang/Basic/Diagnostic.h"
+#include "clang/Basic/Version.h"
+#include "clang/Config/config.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/FrontendDiagnostic.h"
 #include "clang/Interpreter/CodeCompletion.h"
@@ -62,7 +64,7 @@ static llvm::cl::opt<std::string> OOPExecutorConnect(
     llvm::cl::value_desc("<hostname>:<port>"));
 static llvm::cl::opt<std::string>
     OrcRuntimePath("orc-runtime", llvm::cl::desc("Path to the ORC runtime"),
-                   llvm::cl::cat(OOPCategory));
+                   llvm::cl::ValueOptional, llvm::cl::cat(OOPCategory));
 static llvm::cl::opt<bool> UseSharedMemory(
     "use-shared-memory",
     llvm::cl::desc("Use shared memory to transfer generated code and data"),
@@ -98,22 +100,21 @@ static llvm::Error sanitizeOopArguments(const char *ArgV0) {
           llvm::inconvertibleErrorCode());
   }
 
-  // Out-of-process executors must run with the ORC runtime for destructor
-  // support.
+  // Out-of-process executors require the ORC runtime.
   if (OrcRuntimePath.empty() && (OOPExecutor.getNumOccurrences() ||
                                  OOPExecutorConnect.getNumOccurrences())) {
-    llvm::SmallString<256> OrcPath(llvm::sys::fs::getMainExecutable(
+    llvm::SmallString<256> BasePath(llvm::sys::fs::getMainExecutable(
         ArgV0, reinterpret_cast<void *>(&sanitizeOopArguments)));
-    llvm::sys::path::remove_filename(OrcPath); // Remove clang-repl filename.
-    llvm::sys::path::remove_filename(OrcPath); // Remove ./bin directory.
+    llvm::sys::path::remove_filename(BasePath); // Remove clang-repl filename.
+    llvm::sys::path::remove_filename(BasePath); // Remove ./bin directory.
     llvm::Triple SystemTriple(llvm::sys::getProcessTriple());
-    llvm::StringRef Path;
+    llvm::sys::path::append(BasePath, CLANG_INSTALL_LIBDIR_BASENAME, "clang",
+                            CLANG_VERSION_MAJOR_STRING);
     if (SystemTriple.isOSBinFormatELF())
-      Path = "lib/clang/20/lib/x86_64-unknown-linux-gnu/liborc_rt.a";
+      OrcRuntimePath =
+          BasePath.str().str() + "lib/x86_64-unknown-linux-gnu/liborc_rt.a";
     else if (SystemTriple.isOSBinFormatMachO())
-      Path = "lib/clang/20/lib/darwin/liborc_rt_osx.a";
-    llvm::sys::path::append(OrcPath, Path);
-    OrcRuntimePath = OrcPath.str().str();
+      OrcRuntimePath = BasePath.str().str() + "/lib/darwin/liborc_rt_osx.a";
   }
 
   // If -oop-executor was used but no value was specified then use a sensible
@@ -276,12 +277,10 @@ int main(int argc, const char **argv) {
   }
 
   std::unique_ptr<llvm::orc::LLJITBuilder> JB;
-  bool UseEPCSearchGen = false;
   if (EPC) {
     CB.SetTargetTriple(EPC->getTargetTriple().getTriple());
     JB = ExitOnErr(
         clang::Interpreter::createLLJITBuilder(std::move(EPC), OrcRuntimePath));
-    UseEPCSearchGen = true;
   }
 
   // FIXME: Investigate if we could use runToolOnCodeWithArgs from tooling. It
@@ -354,8 +353,7 @@ int main(int argc, const char **argv) {
         if (auto Err = Interp->Undo())
           llvm::logAllUnhandledErrors(std::move(Err), llvm::errs(), "error: ");
       } else if (Input.rfind("%lib ", 0) == 0) {
-        if (auto Err =
-                Interp->LoadDynamicLibrary(Input.data() + 5, UseEPCSearchGen))
+        if (auto Err = Interp->LoadDynamicLibrary(Input.data() + 5))
           llvm::logAllUnhandledErrors(std::move(Err), llvm::errs(), "error: ");
       } else if (auto Err = Interp->ParseAndExecute(Input)) {
         llvm::logAllUnhandledErrors(std::move(Err), llvm::errs(), "error: ");
