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

Merge branch 'master' into merge-2.054

Browse source 
Conflicts:
	gen/statements.cpp (returning void from main() was fixed on both branches)
This commit is contained in:
David Nadlinger 2011-08-17 16:09:28 +02:00
commit 9864129fb8
126 changed files with 42 additions and 58757 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gen/nested.cpp
View file

@ -396,6 +396,9 @@ static void DtoCreateNestedContextType(FuncDeclaration* fd) {
unsigned depth = -1;
if (!fd->isStatic()) {
if (FuncDeclaration* parfd = getParentFunc(fd, true)) {
// Make sure parfd->ir.irFunc has already been set.
DtoDeclareFunction(parfd);
innerFrameType = parfd->ir.irFunc->frameType;
if (innerFrameType)
depth = parfd->ir.irFunc->depth;