From 9bcb86e8bcd6d1a63df96ac31fa0c312518f973f Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sun, 16 Jun 2024 12:10:17 -0400 Subject: [PATCH] xo-jit: refactor: Jit.addModule() -> add_llvm_module() --- include/xo/jit/Jit.hpp | 14 +++++++++----- src/jit/MachPipeline.cpp | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/xo/jit/Jit.hpp b/include/xo/jit/Jit.hpp index 83b62c29..feb78652 100644 --- a/include/xo/jit/Jit.hpp +++ b/include/xo/jit/Jit.hpp @@ -113,13 +113,17 @@ namespace xo { JITDylib & dest_dynamic_lib_ref() { return dest_dynamic_lib_; } + /** compile module to machine code that's runnable from this process; + * incorporate into @ref dest_dynamic_lib_ + **/ llvm::Error - addModule(ThreadSafeModule ts_module, - ResourceTrackerSP RT = nullptr) { - if (!RT) - RT = dest_dynamic_lib_.getDefaultResourceTracker(); + add_llvm_module(ThreadSafeModule ts_module, + ResourceTrackerSP rtracker = nullptr) { + if (!rtracker) + rtracker = dest_dynamic_lib_.getDefaultResourceTracker(); - return compile_layer_.add(RT, std::move(ts_module)); + return compile_layer_.add(rtracker, + std::move(ts_module)); } llvm::Expected lookup(StringRef name) { diff --git a/src/jit/MachPipeline.cpp b/src/jit/MachPipeline.cpp index f912a394..e02e7316 100644 --- a/src/jit/MachPipeline.cpp +++ b/src/jit/MachPipeline.cpp @@ -413,7 +413,7 @@ namespace xo { /* note does not discard llvm_cx_->llvm_cx(), it's already been moved */ this->llvm_cx_ = nullptr; - llvm_exit_on_err(this->jit_->addModule(std::move(ts_module), tracker)); + llvm_exit_on_err(this->jit_->add_llvm_module(std::move(ts_module), tracker)); this->recreate_llvm_ir_pipeline(); }