[cfe-commits] r47210 - /cfe/trunk/AST/Decl.cpp
Anders Carlsson
andersca at mac.com
Fri Feb 15 19:37:41 PST 2008
Author: andersca
Date: Fri Feb 15 21:37:41 2008
New Revision: 47210
URL: http://llvm.org/viewvc/llvm-project?rev=47210&view=rev
Log:
More comments from Chris.
Modified:
cfe/trunk/AST/Decl.cpp
Modified: cfe/trunk/AST/Decl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/AST/Decl.cpp?rev=47210&r1=47209&r2=47210&view=diff
==============================================================================
--- cfe/trunk/AST/Decl.cpp (original)
+++ cfe/trunk/AST/Decl.cpp Fri Feb 15 21:37:41 2008
@@ -259,18 +259,18 @@
// Out-of-line virtual method providing a home for Decl.
Decl::~Decl() {
- if (!DeclAttrs)
+ if (!HasAttrs)
return;
DeclAttrMapTy::iterator it = DeclAttrs->find(this);
- if (it != DeclAttrs->end()) {
- delete it->second;
- DeclAttrs->erase(it);
- if (DeclAttrs->empty()) {
- delete DeclAttrs;
- DeclAttrs = 0;
- }
- }
+ assert(it != DeclAttrs->end() && "No attrs found but HasAttrs is true!");
+
+ delete it->second;
+ DeclAttrs->erase(it);
+ if (DeclAttrs->empty()) {
+ delete DeclAttrs;
+ DeclAttrs = 0;
+ }
}
void Decl::addAttr(Attr *newattr)
@@ -278,7 +278,7 @@
if (!DeclAttrs)
DeclAttrs = new llvm::DenseMap<const Decl*, Attr*>;
- Attr *&attr = DeclAttrs->FindAndConstruct(this).second;
+ Attr *&attr = (*DeclAttrs)[this];
newattr->setNext(attr);
attr = newattr;
@@ -288,10 +288,10 @@
const Attr *Decl::getAttrs() const
{
- if (!HasAttrs || !DeclAttrs)
+ if (!HasAttrs)
return 0;
- return DeclAttrs->find(this)->second;
+ return (*DeclAttrs)[this];
}
const char *NamedDecl::getName() const {
More information about the cfe-commits
mailing list