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

Partial fix for #69 — LDC1 from master fails to build Tango.

Browse Source 
Fixed regression that has been introduced in commit 9889067.
This commit is contained in:
Alexey Prokhin
2012-01-29 12:32:08 +04:00
parent efcbe8390a
commit 15a903580b
5 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gen/nested.cpp
View File

@@ -463,12 +463,19 @@ static void DtoCreateNestedContextType(FuncDeclaration* fd) {
if (vd->isParameter()) {
// Parameters will have storage associated with them (to handle byref etc.),
// so handle those cases specially by storing a pointer instead of a value.
assert(vd->ir.irParam->value);
LLValue* value = vd->ir.irParam->value;
IrParameter * irparam = vd->ir.irParam;
LLValue* value = irparam->value;
assert(value);
LLType* type = value->getType();
bool refout = vd->storage_class & (STCref | STCout);
bool lazy = vd->storage_class & STClazy;
if (!refout && (!vd->ir.irParam->arg->byref || lazy)) {
bool byref = irparam->arg->byref;
#if STRUCTTHISREF
bool isVthisPtr = irparam->isVthis && !byref;
#else
bool isVthisPtr = irparam->isVthis;
#endif
if ((!refout && (!byref || lazy)) || isVthisPtr) {
// This will be copied to the nesting frame.
if (lazy)
type = type->getContainedType(0);