RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-01-18 16:03:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to fix the build for C++ standard libraries missing std::map::emplace

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@243899 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2015-08-03 20:30:53 +00:00
parent f3f35ecb54
commit 5b8c55e5b6
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/AsmParser/LLParser.cpp
View File

@ -2609,9 +2609,8 @@ bool LLParser::ParseValID(ValID &ID, PerFunctionState *PFS) {
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)

10
lib/AsmParser/LLParser.h
View File

@ -67,12 +67,12 @@ namespace llvm {
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)