Heap-allocate the attribute vectors in
ASTContext::DeclAttrs. Otherwise, iterators will go stale when the DenseMap reallocates, which can cause crashes when, e.g., looping over the attributes in a template to instantiate them and add the results to the instantiation of that template. llvm-svn: 112488
This commit is contained in:
parent
1262b0636e
commit
561eceb4c4
|
@ -198,7 +198,7 @@ class ASTContext {
|
|||
///
|
||||
/// Since so few decls have attrs, we keep them in a hash map instead of
|
||||
/// wasting space in the Decl class.
|
||||
llvm::DenseMap<const Decl*, AttrVec> DeclAttrs;
|
||||
llvm::DenseMap<const Decl*, AttrVec*> DeclAttrs;
|
||||
|
||||
/// \brief Keeps track of the static data member templates from which
|
||||
/// static data members of class template specializations were instantiated.
|
||||
|
@ -321,10 +321,10 @@ public:
|
|||
}
|
||||
|
||||
/// \brief Retrieve the attributes for the given declaration.
|
||||
AttrVec& getDeclAttrs(const Decl *D) { return DeclAttrs[D]; }
|
||||
AttrVec& getDeclAttrs(const Decl *D);
|
||||
|
||||
/// \brief Erase the attributes corresponding to the given declaration.
|
||||
void eraseDeclAttrs(const Decl *D) { DeclAttrs.erase(D); }
|
||||
void eraseDeclAttrs(const Decl *D);
|
||||
|
||||
/// \brief If this variable is an instantiated static data member of a
|
||||
/// class template specialization, returns the templated static data member
|
||||
|
|
|
@ -206,7 +206,12 @@ ASTContext::~ASTContext() {
|
|||
if (ASTRecordLayout *R = const_cast<ASTRecordLayout*>((I++)->second))
|
||||
R->Destroy(*this);
|
||||
}
|
||||
}
|
||||
|
||||
for (llvm::DenseMap<const Decl*, AttrVec*>::iterator A = DeclAttrs.begin(),
|
||||
AEnd = DeclAttrs.end();
|
||||
A != AEnd; ++A)
|
||||
A->second->~AttrVec();
|
||||
}
|
||||
|
||||
void ASTContext::AddDeallocation(void (*Callback)(void*), void *Data) {
|
||||
Deallocations.push_back(std::make_pair(Callback, Data));
|
||||
|
@ -364,6 +369,26 @@ void ASTContext::InitBuiltinTypes() {
|
|||
InitBuiltinType(NullPtrTy, BuiltinType::NullPtr);
|
||||
}
|
||||
|
||||
AttrVec& ASTContext::getDeclAttrs(const Decl *D) {
|
||||
AttrVec *&Result = DeclAttrs[D];
|
||||
if (!Result) {
|
||||
void *Mem = Allocate(sizeof(AttrVec));
|
||||
Result = new (Mem) AttrVec;
|
||||
}
|
||||
|
||||
return *Result;
|
||||
}
|
||||
|
||||
/// \brief Erase the attributes corresponding to the given declaration.
|
||||
void ASTContext::eraseDeclAttrs(const Decl *D) {
|
||||
llvm::DenseMap<const Decl*, AttrVec*>::iterator Pos = DeclAttrs.find(D);
|
||||
if (Pos != DeclAttrs.end()) {
|
||||
Pos->second->~AttrVec();
|
||||
DeclAttrs.erase(Pos);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
MemberSpecializationInfo *
|
||||
ASTContext::getInstantiatedFromStaticDataMember(const VarDecl *Var) {
|
||||
assert(Var->isStaticDataMember() && "Not a static data member");
|
||||
|
|
Loading…
Reference in New Issue