Skip to content

Fix issue #6670. Avoid infinite recursion from TClass::InheritsFrom. #6680

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
pcanal merged 18 commits into from
Oct 29, 2020
Merged

Fix issue #6670. Avoid infinite recursion from TClass::InheritsFrom. #6680

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b17a9fe
Fix issue #6670. Avoid infinite recursion from TClass::InheritsFrom.
pcanal Oct 20, 2020
7c9fe16
Extent TClass's fProperty and Property()'s documentation.
pcanal Oct 21, 2020
05df320
If a TProtoClass is loaded later, use it immediately
pcanal Oct 21, 2020
b4262b2
Rely on TProtoClass::FillTClass now setting fHasRootPcmInfo
pcanal Oct 21, 2020
4e6fa1f
TClass::GetListOfBases: actually return fBase after loading via TProt…
pcanal Oct 22, 2020
a16c502
[NFC] TClass slight code cleanup
pcanal Oct 22, 2020
c7276fd
TClass::FillTClass fSizeof can be set by TGenericClassInfo.
pcanal Oct 22, 2020
b040f23
TProtoClass: don't complain a 2nd time of duplicate dictionaries
pcanal Oct 22, 2020
29151c1
[NFC] typo
pcanal Oct 22, 2020
b04a3be
[NFC] White space
pcanal Oct 23, 2020
d3d74d7
rootcling Don't select a class when its typedef is requested.
pcanal Oct 23, 2020
a74e019
rootcling: always wait for the decl to select a class
pcanal Oct 23, 2020
dde7fc9
Revert "rootcling: always wait for the decl to select a class"
pcanal Oct 26, 2020
79c56a7
TProtoClass Extend error message.
pcanal Oct 22, 2020
feb56a1
rootpcm: Don't record the sizeof 'emulated' collection.
pcanal Oct 22, 2020
7d8a9a5
dictgen Avoid accidental match to a typedef rule (hiding a decl rule)
pcanal Oct 23, 2020
2d8e4fa
Trying proceeding with a match made from the typedef
pcanal Oct 26, 2020
3816aa7
Don't generate a dictionary for the class underlying a typedef found …
pcanal Oct 26, 2020
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
Prev Previous commit
Next Next commit
Rely on TProtoClass::FillTClass now setting fHasRootPcmInfo
  • Loading branch information
@pcanal
pcanal committed Oct 21, 2020
commit b4262b2dc82a6e5edf1d481a341f72ddee9e08d1
27 changes: 7 additions & 20 deletions core/meta/src/TClass.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,9 +1473,8 @@ void TClass::Init(const char *name, Version_t cversion,
fCanLoadClassInfo = kTRUE;
// Here we check and grab the info from the rootpcm.
TProtoClass *proto = TClassTable::GetProtoNorm(GetName());
if (proto && proto->FillTClass(this)) {
fHasRootPcmInfo = kTRUE;
}
if (proto)
proto->FillTClass(this);
}
if (!fHasRootPcmInfo && gInterpreter->CheckClassInfo(fName, /* autoload = */ kTRUE)) {
gInterpreter->SetClassInfo(this); // sets fClassInfo pointer
Expand Down Expand Up @@ -3591,16 +3590,11 @@ TList *TClass::GetListOfBases()
if (fState == kHasTClassInit) {

R__LOCKGUARD(gInterpreterMutex);
// NOTE: Add test to prevent redo if another thread has already done the work.
// if (!fHasRootPcmInfo) {

// The bases are in our ProtoClass; we don't need the class info.
TProtoClass *proto = TClassTable::GetProtoNorm(GetName());
if (proto && proto->FillTClass(this)) {
// Not sure this code is still needed
// R__ASSERT(kFALSE);

fHasRootPcmInfo = kTRUE;
if (!fHasRootPcmInfo) {
// The bases are in our ProtoClass; we don't need the class info.
TProtoClass *proto = TClassTable::GetProtoNorm(GetName());
if (proto)
proto->FillTClass(this);
}
}
// We test again on fCanLoadClassInfo has another thread may have executed it.
Expand Down Expand Up @@ -3699,16 +3693,9 @@ TList *TClass::CreateListOfDataMembers(std::atomic<TListOfDataMembers*> &data, T

if (!data) {
if (fCanLoadClassInfo && fState == kHasTClassInit) {
// NOTE: Add test to prevent redo if another thread has already done the work.
// if (!fHasRootPcmInfo) {

// The members are in our ProtoClass; we don't need the class info.
TProtoClass *proto = TClassTable::GetProtoNorm(GetName());
if (proto && proto->FillTClass(this)) {
// Not sure this code is still needed
// R__ASSERT(kFALSE);

fHasRootPcmInfo = kTRUE;
return data;
}
}
Expand Down