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

[svn r190] Fixed array concatenation for some broken cases.

Browse Source 
Added a sanity check for the Dsymbol state set.
This commit is contained in:
Tomas Lindquist Olsen
2008-05-06 18:36:46 +02:00
parent 0fba6312c2
commit e07b99bc26
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gen/arrays.cpp
View File

@@ -578,20 +578,18 @@ void DtoCatArrays(llvm::Value* arr, Expression* exp1, Expression* exp2)
assert(t1->ty == t2->ty);
DValue* e1 = exp1->toElem(gIR);
llvm::Value* a = e1->getRVal();
DValue* e2 = exp2->toElem(gIR);
llvm::Value* b = e2->getRVal();
llvm::Value *len1, *len2, *src1, *src2, *res;
len1 = gIR->ir->CreateLoad(DtoGEPi(a,0,0,"tmp"),"tmp");
len2 = gIR->ir->CreateLoad(DtoGEPi(b,0,0,"tmp"),"tmp");
len1 = DtoArrayLen(e1);
len2 = DtoArrayLen(e2);
res = gIR->ir->CreateAdd(len1,len2,"tmp");
llvm::Value* mem = DtoNewDynArray(arr, res, DtoDType(t1->next), false);
src1 = gIR->ir->CreateLoad(DtoGEPi(a,0,1,"tmp"),"tmp");
src2 = gIR->ir->CreateLoad(DtoGEPi(b,0,1,"tmp"),"tmp");
src1 = DtoArrayPtr(e1);
src2 = DtoArrayPtr(e2);
DtoMemCpy(mem,src1,len1);
mem = gIR->ir->CreateGEP(mem,len1,"tmp");