From 465b4d9ac3434c5af9337207461d0feb5a5a71da Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Wed, 30 Jul 2014 00:05:02 +0000 Subject: [PATCH] UseListOrder: Remove move assignment Remove the move assignment added in r214213, since it wasn't necessary to fix the bots (r214224 was the magic touch). llvm-svn: 214260 --- llvm/include/llvm/IR/UseListOrder.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/llvm/include/llvm/IR/UseListOrder.h b/llvm/include/llvm/IR/UseListOrder.h index f766231..7c4ba07 100644 --- a/llvm/include/llvm/IR/UseListOrder.h +++ b/llvm/include/llvm/IR/UseListOrder.h @@ -54,15 +54,12 @@ class UseListShuffleVector { UseListShuffleVector(const UseListShuffleVector &X) LLVM_DELETED_FUNCTION; UseListShuffleVector & operator=(const UseListShuffleVector &X) LLVM_DELETED_FUNCTION; + UseListShuffleVector & + operator=(UseListShuffleVector &&X) LLVM_DELETED_FUNCTION; public: UseListShuffleVector() : Size(0) {} UseListShuffleVector(UseListShuffleVector &&X) { moveUnchecked(X); } - UseListShuffleVector &operator=(UseListShuffleVector &&X) { - destroy(); - moveUnchecked(X); - return *this; - } explicit UseListShuffleVector(size_t Size) : Size(Size) { if (!isSmall()) Storage.Ptr = new unsigned[Size]; @@ -93,16 +90,11 @@ struct UseListOrder { UseListOrder() : V(0), F(0) {} UseListOrder(UseListOrder &&X) : V(X.V), F(X.F), Shuffle(std::move(X.Shuffle)) {} - UseListOrder &operator=(UseListOrder &&X) { - V = X.V; - F = X.F; - Shuffle = std::move(X.Shuffle); - return *this; - } private: UseListOrder(const UseListOrder &X) LLVM_DELETED_FUNCTION; UseListOrder &operator=(const UseListOrder &X) LLVM_DELETED_FUNCTION; + UseListOrder &operator=(UseListOrder &&X) LLVM_DELETED_FUNCTION; }; typedef std::vector UseListOrderStack; -- 2.7.4