From: Alexey Samsonov <vonosmas@gmail.com>
Date: Mon, 26 Oct 2015 21:20:37 +0000 (+0000)
Subject: Fix build failure on GCC 4.7 (old libstdc++ doesn't have std::map::emplace).
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b522682945a257c6544abf111b837144aa7093cb;p=oota-llvm.git

Fix build failure on GCC 4.7 (old libstdc++ doesn't have std::map::emplace).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@251347 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/DebugInfo/Symbolize/Symbolize.cpp b/lib/DebugInfo/Symbolize/Symbolize.cpp
index aa24dd945d1..ecdb089cd77 100644
--- a/lib/DebugInfo/Symbolize/Symbolize.cpp
+++ b/lib/DebugInfo/Symbolize/Symbolize.cpp
@@ -530,7 +530,8 @@ LLVMSymbolizer::getOrCreateModuleInfo(const std::string &ModuleName) {
 
   if (!Objects.first) {
     // Failed to find valid object file.
-    Modules.insert(make_pair(ModuleName, nullptr));
+    Modules.insert(
+        std::make_pair(ModuleName, std::unique_ptr<ModuleInfo>(nullptr)));
     return nullptr;
   }
   std::unique_ptr<DIContext> Context;
@@ -549,7 +550,7 @@ LLVMSymbolizer::getOrCreateModuleInfo(const std::string &ModuleName) {
   assert(Context);
   auto Info = llvm::make_unique<ModuleInfo>(Objects.first, std::move(Context));
   ModuleInfo *Res = Info.get();
-  Modules.emplace(ModuleName, std::move(Info));
+  Modules.insert(std::make_pair(ModuleName, std::move(Info)));
   return Res;
 }