Skip to content

Revert "Avoid spurious info message about missing _rdict.pcm when .pc… #234

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

Revert "Avoid spurious info message about missing _rdict.pcm when .pc… #234

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
17 changes: 1 addition & 16 deletions core/metacling/src/TCling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2355,22 +2355,7 @@ void TCling::RegisterModule(const char* modulename,
llvm::sys::path::remove_filename(pcmFileNameFullPath);
llvm::sys::path::append(pcmFileNameFullPath,
ROOT::TMetaUtils::GetModuleFileName(modulename));
// A library built with C++ modules may ship only its .pcm and no
// <lib>_rdict.pcm (the dictionary payload then lives in the C++ module).
// In that case probing the legacy rootpcm makes LoadPCM emit a spurious
// "ROOT PCM ... file does not exist" error followed by an in-memory
// candidate dump. Skip the probe only when the C++ module was loaded AND
// there is genuinely no rootpcm to load -- neither registered in-memory
// (an embedded rdict, the check mirrors LoadPCM) nor present on disk. For
// libraries without a C++ module the behaviour is unchanged, so a truly
// missing rootpcm is still reported.
std::string pcmPath = pcmFileNameFullPath.str().str();
std::string pcmRealPath = llvm::sys::fs::is_symlink_file(pcmPath)
? ROOT::TMetaUtils::GetRealPath(pcmPath)
: pcmPath;
if (!ModuleWasSuccessfullyLoaded || fPendingRdicts.count(pcmRealPath) ||
llvm::sys::fs::exists(pcmRealPath))
LoadPCM(pcmPath);
LoadPCM(pcmFileNameFullPath.str().str());
}

{ // scope within which diagnostics are de-activated
Expand Down