mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-04 17:11:44 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed lambda inference

Browse source
This commit is contained in:
Alexey Prokhin 2012-02-13 03:21:29 +04:00
parent 925303e334
commit eba8aac824
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gen/toir.cpp
View file

@ -2636,10 +2636,7 @@ DValue* FuncExp::toElem(IRState* p)
fd->codegen(Type::sir);
assert(fd->ir.irFunc->func);
if (fd->tok == TOKreserved && type->ty == Tpointer && fd->vthis)
fd->tok = TOKfunction;
if(fd->isNested()) {
if(fd->isNested() && !(fd->tok == TOKreserved && type->ty == Tpointer && fd->vthis)) {
LLType* dgty = DtoType(type);
LLValue* cval;
@ -2689,9 +2686,9 @@ LLConstant* FuncExp::toConstElem(IRState* p)
LOG_SCOPE;
assert(fd);
if (fd->tok != TOKfunction)
if (fd->tok != TOKfunction && !(fd->tok == TOKreserved && type->ty == Tpointer && fd->vthis))
{
assert(fd->tok == TOKdelegate);
assert(fd->tok == TOKdelegate || fd->tok == TOKreserved);
error("delegate literals as constant expressions are not yet allowed");
return 0;
}