[Immediate] Only add renamer plugin on macOS

Author: Zak Kent

include/swift/Immediate/SwiftMaterializationUnit.h

@@ -48,6 +48,10 @@ class SwiftJIT {
   /// current process.
   static llvm::Expected<std::unique_ptr<SwiftJIT>> Create(CompilerInstance &CI);
 
+  /// Adds a plugin that will rename function symbols for lazy reexports.
+  /// Should be called only once.
+  void addRenamer();
+
   ~SwiftJIT();
 
   /// Get the dylib associated with the main program
@@ -80,6 +84,10 @@ class SwiftJIT {
   llvm::Expected<int> runMain(llvm::ArrayRef<std::string> Args);
 
 private:
+  static llvm::Expected<std::unique_ptr<llvm::orc::ObjectLayer>>
+  CreateObjLinkingLayer(llvm::orc::ExecutionSession &ES,
+                        const llvm::Triple &TT);
+
   static llvm::Expected<std::unique_ptr<llvm::orc::LLJIT>>
   CreateLLJIT(CompilerInstance &CI);
 

lib/Immediate/Immediate.cpp

@@ -409,6 +409,9 @@ int swift::RunImmediatelyFromAST(CompilerInstance &CI) {
     return -1;
   }
 
+  // We're compiling functions lazily, so need to rename
+  // symbols defining functions for lazy reexports
+  (*JIT)->addRenamer();
   auto MU = LazySwiftMaterializationUnit::Create(**JIT, CI);
   if (auto Err = (*JIT)->addSwift((*JIT)->getMainJITDylib(), std::move(MU))) {
     logError(std::move(Err));

lib/Immediate/SwiftMaterializationUnit.cpp

@@ -141,6 +141,16 @@ llvm::orc::ObjectTransformLayer &SwiftJIT::getObjTransformLayer() {
   return J->getObjTransformLayer();
 }
 
+llvm::Expected<std::unique_ptr<llvm::orc::ObjectLayer>>
+SwiftJIT::CreateObjLinkingLayer(llvm::orc::ExecutionSession &ES,
+                                const llvm::Triple &TT) {
+  auto MemMgr = llvm::jitlink::InProcessMemoryManager::Create();
+  if (!MemMgr)
+    return MemMgr.takeError();
+  return std::make_unique<llvm::orc::ObjectLinkingLayer>(ES,
+                                                         std::move(*MemMgr));
+}
+
 llvm::Expected<std::unique_ptr<llvm::orc::LLJIT>>
 SwiftJIT::CreateLLJIT(CompilerInstance &CI) {
   llvm::TargetOptions TargetOpt;
@@ -160,6 +170,7 @@ SwiftJIT::CreateLLJIT(CompilerInstance &CI) {
                   .setCodeGenOptLevel(llvm::CodeGenOpt::Default);
   auto J = llvm::orc::LLJITBuilder()
                .setJITTargetMachineBuilder(std::move(JTMB))
+               .setObjectLinkingLayerCreator(CreateObjLinkingLayer)
                .create();
   if (!J)
     return J.takeError();
@@ -237,8 +248,9 @@ SwiftJIT::SwiftJIT(std::unique_ptr<llvm::orc::LLJIT> J,
                    std::unique_ptr<llvm::orc::EPCIndirectionUtils> EPCIU)
     : J(std::move(J)), EPCIU(std::move(EPCIU)),
       LCTM(this->EPCIU->getLazyCallThroughManager()),
-      ISM(this->EPCIU->createIndirectStubsManager()) {
+      ISM(this->EPCIU->createIndirectStubsManager()) {}
 
+void SwiftJIT::addRenamer() {
   static_cast<llvm::orc::ObjectLinkingLayer &>(this->J->getObjLinkingLayer())
       .addPlugin(std::make_unique<Plugin>());
 }