From: Geoff Berry <gberry@codeaurora.org>
Date: Mon, 8 Aug 2016 19:33:27 +0000 (+0000)
Subject: [MemorySSA] Fix windows build breakage caused by r278028 (take 2)
X-Git-Tag: llvmorg-4.0.0-rc1~13031
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75331f7f2e31009798bafad00478a851dd25a250;p=platform%2Fupstream%2Fllvm.git

[MemorySSA] Fix windows build breakage caused by r278028 (take 2)

r278028: [MemorySSA] Ensure address stability of MemorySSA object.
llvm-svn: 278041
---

diff --git a/llvm/include/llvm/Transforms/Utils/MemorySSA.h b/llvm/include/llvm/Transforms/Utils/MemorySSA.h
index 481ab18..cf065b2 100644
--- a/llvm/include/llvm/Transforms/Utils/MemorySSA.h
+++ b/llvm/include/llvm/Transforms/Utils/MemorySSA.h
@@ -680,7 +680,12 @@ public:
   // unique_ptr<MemorySSA> to avoid build breakage on MSVC.
   struct Result {
     Result(std::unique_ptr<MemorySSA> &&MSSA) : MSSA(std::move(MSSA)) {}
+    Result(Result &&R) : MSSA(std::move(R.MSSA)) {}
     MemorySSA &getMSSA() { return *MSSA.get(); }
+
+    Result(const Result &) = delete;
+    void operator=(const Result &) = delete;
+
     std::unique_ptr<MemorySSA> MSSA;
   };