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

Some minor changes to handling of variables referenced from nested functions in D2 .

Browse source 
Added generation of new 'void*[4] reserved;' !ModuleInfo member .
This commit is contained in:
Tomas Lindquist Olsen 2009-06-03 03:04:47 +02:00
parent f6997cb604
commit 092381577f
3 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
gen/functions.cpp
View file

@ -665,7 +665,7 @@ void DtoDefineFunction(FuncDeclaration* fd)
LLValue* thismem = DtoRawAlloca(thisvar->getType(), 0, "this"); // FIXME: align?
DtoStore(thisvar, thismem);
irfunction->thisArg = thismem;
assert(!fd->vthis->ir.irLocal);
fd->vthis->ir.irLocal = new IrLocal(fd->vthis);
fd->vthis->ir.irLocal->value = thismem;
@ -673,14 +673,12 @@ void DtoDefineFunction(FuncDeclaration* fd)
if (global.params.symdebug)
DtoDwarfLocalVariable(thismem, fd->vthis);
#if DMDV2
if (fd->vthis->nestedrefs.dim)
#else
#if DMDV1
if (fd->vthis->nestedref)
#endif
{
fd->nestedVars.insert(fd->vthis);
}
#endif
}
// give arguments storage
@ -698,14 +696,12 @@ void DtoDefineFunction(FuncDeclaration* fd)
IrLocal* irloc = vd->ir.irLocal;
assert(irloc);
#if DMDV2
if (vd->nestedrefs.dim)
#else
#if DMDV1
if (vd->nestedref)
#endif
{
fd->nestedVars.insert(vd);
}
#endif
bool refout = vd->storage_class & (STCref | STCout);
bool lazy = vd->storage_class & STClazy;
@ -734,19 +730,27 @@ void DtoDefineFunction(FuncDeclaration* fd)
}
// need result variable? (nested)
#if DMDV2
if (fd->vresult && fd->vresult->nestedrefs.dim) {
#else
#if DMDV1
if (fd->vresult && fd->vresult->nestedref) {
#endif
Logger::println("nested vresult value: %s", fd->vresult->toChars());
fd->nestedVars.insert(fd->vresult);
}
#endif
#if DMDV2
// fill nestedVars
size_t nnest = fd->closureVars.dim;
for (size_t i = 0; i < nnest; ++i)
{
VarDeclaration* vd = (VarDeclaration*)fd->closureVars.data[i];
fd->nestedVars.insert(vd);
}
#endif
DtoCreateNestedContext(fd);
#if DMDV2
if (fd->vresult && fd->vresult->nestedrefs.dim)
if (fd->vresult && fd->vresult->nestedrefs.dim) // FIXME: not sure here :/
#else
if (fd->vresult && fd->vresult->nestedref)
#endif