Skip to content
Merged
Changes from all commits
Commits
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
[tcling] Turn off LazyFunctionCreatorAutoload when autoload is off.
We should not run our symbol-based autoloading when the autoloading in ROOT
is disabled.
  • Loading branch information
vgvassilev committed Sep 6, 2019
commit 03dea2b58d589868b16e810a3825af4aedcf630b
3 changes: 3 additions & 0 deletions core/metacling/src/TCling.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -6357,6 +6357,9 @@ static void* LazyFunctionCreatorAutoloadForModule(const std::string &mangled_nam
/// Autoload a library based on a missing symbol.

void* TCling::LazyFunctionCreatorAutoload(const std::string& mangled_name) {
if (!IsClassAutoloadingEnabled())
return nullptr;

if (fCxxModulesEnabled)
return LazyFunctionCreatorAutoloadForModule(mangled_name, fInterpreter);

Expand Down