[llvm] 7e8babe - Revert "[examples] Fix SectionMemoryManager deconstruction error with MSVC."

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2021-09-17T17:42:25+10:00
New Revision: 7e8babeb9d55749e3c9cae8802a644c5c96b1942

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

LOG: Revert "[examples] Fix SectionMemoryManager deconstruction error with MSVC."

This reverts commit 63838d88145feaeb839efff8f40ab1e98597e423, which broke tests
on some bots. See e.g. https://lab.llvm.org/buildbot#builders/109/builds/22561

Added: 
    

Modified: 
    llvm/lib/ExecutionEngine/SectionMemoryManager.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp b/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp
index 9a1fb31fe1603..6690dd07d99b2 100644
--- a/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp
+++ b/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp
@@ -13,7 +13,6 @@
 
 #include "llvm/ExecutionEngine/SectionMemoryManager.h"
 #include "llvm/Config/config.h"
-#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/Process.h"
 
@@ -265,10 +264,10 @@ class DefaultMMapper final : public SectionMemoryManager::MemoryMapper {
   }
 };
 
-ManagedStatic<DefaultMMapper> DefaultMMapperInstance;
+DefaultMMapper DefaultMMapperInstance;
 } // namespace
 
 SectionMemoryManager::SectionMemoryManager(MemoryMapper *MM)
-    : MMapper(MM ? *MM : *DefaultMMapperInstance) {}
+    : MMapper(MM ? *MM : DefaultMMapperInstance) {}
 
 } // namespace llvm