From 7e8babeb9d55749e3c9cae8802a644c5c96b1942 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Fri, 17 Sep 2021 17:42:25 +1000 Subject: [PATCH] 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 --- llvm/lib/ExecutionEngine/SectionMemoryManager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 DefaultMMapperInstance; +DefaultMMapper DefaultMMapperInstance; } // namespace SectionMemoryManager::SectionMemoryManager(MemoryMapper *MM) - : MMapper(MM ? *MM : *DefaultMMapperInstance) {} + : MMapper(MM ? *MM : DefaultMMapperInstance) {} } // namespace llvm -- 2.7.4