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

Merge branch 'master' into merge-2.064

Browse Source
This commit is contained in:
Kai Nacke
2013-11-05 10:47:43 +01:00
parent f772efaec3 6fe28e1660
commit 248d3f2b66
5 changed files with 46 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gen/llvmhelpers.cpp
View File

@@ -1121,8 +1121,7 @@ void DtoVarDeclaration(VarDeclaration* vd)
*/
else if (gIR->func()->retArg && gIR->func()->decl->nrvo_can && gIR->func()->decl->nrvo_var == vd) {
assert(!isSpecialRefVar(vd) && "Can this happen?");
vd->ir.irLocal = new IrLocal(vd);
vd->ir.irLocal->value = gIR->func()->retArg;
vd->ir.irLocal = new IrLocal(vd, gIR->func()->retArg);
}
// normal stack variable, allocate storage on the stack if it has not already been done
else {
@@ -1339,8 +1338,7 @@ LLValue* DtoRawVarDeclaration(VarDeclaration* var, LLValue* addr)
assert(!var->ir.isSet());
assert(addr);
var->ir.irLocal = new IrLocal(var);
var->ir.irLocal->value = addr;
var->ir.irLocal = new IrLocal(var, addr);
}
// return the alloca