Skip to content

[cxxmodules] Avoid lookup from system headers #11514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hahnjo merged 1 commit into from
Oct 21, 2022
Merged

[cxxmodules] Avoid lookup from system headers #11514

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions core/metacling/src/TClingCallbacks.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,15 @@ bool TClingCallbacks::LookupObject(const DeclContext* DC, DeclarationName Name)
if (Name.getNameKind() != DeclarationName::Identifier)
return false;

Sema &SemaR = m_Interpreter->getSema();
auto *D = cast<Decl>(DC);
SourceLocation Loc = D->getLocation();
if (Loc.isValid() && SemaR.getSourceManager().isInSystemHeader(Loc)) {
// This declaration comes from a system module, we do not want to try
// autoparsing it and find instantiations in our ROOT modules.
return false;
}

// Get the 'lookup' decl context.
// We need to cast away the constness because we will lookup items of this
// namespace/DeclContext
Expand All @@ -373,14 +382,13 @@ bool TClingCallbacks::LookupObject(const DeclContext* DC, DeclarationName Name)
// and only if that was not the case use the information in the GMI.
if (!NSD || !TCling__IsAutoLoadNamespaceCandidate(NSD)) {
// After loading modules, we must update the redeclaration chains.
return findInGlobalModuleIndex(Name, /*loadFirstMatchOnly*/ false) && cast<Decl>(DC)->getMostRecentDecl();
return findInGlobalModuleIndex(Name, /*loadFirstMatchOnly*/ false) && D->getMostRecentDecl();
}

const DeclContext* primaryDC = NSD->getPrimaryContext();
if (primaryDC != DC)
return false;

Sema &SemaR = m_Interpreter->getSema();
LookupResult R(SemaR, Name, SourceLocation(), Sema::LookupOrdinaryName);
R.suppressDiagnostics();
// We need the qualified name for TCling to find the right library.
Expand Down Expand Up @@ -425,7 +433,8 @@ bool TClingCallbacks::LookupObject(clang::TagDecl* Tag) {

SourceLocation Loc = Tag->getLocation();
if (SemaR.getSourceManager().isInSystemHeader(Loc)) {
// We will not help the system headers, sorry.
// This declaration comes from a system module, we do not want to try
// autoparsing it and find instantiations in our ROOT modules.
return false;
}

Expand Down