[llvm] r267298 - BitcodeReader: Avoid non-moving std::piecewise_construct from r267296

[Duncan P. N. Exon Smith via llvm-commits]

Author: dexonsmith
Date: Sat Apr 23 16:23:41 2016
New Revision: 267298

URL: http://llvm.org/viewvc/llvm-project?rev=267298&view=rev
Log:
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

Modified:
    llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp

Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=267298&r1=267297&r2=267298&view=diff
==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Sat Apr 23 16:23:41 2016
@@ -1215,9 +1215,9 @@ Metadata *BitcodeReaderMetadataList::upg
 
   // 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();
 }