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

Refactored IrType construction to use static get() method.

Browse Source 
This also allows us to enable the assert in IrType::IrType.

Unfortunately, this is mostly a "peace of mind" commit, there
doesn't seem to have been a bug actually caused by the transitory
duplicate IrTypePointer/IrTypeStruct instances.

The remaining xyz2llvm static methods are not exactly pretty,
they should probably just be folded into get.
This commit is contained in:
David Nadlinger
2012-12-20 21:30:29 +01:00
parent 464c695814
commit a3a511ca55
9 changed files with 170 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ir/irtypestruct.cpp
View File

@@ -84,20 +84,23 @@ bool var_offset_sort_cb(const VarDeclaration* v1, const VarDeclaration* v2)
// this is pretty much the exact same thing we need to do for fields in each
// base class of a class
llvm::Type* IrTypeStruct::buildType()
IrTypeStruct* IrTypeStruct::get(StructDeclaration* sd)
{
IrTypeStruct* t = new IrTypeStruct(sd);
sd->type->irtype = t;
IF_LOG Logger::println("Building struct type %s @ %s",
sd->toPrettyChars(), sd->loc.toChars());
LOG_SCOPE;
// if it's a forward declaration, all bets are off, stick with the opaque
if (sd->sizeok != 1)
return type;
return t;
// mirror the sd->fields array but only fill in contributors
size_t n = sd->fields.dim;
LLSmallVector<VarDeclaration*, 16> data(n, NULL);
default_fields.reserve(n);
t->default_fields.reserve(n);
// first fill in the fields with explicit initializers
VarDeclarationIter field_it(sd->fields);
@@ -197,7 +200,7 @@ llvm::Type* IrTypeStruct::buildType()
assert(vd->offset >= offset);
// add to default field list
default_fields.push_back(vd);
t->default_fields.push_back(vd);
// get next aligned offset for this type
size_t alignedoffset = offset;
@@ -229,11 +232,11 @@ llvm::Type* IrTypeStruct::buildType()
}
// set struct body
isaStruct(type)->setBody(defaultTypes, packed);
isaStruct(t->type)->setBody(defaultTypes, packed);
IF_LOG Logger::cout() << "final struct type: " << *type << std::endl;
IF_LOG Logger::cout() << "final struct type: " << *t->type << std::endl;
return type;
return t;
}
//////////////////////////////////////////////////////////////////////////////