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
Always preload ROOTDataFrame module 
Signed-off-by: Jun Zhang <[email protected]>
  • Loading branch information
@junaire
junaire committed Oct 23, 2022
commit 268296f2848064f9c721bd89f3739231909182c5
4 changes: 3 additions & 1 deletion core/metacling/src/TCling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,9 @@ static void RegisterCxxModules(cling::Interpreter &clingInterp)
// These modules should not be preloaded but they fix issues.
// FIXME: Hist is not a core module but is very entangled to MathCore and
// causes issues.
std::vector<std::string> FIXMEModules = {"Hist"};
// ROOTDataFrame is not a core module as well, but without it Clang reports
// some ODR related issues.
std::vector<std::string> FIXMEModules = {"Hist", "ROOTDataFrame"};
clang::CompilerInstance &CI = *clingInterp.getCI();
clang::Preprocessor &PP = CI.getPreprocessor();
ModuleMap &MMap = PP.getHeaderSearchInfo().getModuleMap();
Expand Down