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

Make ref vars work with nesting.

Browse source
This commit is contained in:
Christian Kamm 2009-11-07 14:06:11 +01:00
parent 4e2e4d5b3d
commit 57630ea48b
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
gen/llvmhelpers.cpp
View file

@ -896,6 +896,21 @@ DValue* DtoDeclarationExp(Dsymbol* declaration)
Logger::println("vdtype = %s", vd->type->toChars()); Logger::println("vdtype = %s", vd->type->toChars());
// ref vardecls are generated when DMD lowers foreach to a for statement,
// and this is a hack to support them for this case only
if(vd->isRef())
{
if (!vd->ir.irLocal)
vd->ir.irLocal = new IrLocal(vd);
ExpInitializer* ex = vd->init->isExpInitializer();
assert(ex && "ref vars must have expression initializer");
assert(ex->exp);
AssignExp* as = dynamic_cast<AssignExp*>(ex->exp);
assert(as && "ref vars must be initialized by an assign exp");
vd->ir.irLocal->value = as->e2->toElem(gIR)->getLVal();
}
// referenced by nested delegate? // referenced by nested delegate?
#if DMDV2 #if DMDV2
if (vd->nestedrefs.dim) { if (vd->nestedrefs.dim) {
@ -927,21 +942,6 @@ DValue* DtoDeclarationExp(Dsymbol* declaration)
DtoDwarfLocalVariable(allocainst, vd); DtoDwarfLocalVariable(allocainst, vd);
} }
} }
else if(vd->isRef())
{
// ref vardecls are generated when DMD lowers foreach to a for statement,
// and this is a hack to support them for this case only
if (!vd->ir.irLocal)
vd->ir.irLocal = new IrLocal(vd);
ExpInitializer* ex = vd->init->isExpInitializer();
assert(ex && "ref vars must have expression initializer");
assert(ex->exp);
AssignExp* as = dynamic_cast<AssignExp*>(ex->exp);
assert(as && "ref vars must be initialized by an assign exp");
vd->ir.irLocal->value = as->e2->toElem(gIR)->getLVal();
return new DVarValue(vd->type, vd, vd->ir.getIrValue());
}
else else
{ {
assert(vd->ir.irLocal->value); assert(vd->ir.irLocal->value);
@ -949,6 +949,7 @@ DValue* DtoDeclarationExp(Dsymbol* declaration)
if (Logger::enabled()) if (Logger::enabled())
Logger::cout() << "llvm value for decl: " << *vd->ir.irLocal->value << '\n'; Logger::cout() << "llvm value for decl: " << *vd->ir.irLocal->value << '\n';
if (!vd->isRef())
DValue* ie = DtoInitializer(vd->ir.irLocal->value, vd->init); DValue* ie = DtoInitializer(vd->ir.irLocal->value, vd->init);
} }