From: Justin Bogner <mail@justinbogner.com>
Date: Wed, 22 Jul 2015 21:41:12 +0000 (+0000)
Subject: IPO: Avoid brace initialization of a map, some versions of libc++ don't like it
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=34e7058dc8722ca69ff9a671e0b8746ae228a403;p=oota-llvm.git

IPO: Avoid brace initialization of a map, some versions of libc++ don't like it

Should fix the build failure on these darwin bots:

http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-incremental_build/12427/
http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA_build/10389/

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

diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp
index 27be1b40a32..b74cff1aafe 100644
--- a/lib/Transforms/IPO/GlobalOpt.cpp
+++ b/lib/Transforms/IPO/GlobalOpt.cpp
@@ -2000,6 +2000,9 @@ struct MutatedGlobal {
   GlobalVariable *GV;
   Constant *Initializer;
   StoreMap Pending;
+
+public:
+  MutatedGlobal(GlobalVariable *GV) : GV(GV), Initializer(nullptr) {}
 };
 
 /// MutatedGlobals - This class tracks and commits stores to globals as basic
@@ -2047,7 +2050,7 @@ void MutatedGlobals::AddStore(Constant *Ptr, Constant *Value) {
 
   auto I = Globals.find(GV);
   if (I == Globals.end()) {
-    auto R = Globals.insert(std::make_pair(GV, MutatedGlobal{GV, nullptr, {}}));
+    auto R = Globals.insert(std::make_pair(GV, MutatedGlobal(GV)));
     assert(R.second && "Global value already in the map?");
     I = R.first;
   }