Skip to content

[rootcling] Remove check for unique_ptr members [v6.38] #20399

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

Merged
merged 2 commits into from
Nov 12, 2025
+0 −29
Merged

[rootcling] Remove check for unique_ptr members [v6.38] #20399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7ced44
[rootcling] Remove check for unique_ptr members
hahnjo Nov 12, 2025
4b9d991
[core] Remove dead code in TCling::InspectMembers
hahnjo Nov 12, 2025
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
9 changes: 0 additions & 9 deletions core/metacling/src/TCling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2764,15 +2764,6 @@ void TCling::InspectMembers(TMemberInspector& insp, const void* obj,
return;
}

if (TClassEdit::IsUniquePtr(cl->GetName())) {
// Ignore error caused by the inside of std::unique_ptr
// This is needed solely because of rootclingIO's IsUnsupportedUniquePointer
// which checks the number of elements in the GetListOfRealData.
// If this usage is removed, this can be replaced with a return statement.
// See https://github.com/root-project/root/issues/13574
isTransient = true;
}

const char* cobj = (const char*) obj; // for ptr arithmetics

// Treat the case of std::complex in a special manner. We want to enforce
Expand Down
20 changes: 0 additions & 20 deletions io/rootpcm/src/rootclingIO.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,26 +78,6 @@ static bool IsUnsupportedUniquePointer(const char *normName, TDataMember *dm)

if (!isUniquePtrOffsetZero) return true;

auto clm = TClass::GetClass(dmTypeName);
if (!clm) {
Error("CloseStreamerInfoROOTFile", "Class %s is not available.", dmTypeName);
return true;
}

// TODO: Is it not clear what situation we are checking for by checking if
// the unique_ptr class has any data members.
clm->BuildRealData(nullptr, /* istransient = */ true);
auto upDms = clm->GetListOfRealData();
if (!upDms) {
Error("CloseStreamerInfoROOTFile", "Cannot determine unique pointer %s data members.", dmTypeName);
return true;
}

if (0 == upDms->GetSize()) {
Error("CloseStreamerInfoROOTFile", "Unique pointer %s has zero data members.", dmTypeName);
return true;
}

// We check if the unique_ptr has a default deleter
std::vector<std::string> out;
int i;
Expand Down
Loading