Skip to content

refactor isPOD() #16883

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
WalterBright merged 1 commit into from
Sep 26, 2024
Merged

refactor isPOD() #16883

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
18 changes: 9 additions & 9 deletions compiler/src/dmd/dstruct.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,13 +431,15 @@ extern (C++) class StructDeclaration : AggregateDeclaration
if (ispod != ThreeState.none)
return (ispod == ThreeState.yes);

ispod = ThreeState.yes;

import dmd.clone;

bool hasCpCtorLocal;
needCopyCtor(this, hasCpCtorLocal);

if (enclosing || search(this, loc, Id.postblit) || search(this, loc, Id.dtor) || hasCpCtorLocal)
if (enclosing || // is nested
search(this, loc, Id.postblit) || // has postblit
search(this, loc, Id.dtor) || // has destructor
hasCpCtorLocal) // has copy constructor
{
ispod = ThreeState.no;
return false;
Expand All @@ -453,20 +455,18 @@ extern (C++) class StructDeclaration : AggregateDeclaration
return false;
}

Type tv = v.type.baseElemOf();
if (tv.ty == Tstruct)
if (auto ts = v.type.baseElemOf().isTypeStruct())
{
auto ts = cast(TypeStruct)tv;
StructDeclaration sd = ts.sym;
if (!sd.isPOD())
if (!ts.sym.isPOD())
{
ispod = ThreeState.no;
return false;
}
}
}

return (ispod == ThreeState.yes);
ispod = ThreeState.yes;
return true;
}

/***************************************
Expand Down