Skip to content

Fix issue 20063 - Patch closure variables when converting expressions to delegates #10196

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
dlang-bot merged 1 commit into from
Jul 19, 2019
Merged

Fix issue 20063 - Patch closure variables when converting expressions to delegates #10196

Show file tree
Hide file tree
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
25 changes: 22 additions & 3 deletions src/dmd/delegatize.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,25 @@ private void lambdaSetParent(Expression e, FuncDeclaration fd)
alias visit = typeof(super).visit;
FuncDeclaration fd;

private void setParent(Dsymbol s)
{
VarDeclaration vd = s.isVarDeclaration();
FuncDeclaration pfd = s.parent ? s.parent.isFuncDeclaration() : null;
s.parent = fd;
if (!vd || !pfd)
return;
// move to fd's closure when applicable
foreach (i; 0 .. pfd.closureVars.dim)
Copy link
Member

@PetarKirov PetarKirov Jul 19, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, one should be careful when using foreach (; 0 .. max) and changing the max inside the loop, as the emitted code caches it:
https://run.dlang.io/gist/run-dlang/b0b40d58474fb7c35b22803b2432c02f?compiler=dmd

Copy link
Member Author

@SSoulaimane SSoulaimane Jul 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I notice that, but the code here breaks immediately after remove() is called.

{
if (vd == pfd.closureVars[i])
{
pfd.closureVars.remove(i);
fd.closureVars.push(vd);
break;
}
}
}

public:
extern (D) this(FuncDeclaration fd)
{
Expand All @@ -98,7 +117,7 @@ private void lambdaSetParent(Expression e, FuncDeclaration fd)

override void visit(DeclarationExp e)
{
e.declaration.parent = fd;
setParent(e.declaration);
e.declaration.accept(this);
}

Expand All @@ -107,7 +126,7 @@ private void lambdaSetParent(Expression e, FuncDeclaration fd)
if (e.lengthVar)
{
//printf("lengthVar\n");
e.lengthVar.parent = fd;
setParent(e.lengthVar);
e.lengthVar.accept(this);
}
}
Expand All @@ -117,7 +136,7 @@ private void lambdaSetParent(Expression e, FuncDeclaration fd)
if (e.lengthVar)
{
//printf("lengthVar\n");
e.lengthVar.parent = fd;
setParent(e.lengthVar);
e.lengthVar.accept(this);
}
}
Expand Down
14 changes: 14 additions & 0 deletions test/compilable/test20063.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

struct S
{
void f(alias fun)() {}
}

auto handleLazily(T)(lazy T expr) {}

void main()
{
class C {}

S().f!(() => new C()).handleLazily;
}