Skip to content

Simplify enclosesLifetimeOf #13889

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
dkorpel merged 1 commit into from
Mar 27, 2022
Merged

Simplify enclosesLifetimeOf #13889

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
32 changes: 3 additions & 29 deletions src/dmd/declaration.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,35 +1653,9 @@ extern (C++) class VarDeclaration : Declaration
*/
final bool enclosesLifetimeOf(VarDeclaration v) const pure
{
// VarDeclaration's with these STC's need special treatment
enum special = STC.temp | STC.foreach_;

// Sequence numbers work when there are no special VarDeclaration's involved
if (!((this.storage_class | v.storage_class) & special))
{
assert(this.sequenceNumber != this.sequenceNumber.init);
assert(v.sequenceNumber != v.sequenceNumber.init);

return (this.sequenceNumber < v.sequenceNumber);
}

// Assume that semantic produces temporaries according to their lifetime
// (It won't create a temporary before the actual content)
if ((this.storage_class & special) && (v.storage_class & special))
return this.sequenceNumber < v.sequenceNumber;

// Fall back to lexical order
assert(this.loc != Loc.initial);
assert(v.loc != Loc.initial);

if (this.loc.linnum != v.loc.linnum)
return this.loc.linnum < v.loc.linnum;

if (this.loc.charnum != v.loc.charnum)
return this.loc.charnum < v.loc.charnum;

// Default fallback
return this.sequenceNumber < v.sequenceNumber;
assert(this.sequenceNumber != this.sequenceNumber.init);
assert(v.sequenceNumber != v.sequenceNumber.init);
return (this.sequenceNumber < v.sequenceNumber);
}

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