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

Merge branch 'memcpy'

Browse Source
This commit is contained in:
kai
2013-05-10 13:48:39 +02:00
parent fa3054c7cc 522c06ff7f
commit e233f803ff
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gen/statements.cpp
View File

@@ -82,7 +82,8 @@ void ReturnStatement::toIR(IRState* p)
DValue* rvar = new DVarValue(f->type->next, f->decl->ir.irFunc->retArg);
DValue* e = exp->toElemDtor(p);
// store return value
DtoAssign(loc, rvar, e);
if (rvar->getLVal() != e->getRVal())
DtoAssign(loc, rvar, e);
// call postblit if necessary
if (!p->func()->type->isref && !(f->decl->nrvo_can && f->decl->nrvo_var))

2
gen/tollvm.cpp
View File

@@ -545,6 +545,8 @@ void DtoMemSetZero(LLValue* dst, LLValue* nbytes)
void DtoMemCpy(LLValue* dst, LLValue* src, LLValue* nbytes, unsigned align)
{
assert (src != dst && "src and dst of memcpy must be different");
LLType* VoidPtrTy = getVoidPtrType();
dst = DtoBitCast(dst, VoidPtrTy);