Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Try reduce the visitation
  • Loading branch information
vgvassilev committed Aug 7, 2020
commit ac2cf5aa73eec396c635b8d8c32c2eb25687cdf7
39 changes: 30 additions & 9 deletions core/metacling/src/TCling.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1113,26 +1113,47 @@ static GlobalModuleIndex *loadGlobalModuleIndex(SourceLocation TriggerLoc, cling
struct DefinitionFinder : public RecursiveASTVisitor<DefinitionFinder> {
DefinitionFinder(clang::GlobalModuleIndex::UserDefinedInterestingIDs& IDs,
clang::TranslationUnitDecl* TU) : DefinitionIDs(IDs) {
TraverseDecl(TU);
}
bool VisitNamedDecl(NamedDecl *ND) {
for (auto R : ND->redecls()) {
if (!R->isFromASTFile())
for (const Decl* D : TU->decls()) {
if (!isa<NamedDecl>(D))
continue;
if (TagDecl *TD = llvm::dyn_cast<TagDecl>(R)) {
const NamedDecl* ND = cast<NamedDecl>(D);
if (!ND->isFromASTFile())
continue;

if (const TagDecl *TD = llvm::dyn_cast<TagDecl>(ND)) {
if (TD->isCompleteDefinition())
Register(TD);
} else if (NamespaceDecl *NSD = llvm::dyn_cast<NamespaceDecl>(R))
} else if (const NamespaceDecl *NSD = llvm::dyn_cast<NamespaceDecl>(ND)) {
// if (!NSD->getParent()->isTranslationUnit())
// return false;
Register(NSD, /*AddSingleEntry=*/ false);
else if (TypedefNameDecl *TND = dyn_cast<TypedefNameDecl>(R))
}
else if (const TypedefNameDecl *TND = dyn_cast<TypedefNameDecl>(ND))
Register(TND);
// FIXME: Add the rest...
}
//TraverseDecl(TU);
}
bool VisitNamedDecl(NamedDecl *ND) {
if (!ND->isFromASTFile())
return true; // Do not descend.

if (TagDecl *TD = llvm::dyn_cast<TagDecl>(ND)) {
if (TD->isCompleteDefinition())
Register(TD);
} else if (NamespaceDecl *NSD = llvm::dyn_cast<NamespaceDecl>(ND)) {
// if (!NSD->getParent()->isTranslationUnit())
// return false;
Register(NSD, /*AddSingleEntry=*/ false);
}
else if (TypedefNameDecl *TND = dyn_cast<TypedefNameDecl>(ND))
Register(TND);
// FIXME: Add the rest...
return true; // continue decending
}
private:
clang::GlobalModuleIndex::UserDefinedInterestingIDs &DefinitionIDs;
void Register(NamedDecl* ND, bool AddSingleEntry = true) {
void Register(const NamedDecl* ND, bool AddSingleEntry = true) {
assert(ND->isFromASTFile());
// FIXME: All decls should have an owning module once rootcling
// updates its generated decls from within the LookupHelper & co.
Expand Down