D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-12 02:43:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix codegen for foreach with ref value being lowered to for.

Browse Source
This commit is contained in:
Christian Kamm
2009-11-07 13:51:05 +01:00
parent bcd12c0ce1
commit 4e2e4d5b3d
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gen/llvmhelpers.cpp
View File

@@ -908,17 +908,18 @@ DValue* DtoDeclarationExp(Dsymbol* declaration)
DtoNestedInit(vd);
}
// normal stack variable, allocate storage on the stack if it has not already been done
else if(!vd->ir.irLocal) {
else if(!vd->ir.irLocal && !vd->isRef()) {
vd->ir.irLocal = new IrLocal(vd);
const LLType* lltype = DtoType(vd->type);
llvm::Value* allocainst;
if(gTargetData->getTypeSizeInBits(lltype) == 0)
if(gTargetData->getTypeSizeInBits(lltype) == 0)
allocainst = llvm::ConstantPointerNull::get(getPtrToType(lltype));
else
allocainst = DtoAlloca(vd->type, vd->toChars());
//allocainst->setAlignment(vd->type->alignsize()); // TODO
vd->ir.irLocal = new IrLocal(vd);
vd->ir.irLocal->value = allocainst;
if (global.params.symdebug)
@@ -926,6 +927,21 @@ DValue* DtoDeclarationExp(Dsymbol* declaration)
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
{
assert(vd->ir.irLocal->value);