maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix regression in my last commit - if a struct has a trivial destructor but no usual deallocation function we don't need a cookie. 

llvm-svn: 91249
This commit is contained in:
Anders Carlsson 2009-12-13 20:10:12 +00:00
parent 21122cf657
commit adbe4249d6
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clang/lib/CodeGen/CGExprCXX.cpp
View File

@ -27,25 +27,33 @@ static uint64_t CalculateCookiePadding(ASTContext &Ctx, QualType ElementType) {
// Check if the class has a trivial destructor.
if (RD->hasTrivialDestructor()) {
// Check if the usual deallocation function takes two arguments.
const CXXMethodDecl *UsualDeallocationFunction = 0;
DeclarationName OpName =
Ctx.DeclarationNames.getCXXOperatorName(OO_Array_Delete);
DeclContext::lookup_const_iterator Op, OpEnd;
for (llvm::tie(Op, OpEnd) = RD->lookup(OpName);
Op != OpEnd; ++Op) {
CXXMethodDecl *Delete = cast<CXXMethodDecl>(*Op);
const CXXMethodDecl *Delete = cast<CXXMethodDecl>(*Op);
if (Delete->isUsualDeallocationFunction()) {
// We don't need a cookie.
if (Delete->getNumParams() == 1)
return 0;
assert(Delete->getNumParams() == 2 &&
"Unexpected deallocation function type!");
UsualDeallocationFunction = Delete;
break;
}
}
}
// No usual deallocation function, we don't need a cookie.
if (!UsualDeallocationFunction)
return 0;
// The usual deallocation function doesn't take a size_t argument, so we
// don't need a cookie.
if (UsualDeallocationFunction->getNumParams() == 1)
return 0;
assert(UsualDeallocationFunction->getNumParams() == 2 &&
"Unexpected deallocation function type!");
}
// Padding is the maximum of sizeof(size_t) and alignof(ElementType)
return std::max(Ctx.getTypeSize(Ctx.getSizeType()),