Try to fix the build for C++ standard libraries missing std::map::emplace
llvm-svn: 243899
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
index 497b497..d1d3792 100644
--- a/llvm/lib/AsmParser/LLParser.cpp
+++ b/llvm/lib/AsmParser/LLParser.cpp
@@ -2609,9 +2609,8 @@
if (!F) {
// Make a global variable as a placeholder for this reference.
GlobalValue *&FwdRef =
- ForwardRefBlockAddresses.emplace(std::piecewise_construct,
- std::forward_as_tuple(std::move(Fn)),
- std::forward_as_tuple())
+ ForwardRefBlockAddresses.insert(std::make_pair, std::move(Fn),
+ std::map<ValID, GlobalValue *>())
.first->second.insert(std::make_pair(std::move(Label), nullptr))
.first->second;
if (!FwdRef)
diff --git a/llvm/lib/AsmParser/LLParser.h b/llvm/lib/AsmParser/LLParser.h
index acbf6f9..dbbb97a 100644
--- a/llvm/lib/AsmParser/LLParser.h
+++ b/llvm/lib/AsmParser/LLParser.h
@@ -67,12 +67,12 @@
std::unique_ptr<Constant *[]> ConstantStructElts;
ValID() = default;
- ValID(ValID &&RHS)
+ ValID(const ValID &RHS)
: Kind(RHS.Kind), Loc(RHS.Loc), UIntVal(RHS.UIntVal), FTy(RHS.FTy),
- StrVal(std::move(RHS.StrVal)), StrVal2(std::move(RHS.StrVal2)),
- APSIntVal(std::move(RHS.APSIntVal)),
- APFloatVal(std::move(RHS.APFloatVal)), ConstantVal(RHS.ConstantVal),
- ConstantStructElts(std::move(RHS.ConstantStructElts)) {}
+ StrVal(RHS.StrVal), StrVal2(RHS.StrVal2), APSIntVal(RHS.APSIntVal),
+ APFloatVal(RHS.APFloatVal), ConstantVal(RHS.ConstantVal) {
+ assert(!RHS.ConstantStructElts);
+ }
bool operator<(const ValID &RHS) const {
if (Kind == t_LocalID || Kind == t_GlobalID)