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

Fixed all issues preventing Tango 0.99.8 to compile with `sh build-tango.sh --verbose ldc'.

Browse Source
This commit is contained in:
Tomas Lindquist Olsen
2009-04-17 14:38:29 +02:00
parent f5ce8eda1d
commit 1c79df3817
8 changed files with 72 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ir/irtypestruct.cpp
View File

@@ -86,14 +86,16 @@ const llvm::Type* IrTypeStruct::buildType()
for (; !it.done(); it.next())
{
VarDeclaration* vd = it.get();
//Logger::println("vd: %s", vd->toPrettyChars());
assert(vd->ir.irField == NULL && "struct inheritance is not allowed, how can this happen?");
//assert(vd->ir.irField == NULL && "struct inheritance is not allowed, how can this happen?");
// skip if offset moved backwards
if (vd->offset < offset)
{
IF_LOG Logger::println("Skipping field %s %s (+%u) for default", vd->type->toChars(), vd->toChars(), vd->offset);
new IrField(vd, 0, vd->offset);
if (vd->ir.irField == NULL)
new IrField(vd, 0, vd->offset);
continue;
}
@@ -123,7 +125,8 @@ const llvm::Type* IrTypeStruct::buildType()
// the IrField creation doesn't really belong here, but it's a trivial operation
// and it save yet another of these loops.
IF_LOG Logger::println("Field index: %zu", field_index);
new IrField(vd, field_index);
if (vd->ir.irField == NULL)
new IrField(vd, field_index);
field_index++;
}
@@ -142,7 +145,7 @@ const llvm::Type* IrTypeStruct::buildType()
// name types
Type::sir->getState()->module->addTypeName(sd->toPrettyChars(), pa.get());
#if 1
#if 0
IF_LOG Logger::cout() << "final struct type: " << *pa.get() << std::endl;
#endif