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

Fix nested references to 'ref' foreach variables.

Browse Source 
These "walk around" the array being iterated over, so they're a bit trickier
than other variables to get right.
This commit is contained in:
Frits van Bommel
2009-04-01 00:01:44 +02:00
parent aa8aad611c
commit 3f49ddb6d5
6 changed files with 68 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gen/statements.cpp
View File

@@ -1030,11 +1030,12 @@ void ForeachStatement::toIR(IRState* p)
// value
Logger::println("value = %s", value->toPrettyChars());
DtoRawVarDeclaration(value);
const LLType* valtype = DtoType(value->type);
LLValue* valvar = NULL;
if (!value->isRef() && !value->isOut())
if (!value->isRef() && !value->isOut()) {
// Create a local variable to serve as the value.
DtoRawVarDeclaration(value);
valvar = value->ir.irLocal->value;
}
// what to iterate
DValue* aggrval = aggr->toElem(p);
@@ -1093,13 +1094,17 @@ void ForeachStatement::toIR(IRState* p)
// get value for this iteration
LLConstant* zero = llvm::ConstantInt::get(keytype,0,false);
LLValue* loadedKey = p->ir->CreateLoad(keyvar,"tmp");
value->ir.irLocal->value = DtoGEP1(val,loadedKey);
LLValue* gep = DtoGEP1(val,loadedKey);
if (!value->isRef() && !value->isOut()) {
// Copy value to local variable, and use it as the value variable.
DVarValue dst(value->type, valvar);
DVarValue src(value->type, value->ir.irLocal->value);
DVarValue src(value->type, gep);
DtoAssign(loc, &dst, &src);
value->ir.irLocal->value = valvar;
} else {
// Use the GEP as the address of the value variable.
DtoRawVarDeclaration(value, gep);
}
// emit body