Allocate the contents of TemplateArgumentList using ASTContext's allocator. This fixes
a massive memory leak when using a BumpPtrAllocator in ASTContext.
Added a FIXME, as the Destroy method for TemplateArgumentList isn't getting called.
This means we will instead leak when using the MallocAllocator.
llvm-svn: 104633
diff --git a/clang/lib/AST/DeclTemplate.cpp b/clang/lib/AST/DeclTemplate.cpp
index 17bd221..26e291c 100644
--- a/clang/lib/AST/DeclTemplate.cpp
+++ b/clang/lib/AST/DeclTemplate.cpp
@@ -374,7 +374,8 @@
// If this does take ownership of the arguments, then we have to new them
// and copy over.
- TemplateArgument *NewArgs = new TemplateArgument[Builder.flatSize()];
+ TemplateArgument *NewArgs =
+ new (Context) TemplateArgument[Builder.flatSize()];
std::copy(Builder.getFlatArguments(),
Builder.getFlatArguments()+Builder.flatSize(), NewArgs);
FlatArguments.setPointer(NewArgs);
@@ -384,7 +385,8 @@
StructuredArguments.setPointer(NewArgs);
StructuredArguments.setInt(0);
} else {
- TemplateArgument *NewSArgs = new TemplateArgument[Builder.flatSize()];
+ TemplateArgument *NewSArgs =
+ new (Context) TemplateArgument[Builder.flatSize()];
std::copy(Builder.getFlatArguments(),
Builder.getFlatArguments()+Builder.flatSize(), NewSArgs);
StructuredArguments.setPointer(NewSArgs);
@@ -401,13 +403,15 @@
StructuredArguments(Other->StructuredArguments.getPointer(), false),
NumStructuredArguments(Other->NumStructuredArguments) { }
-TemplateArgumentList::~TemplateArgumentList() {
+void TemplateArgumentList::Destroy(ASTContext &C) {
if (FlatArguments.getInt())
- delete [] FlatArguments.getPointer();
+ C.Deallocate((void*)FlatArguments.getPointer());
if (StructuredArguments.getInt())
- delete [] StructuredArguments.getPointer();
+ C.Deallocate((void*)StructuredArguments.getPointer());
}
+TemplateArgumentList::~TemplateArgumentList() {}
+
//===----------------------------------------------------------------------===//
// ClassTemplateSpecializationDecl Implementation
//===----------------------------------------------------------------------===//