aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
diff options
context:
space:
mode:
authorDuncan P. N. Exon Smith <dexonsmith@apple.com>2016-04-23 21:23:41 +0000
committerDuncan P. N. Exon Smith <dexonsmith@apple.com>2016-04-23 21:23:41 +0000
commitece57ddd567966248231cc5519816b42bd99bd7d (patch)
tree20e38748639893d28a08f1352116bf72683f2879 /llvm/lib/Bitcode/Reader/BitcodeReader.cpp
parent383f8413cf901c8ea026318b4f95ab00107fd38c (diff)
downloadllvm-ece57ddd567966248231cc5519816b42bd99bd7d.zip
llvm-ece57ddd567966248231cc5519816b42bd99bd7d.tar.gz
llvm-ece57ddd567966248231cc5519816b42bd99bd7d.tar.bz2
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
Diffstat (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp')
-rw-r--r--llvm/lib/Bitcode/Reader/BitcodeReader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index ecd05c2..dc8a904 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -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();
}