Try to plug some memory leaks...
1) Sema::ParseAST now constructs a TranslationUnit object to own the top-level Decls, which releases the top-level Decls upon exiting ParseAST.
2) Bug fix: TranslationUnit::~TranslationUnit handles the case where a Decl is added more than once as a top-level Decl.
3) Decl::Destroy is now a virtual method, obviating the need for a special dispatch based on DeclKind.
3) FunctionDecl::Destroy now releases its Body using its Destroy method.
4) Added Stmt::Destroy and Stmt::DestroyChildren, which recursively delete the child ASTs of a Stmt and call their dstors. We may need to special case dstor/Destroy methods for particular Stmt subclasses that own other dynamically allocated objects besides AST nodes.
5) REGRESSION: We temporarily are not deallocating attributes; a FIXME is provided.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51286 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 1a7eeca..a831c4f 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -16,6 +16,8 @@
#include "clang/AST/Attr.h"
#include "clang/Basic/IdentifierTable.h"
#include "llvm/ADT/DenseMap.h"
+
+#include <stdio.h>
using namespace clang;
//===----------------------------------------------------------------------===//
@@ -314,8 +316,10 @@
DeclAttrMapTy::iterator it = DeclAttrs->find(this);
assert(it != DeclAttrs->end() && "No attrs found but HasAttrs is true!");
- delete it->second;
+ // FIXME: Properly release attributes.
+ // delete it->second;
DeclAttrs->erase(it);
+
if (DeclAttrs->empty()) {
delete DeclAttrs;
DeclAttrs = 0;
@@ -366,47 +370,11 @@
}
-#define CASE(KIND) \
- case KIND: \
- static_cast<KIND##Decl *>(const_cast<Decl *>(this))->~KIND##Decl(); \
- break
-
-void Decl::Destroy(ASTContext& C) const {
- switch (getKind()) {
- CASE(TranslationUnit);
- CASE(Field);
- CASE(ObjCIvar);
- CASE(ObjCCategory);
- CASE(ObjCCategoryImpl);
- CASE(ObjCImplementation);
- CASE(ObjCProtocol);
- CASE(ObjCProperty);
- CASE(Namespace);
- CASE(Typedef);
- CASE(Enum);
- CASE(EnumConstant);
- CASE(Function);
- CASE(Var);
- CASE(ParmVar);
- CASE(ObjCInterface);
- CASE(ObjCCompatibleAlias);
- CASE(ObjCMethod);
- CASE(ObjCClass);
- CASE(ObjCForwardProtocol);
- CASE(LinkageSpec);
-
- case Struct: case Union: case Class:
- static_cast<RecordDecl *>(const_cast<Decl *>(this))->~RecordDecl();
- break;
-
- default: assert(0 && "Unknown decl kind!");
- }
-
+void Decl::Destroy(ASTContext& C) {
+ this->~Decl();
C.getAllocator().Deallocate((void *)this);
}
-#undef CASE
-
//===----------------------------------------------------------------------===//
// DeclContext Implementation
//===----------------------------------------------------------------------===//
@@ -442,10 +410,14 @@
FunctionDecl::~FunctionDecl() {
delete[] ParamInfo;
- delete Body;
- delete PreviousDeclaration;
}
+void FunctionDecl::Destroy(ASTContext& C) {
+ if (Body) Body->Destroy(C);
+ Decl::Destroy(C);
+}
+
+
Stmt *FunctionDecl::getBody(const FunctionDecl *&Definition) const {
for (const FunctionDecl *FD = this; FD != 0; FD = FD->PreviousDeclaration) {
if (FD->Body) {