D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-03-15 00:21:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed initialization of multidimensional static arrays.

Browse Source
This commit is contained in:
Alexey Prokhin
2010-12-30 14:04:24 +03:00
parent 8d7ff66019
commit d8115713d2
3 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gen/llvmhelpers.cpp
View File

@@ -411,12 +411,14 @@ void DtoAssign(Loc& loc, DValue* lhs, DValue* rhs, int op)
else if (t->ty == Tarray) {
// lhs is slice
if (DSliceValue* s = lhs->isSlice()) {
Type *elemType = t->nextOf()->toBasetype();
if (elemType->equals(t2)) {
DtoArrayInit(loc, s, rhs, op);
if (t->nextOf()->toBasetype()->equals(t2)) {
DtoArrayInit(loc, lhs, rhs, op);
}
#if DMDV2
else if (op != -1 && op != TOKblit && arrayNeedsPostblit(elemType)) {
else if (DtoArrayElementType(t)->equals(t2)) {
DtoArrayInit(loc, s, rhs, op);
}
else if (op != -1 && op != TOKblit && arrayNeedsPostblit(t)) {
DtoArrayAssign(s, rhs, op);
}
#endif
@@ -446,13 +448,15 @@ void DtoAssign(Loc& loc, DValue* lhs, DValue* rhs, int op)
}
}
else if (t->ty == Tsarray) {
Type *elemType = t->nextOf()->toBasetype();
// T[n] = T
if (elemType->equals(t2)) {
if (t->nextOf()->toBasetype()->equals(t2)) {
DtoArrayInit(loc, lhs, rhs, op);
}
#if DMDV2
else if (op != -1 && op != TOKblit && arrayNeedsPostblit(elemType)) {
else if (DtoArrayElementType(t)->equals(t2)) {
DtoArrayInit(loc, lhs, rhs, op);
}
else if (op != -1 && op != TOKblit && arrayNeedsPostblit(t)) {
DtoArrayAssign(lhs, rhs, op);
}
#endif