[llvm] adf55ac - [ORC] Call ExecutorProcessControl::disconnect in unit tests that require it.

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2021-10-12T14:59:39-07:00
New Revision: adf55ac6657693f7bfbe3087b599b4031a765a44

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

LOG: [ORC] Call ExecutorProcessControl::disconnect in unit tests that require it.

Another follow-up to 2815ed57e3c and 19b4e3cfc6a. For unit tests that don't use
an ExecutionSession we need to call ExecutorProcessControl::disconnect directly
to wait for the dispatcher to shut down.

https://llvm.org/PR52153

Added: 
    

Modified: 
    llvm/unittests/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManagerTest.cpp
    llvm/unittests/ExecutionEngine/Orc/EPCGenericMemoryAccessTest.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/unittests/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManagerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManagerTest.cpp
index f2b157e424b6..a95435aec2a3 100644
--- a/llvm/unittests/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManagerTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManagerTest.cpp
@@ -134,6 +134,8 @@ TEST(EPCGenericJITLinkMemoryManagerTest, AllocFinalizeFree) {
 
   auto Err2 = MemMgr->deallocate(std::move(*FA));
   EXPECT_THAT_ERROR(std::move(Err2), Succeeded());
+
+  cantFail(SelfEPC->disconnect());
 }
 
 } // namespace

diff  --git a/llvm/unittests/ExecutionEngine/Orc/EPCGenericMemoryAccessTest.cpp b/llvm/unittests/ExecutionEngine/Orc/EPCGenericMemoryAccessTest.cpp
index 78024644ca8b..beb0fefa094a 100644
--- a/llvm/unittests/ExecutionEngine/Orc/EPCGenericMemoryAccessTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/EPCGenericMemoryAccessTest.cpp
@@ -93,6 +93,8 @@ TEST(EPCGenericMemoryAccessTest, MemWrites) {
       {{pointerToJITTargetAddress(&Test_Buffer), TestMsg}});
   EXPECT_THAT_ERROR(std::move(Err5), Succeeded());
   EXPECT_EQ(StringRef(Test_Buffer, TestMsg.size()), TestMsg);
+
+  cantFail(SelfEPC->disconnect());
 }
 
 } // namespace