From 825405c0c1b92c69cea283f97ee829ea3f23e3a4 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 27 Jul 2006 03:38:08 +0000 Subject: [PATCH] Use std::copy instead of custom loops to take advantage of STL optimizations. Add a new append method for appending a range. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29323 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/SmallVector.h | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/include/llvm/ADT/SmallVector.h b/include/llvm/ADT/SmallVector.h index c75453fb257..e542f4cd2c6 100644 --- a/include/llvm/ADT/SmallVector.h +++ b/include/llvm/ADT/SmallVector.h @@ -14,7 +14,9 @@ #ifndef LLVM_ADT_SMALLVECTOR_H #define LLVM_ADT_SMALLVECTOR_H +#include #include +#include #include namespace llvm { @@ -113,6 +115,20 @@ public: goto Retry; } + /// append - Add the specified range to the end of the SmallVector. + /// + template + void append(in_iter in_start, in_iter in_end) { + unsigned NumInputs = std::distance(in_start, in_end); + // Grow allocated space if needed. + if (End+NumInputs > Capacity) + grow(size()+NumInputs); + + // Copy the new elements over. + std::uninitialized_copy(in_start, in_end, End); + End += NumInputs; + } + const SmallVector &operator=(const SmallVector &RHS) { // Avoid self-assignment. if (this == &RHS) return *this; @@ -123,8 +139,7 @@ public: unsigned CurSize = size(); if (CurSize >= RHSSize) { // Assign common elements. - for (unsigned i = 0; i != RHSSize; ++i) - Begin[i] = RHS.Begin[i]; + std::copy(RHS.Begin, RHS.Begin+RHSSize, Begin); // Destroy excess elements. for (unsigned i = RHSSize; i != CurSize; ++i) @@ -144,10 +159,9 @@ public: End = Begin; CurSize = 0; grow(RHSSize); - } else { + } else if (CurSize) { // Otherwise, use assignment for the already-constructed elements. - for (unsigned i = 0; i != CurSize; ++i) - Begin[i] = RHS.Begin[i]; + std::copy(RHS.Begin, RHS.Begin+CurSize, Begin); } // Copy construct the new elements in place. -- 2.34.1