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

Set irtype for underlying function type when building delegate types.

Browse source 
This fixes the problem of arg_nest disappearing when DtoType
is called on such types, e.g. as part of metadata generation.
This commit is contained in:
David Nadlinger 2012-12-21 00:32:07 +01:00
parent 7be9c5c5c7
commit 9d9f827efb
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ir/irtypefunction.cpp
View file

@ -21,8 +21,9 @@ IrTypeFunction::IrTypeFunction(Type* dt, LLType* lt)
{
}
IrTypeFunction* IrTypeFunction::get(Type* dt)
IrTypeFunction* IrTypeFunction::get(Type* dt, Type* nestedContextOverride)
{
assert(!dt->irtype);
assert(dt->ty == Tfunction);
// We can't get cycles here, but we can end up building the type as part of
@ -32,7 +33,7 @@ IrTypeFunction* IrTypeFunction::get(Type* dt)
if (tf->funcdecl)
lt = DtoFunctionType(tf->funcdecl);
else
lt = DtoFunctionType(tf,NULL,NULL);
lt = DtoFunctionType(tf, NULL, nestedContextOverride);
if (!dt->irtype)
dt->irtype = new IrTypeFunction(dt, lt);
@ -48,16 +49,28 @@ IrTypeDelegate::IrTypeDelegate(Type * dt, LLType* lt)
IrTypeDelegate* IrTypeDelegate::get(Type* dt)
{
assert(!dt->irtype);
assert(dt->ty == Tdelegate);
// We can't get cycles here, but we can end up building the type as part of
// a class vtbl, ...
LLType* func = DtoFunctionType(dt->nextOf(), NULL, Type::tvoid->pointerTo());
// We can't get cycles here, but we could end up building the type as part
// of a class vtbl, ...
if (!dt->nextOf()->irtype)
{
// Build the underlying function type. Be sure to set irtype here, so
// the nested context arg doesn't disappear if DtoType is ever called
// on dt->nextOf().
IrTypeFunction::get(dt->nextOf(), Type::tvoid->pointerTo());
}
if (!dt->irtype)
{
assert(static_cast<TypeFunction*>(dt->nextOf())->fty.arg_nest &&
"Underlying function type should have nested context arg, "
"picked up random pre-existing type?"
);
llvm::SmallVector<LLType*, 2> types;
types.push_back(getVoidPtrType());
types.push_back(getPtrToType(func));
types.push_back(getPtrToType(dt->nextOf()->irtype->getLLType()));
LLStructType* lt = LLStructType::get(gIR->context(), types);
dt->irtype = new IrTypeDelegate(dt, lt);
}