diff options
| -rw-r--r-- | include/clang/AST/DeclTemplate.h | 5 | ||||
| -rw-r--r-- | lib/AST/DeclTemplate.cpp | 14 |
2 files changed, 14 insertions, 5 deletions
diff --git a/include/clang/AST/DeclTemplate.h b/include/clang/AST/DeclTemplate.h index 89b43a243c..b7b90b14ad 100644 --- a/include/clang/AST/DeclTemplate.h +++ b/include/clang/AST/DeclTemplate.h @@ -186,6 +186,11 @@ public: /// really isn't safe to use that way. explicit TemplateArgumentList(const TemplateArgumentList *Other); + /// Used to release the memory associated with a TemplateArgumentList + /// object. FIXME: This is currently not called anywhere, but the + /// memory will still be freed when using a BumpPtrAllocator. + void Destroy(ASTContext &C); + ~TemplateArgumentList(); /// \brief Retrieve the template argument at a given index. diff --git a/lib/AST/DeclTemplate.cpp b/lib/AST/DeclTemplate.cpp index 17bd2217fc..26e291c94f 100644 --- a/lib/AST/DeclTemplate.cpp +++ b/lib/AST/DeclTemplate.cpp @@ -374,7 +374,8 @@ TemplateArgumentList::TemplateArgumentList(ASTContext &Context, // 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 @@ TemplateArgumentList::TemplateArgumentList(ASTContext &Context, 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 @@ TemplateArgumentList::TemplateArgumentList(const TemplateArgumentList *Other) 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 //===----------------------------------------------------------------------===// |