mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-07 11:26:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Slight rewrite to make intent cleaner.

Browse source 
No functionality change intended, although it might make the last
commit unnecessary.
This commit is contained in:
David Nadlinger 2012-12-19 20:37:16 +01:00
parent 9cbfc604c7
commit db59b30eda
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gen/nested.cpp
View file

@ -398,23 +398,20 @@ 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.
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;
bool byref = irparam->arg->byref;
bool isVthisPtr = irparam->isVthis && !byref;
if ((!refout && (!byref || lazy)) || isVthisPtr) {
const IrParameter* irparam = vd->ir.irParam;
const bool refout = vd->storage_class & (STCref | STCout);
const bool lazy = vd->storage_class & STClazy;
const bool byref = irparam->arg->byref;
const bool isVthisPtr = irparam->isVthis && !byref;
if (!(refout || (byref && !lazy)) || isVthisPtr) {
// This will be copied to the nesting frame.
if (lazy)
type = type->getContainedType(0);
types.push_back(irparam->value->getType()->getContainedType(0));
else
type = DtoType(vd->type);
types.push_back(DtoType(vd->type));
} else {
types.push_back(irparam->value->getType());
}
types.push_back(type);
} else if (isSpecialRefVar(vd)) {
types.push_back(DtoType(vd->type->pointerTo()));
} else {