-Wdeprecated-clean: Fix cases of violating the rule of 5 in ways that are deprecated...

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

diff --git a/include/llvm/ExecutionEngine/Orc/LogicalDylib.h b/include/llvm/ExecutionEngine/Orc/LogicalDylib.h
index 28700ef347d6b9316c51e89f49f3af765636ba1e..be9cdfa7193f3ddc5ef15fef022ad4e4fe7ebe8c 100644 (file)
--- a/include/llvm/ExecutionEngine/Orc/LogicalDylib.h
+++ b/include/llvm/ExecutionEngine/Orc/LogicalDylib.h
@@ -28,6 +28,10 @@ private:
   typedef std::vector<BaseLayerModuleSetHandleT> BaseLayerHandleList;
 
   struct LogicalModule {
   typedef std::vector<BaseLayerModuleSetHandleT> BaseLayerHandleList;
 
   struct LogicalModule {

+    // Make this move-only to ensure they don't get duplicated across moves of
+    // LogicalDylib or anything like that.
+    LogicalModule(LogicalModule&&) = default;
+    LogicalModule() = default;

     LogicalModuleResources Resources;
     BaseLayerHandleList BaseLayerHandles;
   };
     LogicalModuleResources Resources;
     BaseLayerHandleList BaseLayerHandles;
   };


@@ -46,6 +50,10 @@ public:
         BaseLayer.removeModuleSet(BLH);
   }
 
         BaseLayer.removeModuleSet(BLH);
   }
 

+  // If possible, remove this and ~LogicalDylib once the work in the dtor is
+  // moved to members (eg: self-unregistering base layer handles).
+  LogicalDylib(LogicalDylib&& RHS) = default;
+

   LogicalModuleHandle createLogicalModule() {
     LogicalModules.push_back(LogicalModule());
     return std::prev(LogicalModules.end());
   LogicalModuleHandle createLogicalModule() {
     LogicalModules.push_back(LogicalModule());
     return std::prev(LogicalModules.end());