From e25be58b6207054db623ed231f3446b45dfebb58 Mon Sep 17 00:00:00 2001
From: Trevor Morris <trevmorr@amazon.com>
Date: Wed, 18 Nov 2020 23:31:05 +0000
Subject: [PATCH] explicitly use new to avoid exit-time destruction of global
 state for VM

---
 src/runtime/vm/memory_manager.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/runtime/vm/memory_manager.cc b/src/runtime/vm/memory_manager.cc
index 4e480507e71a..960b2e20145a 100644
--- a/src/runtime/vm/memory_manager.cc
+++ b/src/runtime/vm/memory_manager.cc
@@ -110,8 +110,10 @@ NDArray StorageObj::AllocNDArray(size_t offset, std::vector<int64_t> shape, DLDa
 }
 
 MemoryManager* MemoryManager::Global() {
-  static MemoryManager memory_manager;
-  return &memory_manager;
+  // NOTE: explicitly use new to avoid exit-time destruction of global state
+  // Global state will be recycled by OS as the process exits.
+  static auto* inst = new MemoryManager();
+  return inst;
 }
 
 Allocator* MemoryManager::GetOrCreateAllocator(TVMContext ctx, AllocatorType type) {