[llvm] r265470 - Try harder to appease MSVC after r265456

Duncan P. N. Exon Smith via llvm-commits llvm-commits at lists.llvm.org
Tue Apr 5 14:25:33 PDT 2016


Author: dexonsmith
Date: Tue Apr  5 16:25:33 2016
New Revision: 265470

URL: http://llvm.org/viewvc/llvm-project?rev=265470&view=rev
Log:
Try harder to appease MSVC after r265456

r265465 wasn't good enough.  I need to spell out all the moves.

Modified:
    llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp

Modified: llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp?rev=265470&r1=265469&r2=265470&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp Tue Apr  5 16:25:33 2016
@@ -105,9 +105,18 @@ class MDNodeMapper {
     unsigned ID = ~0u;
     TempMDNode Placeholder;
 
-    Data() = default;
-    Data(Data &&) = default;
-    Data &operator=(Data &&) = default;
+    Data() {}
+    Data(Data &&X)
+        : HasChangedOps(std::move(X.HasChangedOps)),
+          HasChangedAddress(std::move(X.HasChangedAddress)),
+          ID(std::move(X.ID)), Placeholder(std::move(X.Placeholder)) {}
+    Data &operator=(Data &&X) {
+      HasChangedOps = std::move(X.HasChangedOps);
+      HasChangedAddress = std::move(X.HasChangedAddress);
+      ID = std::move(X.ID);
+      Placeholder = std::move(X.Placeholder);
+      return *this;
+    }
   };
 
   SmallDenseMap<const Metadata *, Data, 32> Info;




More information about the llvm-commits mailing list