<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jun 16, 2016 at 2:45 PM, Evgeniy Stepanov via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: eugenis<br>
Date: Thu Jun 16 16:45:13 2016<br>
New Revision: 272965<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=272965&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=272965&view=rev</a><br>
Log:<br>
Fix BitVector move ctor/assignment.<br>
<br>
Current implementation leaves the object in an invalid state.<br>
<br>
This reverts commit bf0c389ac683cd6c0e5959b16537e59e5f4589e3.<br></blockquote><div><br></div><div>I assume this isn't a revert of anything, is it?<br><br>(but if it is, we have llvm/utils/git-svn/git-svnrevert that helps revert a patch using a git hash, but produces a commit message that lists the SVN revision instead of the git hash, so it's useful for archival purposes)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
    llvm/trunk/include/llvm/ADT/BitVector.h<br>
    llvm/trunk/unittests/ADT/BitVectorTest.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/ADT/BitVector.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/BitVector.h?rev=272965&r1=272964&r2=272965&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/BitVector.h?rev=272965&r1=272964&r2=272965&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ADT/BitVector.h (original)<br>
+++ llvm/trunk/include/llvm/ADT/BitVector.h Thu Jun 16 16:45:13 2016<br>
@@ -105,6 +105,7 @@ public:<br>
   BitVector(BitVector &&RHS)<br>
     : Bits(RHS.Bits), Size(RHS.Size), Capacity(RHS.Capacity) {<br>
     RHS.Bits = nullptr;<br>
+    RHS.Size = RHS.Capacity = 0;<br>
   }<br>
<br>
   ~BitVector() {<br>
@@ -454,6 +455,7 @@ public:<br>
     Capacity = RHS.Capacity;<br>
<br>
     RHS.Bits = nullptr;<br>
+    RHS.Size = RHS.Capacity = 0;<br>
<br>
     return *this;<br>
   }<br>
<br>
Modified: llvm/trunk/unittests/ADT/BitVectorTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/BitVectorTest.cpp?rev=272965&r1=272964&r2=272965&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/BitVectorTest.cpp?rev=272965&r1=272964&r2=272965&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/unittests/ADT/BitVectorTest.cpp (original)<br>
+++ llvm/trunk/unittests/ADT/BitVectorTest.cpp Thu Jun 16 16:45:13 2016<br>
@@ -399,5 +399,31 @@ TYPED_TEST(BitVectorTest, CompoundTestRe<br>
   C.reset(C);<br>
   EXPECT_TRUE(C.none());<br>
 }<br>
+<br>
+TYPED_TEST(BitVectorTest, MoveConstructor) {<br>
+  TypeParam A(10, true);<br>
+  TypeParam B(std::move(A));<br>
+  // Check that the move ctor leaves the moved-from object in a valid state.<br>
+  // The following line used to crash.<br>
+  A = B;<br>
+<br>
+  TypeParam C(10, true);<br>
+  EXPECT_EQ(C, A);<br>
+  EXPECT_EQ(C, B);<br>
+}<br>
+<br>
+TYPED_TEST(BitVectorTest, MoveAssignment) {<br>
+  TypeParam A(10, true);<br>
+  TypeParam B;<br>
+  B = std::move(A);<br>
+  // Check that move assignment leaves the moved-from object in a valid state.<br>
+  // The following line used to crash.<br>
+  A = B;<br>
+<br>
+  TypeParam C(10, true);<br>
+  EXPECT_EQ(C, A);<br>
+  EXPECT_EQ(C, B);<br>
+}<br>
+<br>
 }<br>
 #endif<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>