explicitly use new to avoid exit-time destruction of global state for…

… VM (apache#6938)
trevor-m · Dec 2, 2020 · d8ffa64 · d8ffa64
1 parent 5d43cfa
commit d8ffa64
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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) {