maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

BitcodeReader: Avoid non-moving std::piecewise_construct from r267296 

Not exactly sure why the host tries to use a copy constructor here, but
it's easy enough to work around it.

http://lab.llvm.org:8011/builders/lldb-amd64-ninja-freebsd11/builds/6227

llvm-svn: 267298
This commit is contained in:
Duncan P. N. Exon Smith 2016-04-23 21:23:41 +00:00
parent 383f8413cf
commit ece57ddd56
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -1215,9 +1215,9 @@ Metadata *BitcodeReaderMetadataList::upgradeTypeRefArray(Metadata *MaybeTuple) {
// Create and return a placeholder to use for now. Eventually
// resolveTypeRefArrays() will be resolve this forward reference.
OldTypeRefs.Arrays.emplace_back(
std::piecewise_construct, std::make_tuple(Tuple),
std::make_tuple(MDTuple::getTemporary(Context, None)));
OldTypeRefs.Arrays.emplace_back();
OldTypeRefs.Arrays.back().first.reset(Tuple);
OldTypeRefs.Arrays.back().second = MDTuple::getTemporary(Context, None);
return OldTypeRefs.Arrays.back().second.get();
}