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

Merge branch 'master' into merge-2.064

Browse source 
Conflicts:
	gen/nested.cpp
This commit is contained in:
kai 2014-06-02 06:41:23 +02:00
commit b15ffe2ef0
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gen/nested.cpp
View file

@ -286,7 +286,7 @@ static void DtoCreateNestedContextType(FuncDeclaration* fd) {
fd->ir.irFunc->nestedContextCreated = true; fd->ir.irFunc->nestedContextCreated = true;
// construct nested variables array // construct nested variables array
if (fd->closureVars.dim != 0) if (fd->closureVars.dim > 0)
{ {
Logger::println("has nested frame"); Logger::println("has nested frame");
// start with adding all enclosing parent frames until a static parent is reached // start with adding all enclosing parent frames until a static parent is reached
@ -396,7 +396,7 @@ void DtoCreateNestedContext(FuncDeclaration* fd) {
DtoCreateNestedContextType(fd); DtoCreateNestedContextType(fd);
// construct nested variables array // construct nested variables array
if (fd->closureVars.dim != 0) if (fd->closureVars.dim > 0)
{ {
IrFunction* irfunction = fd->ir.irFunc; IrFunction* irfunction = fd->ir.irFunc;
unsigned depth = irfunction->depth; unsigned depth = irfunction->depth;
@ -449,9 +449,6 @@ void DtoCreateNestedContext(FuncDeclaration* fd) {
I != E; ++I) { I != E; ++I) {
VarDeclaration *vd = *I; VarDeclaration *vd = *I;
if (needsClosure && vd->needsAutoDtor())
vd->error("has scoped destruction, cannot build closure");
LLValue* gep = DtoGEPi(frame, 0, vd->ir.irLocal->nestedIndex, vd->toChars()); LLValue* gep = DtoGEPi(frame, 0, vd->ir.irLocal->nestedIndex, vd->toChars());
if (vd->isParameter()) { if (vd->isParameter()) {
Logger::println("nested param: %s", vd->toChars()); Logger::println("nested param: %s", vd->toChars());