2 files changed, 64 insertions, 0 deletions

diff --git a/include/llvm/Support/Allocator.h b/include/llvm/Support/Allocator.h
index 397f50fbe3..9f7611be02 100644
--- a/include/llvm/Support/Allocator.h
+++ b/include/llvm/Support/Allocator.h
@@ -14,6 +14,8 @@
 #ifndef LLVM_SUPPORT_ALLOCATOR_H
 #define LLVM_SUPPORT_ALLOCATOR_H
 
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/AlignOf.h"
 #include "llvm/Support/DataTypes.h"
 #include "llvm/Support/MathExtras.h"
@@ -179,6 +181,40 @@ public:
 
   void PrintStats() const;
   
+  
+  /// Allocate space and copy content into it.
+  void *allocateCopy(const void *Src, size_t Size, size_t Alignment=1) {
+    void *P = Allocate(Size, Alignment);
+    memcpy(P, Src, Size);
+    return P;
+  }
+  
+  /// Allocate space for an array of type T, and use std::copy()
+  /// to copy the array contents.
+  template <typename T>
+  typename enable_if<isPodLike<T>, T*>::type
+  allocateCopy(const T Src[], size_t Num) {
+    T *P = Allocate<T>(Num);
+    std::copy(Src, &Src[Num], P);
+    return P;
+  }
+
+  /// Copy a StringRef by allocating copy in BumpPtrAllocator.
+  StringRef allocateCopy(StringRef Str) {
+    size_t Length = Str.size();
+    char *P = allocateCopy<char>(Str.data(), Length);
+    return StringRef(P, Length);
+  }
+
+  /// Copy a ArrayRef<T> by allocating copy in BumpPtrAllocator.
+  template <typename T>
+  typename enable_if<isPodLike<T>, ArrayRef<T>>::type
+  allocateCopy(ArrayRef<T> Src) {
+    size_t Length = Src.size();
+    T *P = allocateCopy(Src.data(), Length*sizeof(T));
+    return makeArrayRef(P, Length);
+  }
+
   /// Compute the total physical memory allocated by this allocator.
   size_t getTotalMemory() const;
 };
diff --git a/unittests/Support/AllocatorTest.cpp b/unittests/Support/AllocatorTest.cpp
index cb9fa43036..43ce0c86be 100644
--- a/unittests/Support/AllocatorTest.cpp
+++ b/unittests/Support/AllocatorTest.cpp
@@ -147,4 +147,32 @@ TEST(AllocatorTest, TestBigAlignment) {
   EXPECT_LE(Ptr + 3000, ((uintptr_t)Slab) + Slab->Size);
 }
 
+TEST(AllocatorTest, CopyStringRef) {
+  BumpPtrAllocator Alloc;
+  StringRef Str1 = "hello";
+  StringRef Str2 = "bye";
+  StringRef Str1c = Alloc.allocateCopy(Str1);
+  StringRef Str2c = Alloc.allocateCopy(Str2);
+  EXPECT_TRUE(Str1.equals(Str1c));
+  EXPECT_NE(Str1.data(), Str1c.data());
+  EXPECT_TRUE(Str2.equals(Str2c));
+  EXPECT_NE(Str2.data(), Str2c.data());
+}
+
+TEST(AllocatorTest, CopyArrayRef) {
+  BumpPtrAllocator Alloc;
+  static const uint16_t Words1[] = { 1, 4, 200, 37 };
+  ArrayRef<uint16_t> Array1 = makeArrayRef(Words1, 4);
+  static const uint16_t Words2[] = { 11, 4003, 67, 64000, 13 };
+  ArrayRef<uint16_t> Array2 = makeArrayRef(Words2, 5);
+  ArrayRef<uint16_t> Array1c = Alloc.allocateCopy(Array1);
+  ArrayRef<uint16_t> Array2c = Alloc.allocateCopy(Array2);
+  EXPECT_TRUE(Array1.equals(Array1c));
+  EXPECT_NE(Array1.data(), Array1c.data());
+  EXPECT_TRUE(Array2.equals(Array2c));
+  EXPECT_NE(Array2.data(), Array2c.data());
+}
+
+
+
 }  // anonymous namespace