1 files changed, 3 insertions, 3 deletions
diff --git a/source/Symbol/ClangExternalASTSourceCommon.cpp b/source/Symbol/ClangExternalASTSourceCommon.cpp
index 79cc9a91355a..77aea1eafc4f 100644
--- a/source/Symbol/ClangExternalASTSourceCommon.cpp
+++ b/source/Symbol/ClangExternalASTSourceCommon.cpp
@@ -9,7 +9,6 @@
 
 #include "lldb/Symbol/ClangExternalASTSourceCommon.h"
 #include "lldb/Core/Stream.h"
-#include "lldb/Host/Mutex.h"
 
 using namespace lldb_private;
 
@@ -19,8 +18,9 @@ typedef llvm::DenseMap<clang::ExternalASTSource *, ClangExternalASTSourceCommon
 
 static ASTSourceMap &GetSourceMap()
 {
-    static ASTSourceMap s_source_map;
-    return s_source_map;
+    // Intentionally leaked to avoid problems with global destructors.
+    static ASTSourceMap *s_source_map = new ASTSourceMap;
+    return *s_source_map;
 }
 
 ClangExternalASTSourceCommon *