Skip to content

[cxxmodules][cling] Avoid loading some unnecessary modules #10910

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

Closed
junaire wants to merge 5 commits into from
Closed

[cxxmodules][cling] Avoid loading some unnecessary modules #10910

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c4c17f
[skip-ci][cxxmodules][cling] Avoid loading some unnecessary modules
junaire Sep 24, 2022
677d6d3
Don't find external visible decls if we're instantiating templates
junaire Oct 5, 2022
707b699
Push transaction in ParseProto::Parse
junaire Oct 9, 2022
ee62ca8
Revert workrounds since Jonas's patch (#11514) should fix everything
junaire Oct 23, 2022
268296f
Always preload ROOTDataFrame module
junaire Oct 23, 2022
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
Don't find external visible decls if we're instantiating templates 
Signed-off-by: Jun Zhang <[email protected]>
  • Loading branch information
@junaire
junaire committed Oct 23, 2022
commit 677d6d30c7bfc5dc1d405a82c2857857a1546de6
18 changes: 14 additions & 4 deletions interpreter/cling/lib/Interpreter/InterpreterCallbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,15 @@ namespace cling {
}
};

static bool IsInstantiatingTemplates(clang::Sema* S) {
if (!S)
return false;

const auto& CodeSynthesisContexts = S->CodeSynthesisContexts;
return !CodeSynthesisContexts.empty() &&
CodeSynthesisContexts.back().isInstantiationRecord();
}

///\brief Translates 'interesting' for the interpreter ExternalSemaSource
/// events into interpreter callbacks.
///
Expand Down Expand Up @@ -274,10 +283,11 @@ namespace cling {

bool FindExternalVisibleDeclsByName(const clang::DeclContext* DC,
clang::DeclarationName Name) override {
if (m_Callbacks)
return m_Callbacks->LookupObject(DC, Name);

return false;
if (!m_Callbacks)
return false;
if (IsInstantiatingTemplates(m_Sema))
return false;
return m_Callbacks->LookupObject(DC, Name);
}

// Silence warning virtual function was hidden.
Expand Down