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

[svn r356] Fixed problem with array length assignment introduced in [355]

Browse Source
This commit is contained in:
Tomas Lindquist Olsen
2008-07-12 17:04:36 +02:00
parent 717d52d4f0
commit fc6e0cfc65
3 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gen/toir.cpp
View File

@@ -563,27 +563,23 @@ DValue* AssignExp::toElem(IRState* p)
Logger::print("AssignExp::toElem: %s | %s = %s\n", toChars(), e1->type->toChars(), e2->type ? e2->type->toChars() : 0);
LOG_SCOPE;
if (e1->op == TOKarraylength)
{
Logger::println("performing array.length assignment");
ArrayLengthExp *ale = (ArrayLengthExp *)e1;
DValue* arr = ale->e1->toElem(p);
DVarValue arrval(ale->e1->type, arr->getLVal(), true);
DValue* newlen = e2->toElem(p);
DSliceValue* slice = DtoResizeDynArray(arrval.getType(), &arrval, newlen);
DtoAssign(&arrval, slice);
return newlen;
}
Logger::println("performing normal assignment");
DValue* l = e1->toElem(p);
DValue* r = e2->toElem(p);
Logger::println("performing assignment");
DImValue* im = r->isIm();
if (!im || !im->inPlace()) {
Logger::println("assignment not inplace");
if (DArrayLenValue* al = l->isArrayLen())
{
DLRValue* arrlenval = l->isLRValue();
assert(arrlenval);
DVarValue arrval(arrlenval->getLType(), arrlenval->getLVal(), true);
DSliceValue* slice = DtoResizeDynArray(arrval.getType(), &arrval, r);
DtoAssign(&arrval, slice);
}
else
{
DtoAssign(l, r);
}
}
DtoAssign(l, r);
if (l->isSlice() || l->isComplex())
return l;
@@ -1945,9 +1941,7 @@ DValue* ArrayLengthExp::toElem(IRState* p)
LOG_SCOPE;
DValue* u = e1->toElem(p);
Logger::println("e1 = %s", e1->type->toChars());
return new DArrayLenValue(e1->type, u->getLVal(), type, DtoArrayLen(u));
return new DImValue(type, DtoArrayLen(u));
}
//////////////////////////////////////////////////////////////////////////////////////////