Skip to content

[cxxmodules] Also load TreePlayer to fix TDataFrame tests. #1328

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
wants to merge 3 commits into from
Closed

[cxxmodules] Also load TreePlayer to fix TDataFrame tests. #1328

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72ab961
[cxxmodules] Also load STL/libc as a core module
Teemperor Nov 13, 2017
67acc36
[cxxmodules] #undef I coming from complex.h
Teemperor Nov 14, 2017
bb580fe
[cxxmodules] Also load TreePlayer to fix TDataFrame tests.
Teemperor Nov 14, 2017
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
27 changes: 25 additions & 2 deletions core/metacling/src/TCling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,19 +1101,33 @@ static void LoadCoreModules(cling::Interpreter &interp)

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.
std::vector<std::string> optionalCoreModuleNames = {"stl", "libc"};

// List of core modules we need to load.
std::vector<std::string> neededCoreModuleNames = {"Core", "RIO"};
// FIXME: TreePlayer is here because the rootmap loading doesn't work with
// TDataFrame. This should be gone once we no longer rely on rootmap files
// for loading a module.
std::vector<std::string> neededCoreModuleNames = {"Core", "RIO", "TreePlayer"};
std::vector<std::string> missingCoreModuleNames;

std::vector<clang::Module *> coreModules;

// Lookup the optional core modules in the modulemap by name.
for (std::string moduleName : optionalCoreModuleNames) {
clang::Module *module = moduleMap.findModule(moduleName);
// Don't report an error here, the module is optional.
if (module)
coreModules.push_back(module);
}
// Lookup the core modules in the modulemap by name.
for (std::string moduleName : neededCoreModuleNames) {
clang::Module *module = moduleMap.findModule(moduleName);
if (module) {
coreModules.push_back(module);
} else {
// If we can't find a module, we record that to report it later.
// If we can't find a needed module, we record that to report it later.
missingCoreModuleNames.push_back(moduleName);
}
}
Expand Down Expand Up @@ -1152,6 +1166,15 @@ static void LoadCoreModules(cling::Interpreter &interp)
for (StringRef H : moduleHeaders) {
declarations << "#include \"" << H.str() << "\"\n";
}

// C99 decided that it's a very good idea to name a macro `I` (the letter I).
// This seems to screw up nearly all the template code out there as `I` is
// common template parameter name and iterator variable name.
// Let's follow the GCC recommendation and undefine `I` in case any of the
// core modules have defined it:
// https://www.gnu.org/software/libc/manual/html_node/Complex-Numbers.html
declarations << "#ifdef I\n #undef I\n #endif\n";

auto result = interp.declare(declarations.str());

if (result != cling::Interpreter::CompilationResult::kSuccess) {
Expand Down