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

Allocate dynamic array literals on the heap.

Browse Source
This commit is contained in:
Christian Kamm
2008-09-14 10:56:01 +02:00
parent 30c9af1945
commit d6e4f659e2
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gen/toir.cpp
View File

@@ -2168,14 +2168,25 @@ DValue* ArrayLiteralExp::toElem(IRState* p)
}
// dst pointer
// FIXME: dynamic array literals should be allocated with the GC
LLValue* dstMem = DtoAlloca(llStoType, "arrayliteral");
LLValue* dstMem;
DSliceValue* dynSlice = NULL;
if(dyn)
{
dynSlice = DtoNewDynArray(loc, arrayType, new DConstValue(Type::tsize_t, DtoConstSize_t(len)), false);
dstMem = dynSlice->ptr;
}
else
dstMem = DtoAlloca(llStoType, "arrayliteral");
// store elements
for (size_t i=0; i<len; ++i)
{
Expression* expr = (Expression*)elements->data[i];
LLValue* elemAddr = DtoGEPi(dstMem,0,i,"tmp",p->scopebb());
LLValue* elemAddr;
if(dyn)
elemAddr = DtoGEPi1(dstMem, i, "tmp", p->scopebb());
else
elemAddr = DtoGEPi(dstMem,0,i,"tmp",p->scopebb());
// emulate assignment
DVarValue* vv = new DVarValue(expr->type, elemAddr);
@@ -2187,8 +2198,8 @@ DValue* ArrayLiteralExp::toElem(IRState* p)
if (!dyn)
return new DImValue(type, dstMem);
// wrap in a slice
return new DSliceValue(type, DtoConstSize_t(len), DtoGEPi(dstMem,0,0,"tmp"));
// return slice
return dynSlice;
}
//////////////////////////////////////////////////////////////////////////////////////////