From: Lang Hames <lhames@gmail.com>
Date: Fri, 17 Sep 2021 07:42:25 +0000 (+1000)
Subject: Revert "[examples] Fix SectionMemoryManager deconstruction error with MSVC."
X-Git-Tag: upstream/15.0.7~31263
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e8babeb9d55749e3c9cae8802a644c5c96b1942;p=platform%2Fupstream%2Fllvm.git

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
---

diff --git a/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp b/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp
index 9a1fb31..6690dd0 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 @@ public:
   }
 };
 
-ManagedStatic<DefaultMMapper> DefaultMMapperInstance;
+DefaultMMapper DefaultMMapperInstance;
 } // namespace
 
 SectionMemoryManager::SectionMemoryManager(MemoryMapper *MM)
-    : MMapper(MM ? *MM : *DefaultMMapperInstance) {}
+    : MMapper(MM ? *MM : DefaultMMapperInstance) {}
 
 } // namespace llvm