Skip to content

[cxxmodules] Refactor LoadCoreModules and fix nullptr deref #1391

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
Teemperor wants to merge 1 commit into from
Closed

[cxxmodules] Refactor LoadCoreModules and fix nullptr deref #1391

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
38 changes: 16 additions & 22 deletions core/metacling/src/TCling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,28 +1121,22 @@ static void LoadCoreModules(cling::Interpreter &interp)
if (!CI.getLangOpts().Modules)
return;

clang::HeaderSearch &headerSearch = CI.getPreprocessor().getHeaderSearchInfo();
clang::ModuleMap &moduleMap = headerSearch.getModuleMap();
// List of core modules we can load, but it's ok if they are missing because
// the system doesn't have these modules.
if (clang::Module *LIBCM = moduleMap.findModule("libc"))
if (!LoadModule(LIBCM->Name, interp))
Error("TCling::LoadCoreModules", "Cannot load module %s", LIBCM->Name.c_str());

if (clang::Module *STLM = moduleMap.findModule("stl"))
if (!LoadModule(STLM->Name, interp))
Error("TCling::LoadCoreModules", "Cannot load module %s", STLM->Name.c_str());

// ROOT_Types is a module outside core because we need C and -no-rtti compatibility.
// Preload it as it is an integral part of module Core.
if (!LoadModule(moduleMap.findModule("ROOT_Types")->Name, interp))
Error("TCling::LoadCoreModules", "Cannot load module ROOT_Types");

if (!LoadModule(moduleMap.findModule("Core")->Name, interp))
Error("TCling::LoadCoreModules", "Cannot load module Core");

if (!LoadModule(moduleMap.findModule("RIO")->Name, interp))
Error("TCling::LoadCoreModules", "Cannot load module RIO");
// Modules we need to load with a pair of module name and a bool if we should
// error out when we can't load it.
std::vector<std::pair<std::string, bool> > ModulesToLoad = {
// libc and stl shall be loaded if they are available on the system.
{"libc", false},
{"stl", false},
// Core (which includes ROOT_TYPES) and RIO are expected to be available
// on startup of ROOT.
{"ROOT_Types", true},
{"Core", true},
{"RIO", true}
};

for (const auto& M : ModulesToLoad)
if (!LoadModule(M.first, interp) && M.second)
Error("TCling::LoadCoreModules", "Cannot load module %s", M.first.c_str());

// Check that the gROOT macro was exported by any core module.
assert(interp.getMacro("gROOT") && "Couldn't load gROOT macro?");
Expand Down