Add some extra checks to the MoveOnly test class to ensure it is not constructed or assigned from in a moved-from state.

Some tests were constructing it with 0, so use -1 as the invalid state
instead.

Reviewers: Marshall Clow

Differential Revision: http://reviews.llvm.org/D4095

llvm-svn: 215301

1 files changed, 11 insertions, 5 deletions

diff --git a/libcxx/test/containers/MoveOnly.h b/libcxx/test/containers/MoveOnly.h
index e4d9f649560..96eef95913c 100644
--- a/libcxx/test/containers/MoveOnly.h
+++ b/libcxx/test/containers/MoveOnly.h
@@ -22,11 +22,17 @@ class MoveOnly
 
     int data_;
 public:
-    MoveOnly(int data = 1) : data_(data) {}
-    MoveOnly(MoveOnly&& x)
-        : data_(x.data_) {x.data_ = 0;}
-    MoveOnly& operator=(MoveOnly&& x)
-        {data_ = x.data_; x.data_ = 0; return *this;}
+    MoveOnly(int data = 0) : data_(data) { assert(data != -1); }
+    MoveOnly(MoveOnly &&x) : data_(x.data_) {
+        assert(x.data_ != -1);
+        x.data_ = -1;
+    }
+    MoveOnly &operator=(MoveOnly &&x) {
+        assert(x.data_ != -1);
+        data_ = x.data_;
+        x.data_ = -1;
+        return *this;
+    }
 
     int get() const {return data_;}