Rework r218304, "ExecutionEngineTests: Call llvm_shutdown() on exit for ManagedStatic...

r218304 caused crash on msvc builder.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218308 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/unittests/ExecutionEngine/ExecutionEngineTest.cpp b/unittests/ExecutionEngine/ExecutionEngineTest.cpp
index 2ef891608247ef35de78526829b1dab068203c9f..326213c93681ef5cb0881607846c1af3257fb060 100644 (file)
--- 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());