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

Merge the conflicts.

Browse Source
This commit is contained in:
Vassil Vassilev 2013-10-29 21:37:32 +01:00 committed by sftnight
parent d70c1702dc
commit cb713d743f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Interpreter/ASTNodeEraser.cpp
View File

@ -247,10 +247,14 @@ namespace cling {
if (((DeclContextExt*)DC)->LastDecl == D) {
// Valid. Thus remove.
DC->removeDecl(D);
// Force rebuilding of the lookup table.
//DC->setMustBuildLookupTable();
return true;
}
}
else {
// Force rebuilding of the lookup table.
//DC->setMustBuildLookupTable();
DC->removeDecl(D);
return true;
}
@ -279,6 +283,7 @@ namespace cling {
#endif
bool Successful = true;
DeclContextExt::removeIfLast(DC, D);
// With the bump allocator this is nop.
if (Successful)
m_Sema->getASTContext().Deallocate(D);