From: Lang Hames <lhames@gmail.com>
Date: Mon, 19 Oct 2015 23:23:17 +0000 (+0000)
Subject: [Orc] Fix MSVC bugs introduced in r250749.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=354229b21763df2d158745395704f4a87d706dbb;p=oota-llvm.git

[Orc] Fix MSVC bugs introduced in r250749.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@250758 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h b/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
index a72805d2af9..e71e66e2127 100644
--- a/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
+++ b/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
@@ -67,13 +67,20 @@ private:
     std::set<const Function*> StubsToClone;
     std::unique_ptr<IndirectStubsMgrT> StubsMgr;
 
-    LogicalModuleResources() {}
+    LogicalModuleResources() = default;
 
     // Explicit move constructor to make MSVC happy.
-    LogicalModuleResources(LogicalModuleResources &&Other) = default;
+    LogicalModuleResources(LogicalModuleResources &&Other)
+        : SourceModule(std::move(Other.SourceModule)),
+          StubsToClone(std::move(Other.StubsToClone)),
+          StubsMgr(std::move(Other.StubsMgr)) {}
 
     // Explicit move assignment to make MSVC happy.
-    LogicalModuleResources& operator=(LogicalModuleResources &&Other) = default;
+    LogicalModuleResources& operator=(LogicalModuleResources &&Other) {
+      SourceModule = std::move(Other.SourceModule);
+      StubsToClone = std::move(Other.StubsToClone);
+      StubsMgr = std::move(Other.StubsMgr);
+    }
 
     JITSymbol findSymbol(StringRef Name, bool ExportedSymbolsOnly) {
       if (Name.endswith("$stub_ptr") && !ExportedSymbolsOnly) {