[llvm-commits] [llvm] r91529 - in /llvm/trunk: include/llvm/ADT/SmallVector.h lib/Support/CMakeLists.txt lib/Support/SmallVector.cpp

[Chris Lattner]

Author: lattner
Date: Wed Dec 16 02:44:24 2009
New Revision: 91529

URL: http://llvm.org/viewvc/llvm-project?rev=91529&view=rev
Log:
now that libsystem no longer uses SmallVector, we can move 
SmallVectorBase::grow_pod out of line, finally satisfying PR3758.


Added:
    llvm/trunk/lib/Support/SmallVector.cpp
Modified:
    llvm/trunk/include/llvm/ADT/SmallVector.h
    llvm/trunk/lib/Support/CMakeLists.txt

Modified: llvm/trunk/include/llvm/ADT/SmallVector.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/SmallVector.h?rev=91529&r1=91528&r2=91529&view=diff

==============================================================================
--- llvm/trunk/include/llvm/ADT/SmallVector.h (original)
+++ llvm/trunk/include/llvm/ADT/SmallVector.h Wed Dec 16 02:44:24 2009
@@ -90,32 +90,14 @@
     return size_t((char*)CapacityX - (char*)BeginX);
   }
   
-  inline void grow_pod(size_t MinSizeInBytes, size_t TSize);
+  /// grow_pod - This is an implementation of the grow() method which only works
+  /// on POD-like datatypes and is out of line to reduce code duplication.
+  void grow_pod(size_t MinSizeInBytes, size_t TSize);
   
 public:
   bool empty() const { return BeginX == EndX; }
 };
   
-inline void SmallVectorBase::grow_pod(size_t MinSizeInBytes, size_t TSize) {
-  size_t CurSizeBytes = size_in_bytes();
-  size_t NewCapacityInBytes = 2 * capacity_in_bytes();
-  if (NewCapacityInBytes < MinSizeInBytes)
-    NewCapacityInBytes = MinSizeInBytes;
-  void *NewElts = operator new(NewCapacityInBytes);
-  
-  // Copy the elements over.
-  memcpy(NewElts, this->BeginX, CurSizeBytes);
-  
-  // If this wasn't grown from the inline copy, deallocate the old space.
-  if (!this->isSmall())
-    operator delete(this->BeginX);
-  
-  this->EndX = (char*)NewElts+CurSizeBytes;
-  this->BeginX = NewElts;
-  this->CapacityX = (char*)this->BeginX + NewCapacityInBytes;
-}
-
-  
 
 template <typename T>
 class SmallVectorTemplateCommon : public SmallVectorBase {

Modified: llvm/trunk/lib/Support/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/CMakeLists.txt?rev=91529&r1=91528&r2=91529&view=diff

==============================================================================
--- llvm/trunk/lib/Support/CMakeLists.txt (original)
+++ llvm/trunk/lib/Support/CMakeLists.txt Wed Dec 16 02:44:24 2009
@@ -23,6 +23,7 @@
   Regex.cpp
   SlowOperationInformer.cpp
   SmallPtrSet.cpp
+  SmallVector.cpp
   SourceMgr.cpp
   Statistic.cpp
   StringExtras.cpp

Added: llvm/trunk/lib/Support/SmallVector.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/SmallVector.cpp?rev=91529&view=auto

==============================================================================
--- llvm/trunk/lib/Support/SmallVector.cpp (added)
+++ llvm/trunk/lib/Support/SmallVector.cpp Wed Dec 16 02:44:24 2009
@@ -0,0 +1,37 @@
+//===- llvm/ADT/SmallVector.cpp - 'Normally small' vectors ----------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the SmallVector class.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/ADT/SmallVector.h"
+using namespace llvm;
+
+/// grow_pod - This is an implementation of the grow() method which only works
+/// on POD-like datatypes and is out of line to reduce code duplication.
+void SmallVectorBase::grow_pod(size_t MinSizeInBytes, size_t TSize) {
+  size_t CurSizeBytes = size_in_bytes();
+  size_t NewCapacityInBytes = 2 * capacity_in_bytes();
+  if (NewCapacityInBytes < MinSizeInBytes)
+    NewCapacityInBytes = MinSizeInBytes;
+  void *NewElts = operator new(NewCapacityInBytes);
+  
+  // Copy the elements over.  No need to run dtors on PODs.
+  memcpy(NewElts, this->BeginX, CurSizeBytes);
+  
+  // If this wasn't grown from the inline copy, deallocate the old space.
+  if (!this->isSmall())
+    operator delete(this->BeginX);
+  
+  this->EndX = (char*)NewElts+CurSizeBytes;
+  this->BeginX = NewElts;
+  this->CapacityX = (char*)this->BeginX + NewCapacityInBytes;
+}
+