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

[svn r311] Fixed: structs no longer output two static typeinfos.

Browse Source 
Updated the DtoTypeInfoOf helper a bit after figuring out how it worked.
This commit is contained in:
Tomas Lindquist Olsen
2008-06-21 17:57:36 +02:00
parent 5f247bb394
commit f3ea671ed6
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gen/llvmhelpers.cpp
View File

@@ -1085,17 +1085,16 @@ void DtoAnnotation(const char* str)
LLConstant* DtoTypeInfoOf(Type* type, bool base)
{
type = type->merge(); // seems like this is needed in some cases with templates.
const LLType* typeinfotype = DtoType(Type::typeinfo->type);
if (!type->vtinfo)
type->getTypeInfo(NULL);
type = type->merge(); // needed.. getTypeInfo does the same
type->getTypeInfo(NULL);
TypeInfoDeclaration* tidecl = type->vtinfo;
assert(tidecl);
DtoForceDeclareDsymbol(tidecl);
assert(tidecl->ir.irGlobal != NULL);
LLConstant* c = isaConstant(tidecl->ir.irGlobal->value);
assert(c != NULL);
if (base)
return llvm::ConstantExpr::getBitCast(c, typeinfotype);
return llvm::ConstantExpr::getBitCast(c, DtoType(Type::typeinfo->type));
return c;
}