diff options
author | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-09-23 14:41:02 +0000 |
---|---|---|
committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-09-23 14:41:02 +0000 |
commit | a6c580e8346810f6c93d3fa9891a00892609b409 (patch) | |
tree | 703b9922722be9c60cad14cff82685dccae39325 /unittests/ExecutionEngine | |
parent | 7cde53f70d06722d81a18face5c30fe749539eb2 (diff) |
Rework r218304, "ExecutionEngineTests: Call llvm_shutdown() on exit for ManagedStatic introduced in r218151."
r218304 caused crash on msvc builder.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218308 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/ExecutionEngine')
-rw-r--r-- | unittests/ExecutionEngine/ExecutionEngineTest.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/unittests/ExecutionEngine/ExecutionEngineTest.cpp b/unittests/ExecutionEngine/ExecutionEngineTest.cpp index 2ef89160824..326213c9368 100644 --- a/unittests/ExecutionEngine/ExecutionEngineTest.cpp +++ b/unittests/ExecutionEngine/ExecutionEngineTest.cpp @@ -17,11 +17,12 @@ using namespace llvm; -static llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. - namespace { class ExecutionEngineTest : public testing::Test { +private: + llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. + protected: ExecutionEngineTest() { auto Owner = make_unique<Module>("<main>", getGlobalContext()); |