[llvm] ae33124 - [ORC] Rename ThreadSafeModule::takingModuleDo to consumingModuleDo.

Lang Hames via llvm-commits llvm-commits at lists.llvm.org
Mon Jan 2 17:51:40 PST 2023


Author: Lang Hames
Date: 2023-01-02T17:48:55-08:00
New Revision: ae331245b730a2c91ecc227c4cb1198d2b3ad94e

URL: https://github.com/llvm/llvm-project/commit/ae331245b730a2c91ecc227c4cb1198d2b3ad94e
DIFF: https://github.com/llvm/llvm-project/commit/ae331245b730a2c91ecc227c4cb1198d2b3ad94e.diff

LOG: [ORC] Rename ThreadSafeModule::takingModuleDo to consumingModuleDo.

Renamed to emphasize intent: this method allows the module to be consumed by the
callback (while protected by the context lock), but we don't want to imply that
the Module could be taken out of the ThreadSafeModule (where it would no longer
be protected by that lock).

Added: 
    

Modified: 
    llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
    llvm/unittests/ExecutionEngine/Orc/ThreadSafeModuleTest.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h b/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
index bc3464250ddc..8ebbf8b3123a 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
@@ -147,7 +147,7 @@ class ThreadSafeModule {
   /// Locks the associated ThreadSafeContext and calls the given function,
   /// passing the contained std::unique_ptr<Module>. The given function should
   /// consume the Module.
-  template <typename Func> decltype(auto) takingModuleDo(Func &&F) {
+  template <typename Func> decltype(auto) consumingModuleDo(Func &&F) {
     auto Lock = TSCtx.getLock();
     return F(std::move(M));
   }

diff  --git a/llvm/unittests/ExecutionEngine/Orc/ThreadSafeModuleTest.cpp b/llvm/unittests/ExecutionEngine/Orc/ThreadSafeModuleTest.cpp
index 1cda029a6764..5b094e2edd58 100644
--- a/llvm/unittests/ExecutionEngine/Orc/ThreadSafeModuleTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/ThreadSafeModuleTest.cpp
@@ -107,12 +107,12 @@ TEST(ThreadSafeModuleTest, WithModuleDoConst) {
   TSM.withModuleDo([](const Module &M) {});
 }
 
-TEST(ThreadSafeModuleTest, TakingModuleDo) {
-  // Test takingModuleDo.
+TEST(ThreadSafeModuleTest, ConsumingModuleDo) {
+  // Test consumingModuleDo.
   ThreadSafeContext TSCtx(std::make_unique<LLVMContext>());
   ThreadSafeModule TSM(std::make_unique<Module>("M", *TSCtx.getContext()),
                        TSCtx);
-  TSM.takingModuleDo([](std::unique_ptr<Module> M) {});
+  TSM.consumingModuleDo([](std::unique_ptr<Module> M) {});
 }
 
 } // end anonymous namespace


        


More information about the llvm-commits mailing list