[llvm] r272173 - Try to appease buildbots.

[George Burgess IV via llvm-commits]

Author: gbiv
Date: Wed Jun  8 12:27:14 2016
New Revision: 272173

URL: http://llvm.org/viewvc/llvm-project?rev=272173&view=rev
Log:
Try to appease buildbots.

r272064 apparently made them angry. This undoes some changes made in
r272064 (defaulting move ctors) to make them happy again.


Modified:
    llvm/trunk/lib/Analysis/StratifiedSets.h

Modified: llvm/trunk/lib/Analysis/StratifiedSets.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/StratifiedSets.h?rev=272173&r1=272172&r2=272173&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/StratifiedSets.h (original)
+++ llvm/trunk/lib/Analysis/StratifiedSets.h Wed Jun  8 12:27:14 2016
@@ -97,14 +97,19 @@ public:
   // If we have a need to copy these at some point, it's fine to default this.
   // At the time of writing, copying StratifiedSets is always a perf bug.
   StratifiedSets(const StratifiedSets &) = delete;
-  StratifiedSets(StratifiedSets &&Other) = default;
+
+  // Can't default these due to compile errors in MSVC2013
+  StratifiedSets(StratifiedSets &&Other) { *this = std::move(Other); }
+  StratifiedSets &operator=(StratifiedSets &&Other) {
+    Values = std::move(Other.Values);
+    Links = std::move(Other.Links);
+    return *this;
+  }
 
   StratifiedSets(DenseMap<T, StratifiedInfo> Map,
                  std::vector<StratifiedLink> Links)
       : Values(std::move(Map)), Links(std::move(Links)) {}
 
-  StratifiedSets &operator=(StratifiedSets<T> &&Other) = default;
-
   Optional<StratifiedInfo> find(const T &Elem) const {
     auto Iter = Values.find(Elem);
     if (Iter == Values.end())