commit a997856b3d0610a7db795dbd03c511eabb6d0382
author Duncan P. N. Exon Smith <dexonsmith@apple.com> Sun Apr 03 20:42:21 2016 +0000
committer Duncan P. N. Exon Smith <dexonsmith@apple.com> Sun Apr 03 20:42:21 2016 +0000
tree fe1088724c4b4410c826002cbeed0af041613093
parent 0edd3d771ab3b850ba05f09630d3b0a465b8a9b0

Work around MSVC failure from r265273

http://lab.llvm.org:8011/builders/sanitizer-windows/builds/19726

llvm-svn: 265275

llvm/lib/Transforms/Utils/ValueMapper.cpp

diff --git a/llvm/lib/Transforms/Utils/ValueMapper.cpp b/llvm/lib/Transforms/Utils/ValueMapper.cpp
index 6362693..64ba98e 100644
--- a/llvm/lib/Transforms/Utils/ValueMapper.cpp
+++ b/llvm/lib/Transforms/Utils/ValueMapper.cpp
@@ -43,6 +43,16 @@
 struct DelayedBasicBlock {
   BasicBlock *OldBB;
   std::unique_ptr<BasicBlock> TempBB;
+
+  // Explicit move for MSVC.
+  DelayedBasicBlock(DelayedBasicBlock &&X)
+      : OldBB(std::move(X.OldBB)), TempBB(std::move(X.TempBB)) {}
+  DelayedBasicBlock &operator=(DelayedBasicBlock &&X) {
+    OldBB = std::move(X.OldBB);
+    TempBB = std::move(X.TempBB);
+    return *this;
+  }
+
   DelayedBasicBlock(const BlockAddress &Old)
       : OldBB(Old.getBasicBlock()),
         TempBB(BasicBlock::Create(Old.getContext())) {}