summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2015-10-19 23:23:17 +0000
committerLang Hames <lhames@gmail.com>2015-10-19 23:23:17 +0000
commit6372a0bd51aca8762014c334926b9b13ab17e7b6 (patch)
tree1ff20230d6fe297ee509699b6218c154a5503a3c /llvm
parentfac5243493ffdf437d5f02bc20e14b1d3205fd8e (diff)
downloadbcm5719-llvm-6372a0bd51aca8762014c334926b9b13ab17e7b6.tar.gz
bcm5719-llvm-6372a0bd51aca8762014c334926b9b13ab17e7b6.zip
[Orc] Fix MSVC bugs introduced in r250749.
llvm-svn: 250758
Diffstat (limited to 'llvm')
-rw-r--r--llvm/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h b/llvm/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
index a72805d2af9..e71e66e2127 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
+++ b/llvm/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) {
OpenPOWER on IntegriCloud