gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove a declaration only from its lexical declaration context.

Browse Source 
Don't erase the decl from the vector of decls, because the vector is generated
from the declaration context from which we have already deleted the decl.


git-svn-id: http://root.cern.ch/svn/root/trunk@47591 27541ba8-7e3a-0410-8455-c3a389f83636
This commit is contained in:
Vassil Vassilev 2012-11-23 08:05:40 +00:00
parent 046ac9440e
commit a28cd2e9ab
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Interpreter/ASTNodeEraser.cpp
View File

@ -214,7 +214,7 @@ namespace cling {
assert(D && "The Decl is null");
PreVisitDecl(D);
DeclContext* DC = D->getDeclContext();
DeclContext* DC = D->getLexicalDeclContext();
bool ExistsInDC = false;
@ -397,19 +397,17 @@ namespace cling {
}
}
}
else if (llvm::SmallVector<NamedDecl*, 4>* Decls
= Pos->second.getAsVector()) {
for(llvm::SmallVector<NamedDecl*, 4>::iterator I = Decls->begin();
I != Decls->end(); ++I) {
if ((*I) == FD) {
else {
llvm::SmallVector<NamedDecl*, 4>& Decls = *Pos->second.getAsVector();
for(llvm::SmallVector<NamedDecl*, 4>::reverse_iterator I = Decls.rbegin();
I != Decls.rend(); ++I)
if ((*I) == FD)
if (FunctionDecl* MostRecentFD = RemoveFromRedeclChain(FD)) {
Successful = VisitNamedDecl(*I) && Successful;
Decls->insert(I, MostRecentFD);
// This will delete the decl from the vector, because it is
// generated from the decl context.
Successful = VisitNamedDecl((*I)) && Successful;
(*I) = MostRecentFD;
}
else
Decls->erase(I);
}
}
}
return Successful;