[llvm] r218308 - Rework r218304, "ExecutionEngineTests: Call llvm_shutdown() on exit for ManagedStatic introduced in r218151."

[NAKAMURA Takumi]

Author: chapuni
Date: Tue Sep 23 09:41:02 2014
New Revision: 218308

URL: http://llvm.org/viewvc/llvm-project?rev=218308&view=rev
Log:
Rework r218304, "ExecutionEngineTests: Call llvm_shutdown() on exit for ManagedStatic introduced in r218151."

r218304 caused crash on msvc builder.

Modified:
    llvm/trunk/unittests/ExecutionEngine/ExecutionEngineTest.cpp

Modified: llvm/trunk/unittests/ExecutionEngine/ExecutionEngineTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ExecutionEngine/ExecutionEngineTest.cpp?rev=218308&r1=218307&r2=218308&view=diff
==============================================================================
--- llvm/trunk/unittests/ExecutionEngine/ExecutionEngineTest.cpp (original)
+++ llvm/trunk/unittests/ExecutionEngine/ExecutionEngineTest.cpp Tue Sep 23 09:41:02 2014
@@ -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());