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

Fixed class default initializers and type generation. Bug #260 is fixed.

Browse Source
This commit is contained in:
Tomas Lindquist Olsen
2009-04-27 03:40:40 +02:00
parent 3bd5cf70c2
commit ba38e15f0d
9 changed files with 169 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ir/irstruct.cpp
View File

@@ -19,7 +19,8 @@
//////////////////////////////////////////////////////////////////////////////
IrStruct::IrStruct(AggregateDeclaration* aggr)
: diCompositeType(NULL)
: diCompositeType(NULL),
init_pa(llvm::OpaqueType::get())
{
aggrdecl = aggr;
@@ -57,7 +58,7 @@ LLGlobalVariable * IrStruct::getInitSymbol()
llvm::GlobalValue::LinkageTypes _linkage = DtoExternalLinkage(aggrdecl);
init = new llvm::GlobalVariable(
type->irtype->getPA().get(), true, _linkage, NULL, initname, gIR->module);
init_pa.get(), true, _linkage, NULL, initname, gIR->module);
return init;
}
@@ -78,6 +79,9 @@ llvm::Constant * IrStruct::getDefaultInit()
constInit = createClassDefaultInitializer();
}
llvm::OpaqueType* o = llvm::cast<llvm::OpaqueType>(init_pa.get());
o->refineAbstractTypeTo(constInit->getType());
return constInit;
}
@@ -157,11 +161,7 @@ LLConstant * IrStruct::createStructDefaultInitializer()
{
VarDeclaration* vd = *it;
if (vd->offset < offset)
{
IF_LOG Logger::println("skipping field: %s %s (+%u)", vd->type->toChars(), vd->toChars(), vd->offset);
continue;
}
assert(vd->offset >= offset && "default fields not sorted by offset");
IF_LOG Logger::println("using field: %s %s (+%u)", vd->type->toChars(), vd->toChars(), vd->offset);