From 63abd4b15018fe85eb8f187e3d8c94d14327b037 Mon Sep 17 00:00:00 2001 From: Anthony Pesch Date: Wed, 22 Jul 2015 22:26:52 +0000 Subject: [PATCH] Revert "IPO: Avoid brace initialization of a map, some versions of libc++ don't like it" This reverts commit fc2dad0c68f8d32273d3c2d790ed496961f829af. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@242953 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/GlobalOpt.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp index b74cff1aafe..27be1b40a32 100644 --- a/lib/Transforms/IPO/GlobalOpt.cpp +++ b/lib/Transforms/IPO/GlobalOpt.cpp @@ -2000,9 +2000,6 @@ 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 @@ -2050,7 +2047,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))); + auto R = Globals.insert(std::make_pair(GV, MutatedGlobal{GV, nullptr, {}})); assert(R.second && "Global value already in the map?"); I = R.first; } -- 2.34.1