From a6c580e8346810f6c93d3fa9891a00892609b409 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Tue, 23 Sep 2014 14:41:02 +0000 Subject: [PATCH] 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 --- unittests/ExecutionEngine/ExecutionEngineTest.cpp | 5 +++-- 1 file 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("
", getGlobalContext()); -- 2.34.1