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

Fixed ClassInfo.interfaces. mini/s.d now runs again.

Browse Source
This commit is contained in:
Tomas Lindquist Olsen
2009-04-16 21:10:51 +02:00
parent 0521f8075c
commit 948202a1a1
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ir/irclass.cpp
View File

@@ -384,11 +384,10 @@ LLConstant * IrStruct::getClassInfoInterfaces()
assert(type->irtype->isClass()->getNumInterfaceVtbls() == n &&
"inconsistent number of interface vtables in this class");
VarDeclarationIter interfaces_idx(ClassDeclaration::classinfo->fields, 3);
if (n == 0)
{
VarDeclarationIter idx(ClassDeclaration::classinfo->fields, 3);
return getNullValue(DtoType(idx->type));
}
return getNullValue(DtoType(interfaces_idx->type));
// Build array of:
//
@@ -447,22 +446,29 @@ LLConstant * IrStruct::getClassInfoInterfaces()
LLConstant* arr = llvm::ConstantArray::get(
array_type,
&constants[0],
constants.size());
n);
// apply the initializer
classInterfacesArray->setInitializer(arr);
// return null, only baseclass provide interfaces
if (cd->vtblInterfaces->dim == 0)
{
return getNullValue(DtoType(interfaces_idx->type));
}
// only the interface explicitly implemented by this class
// (not super classes) should show in ClassInfo
LLConstant* idxs[2] = {
DtoConstSize_t(0),
// only the interface explicitly implemented by this class
// (not super classes) should show in ClassInfo
DtoConstSize_t(n - cd->vtblInterfaces->dim)
};
LLConstant* ptr = llvm::ConstantExpr::getGetElementPtr(
classInterfacesArray, idxs, 2);
// return as a slice
return DtoConstSlice(
DtoConstSize_t(n),
llvm::ConstantExpr::getGetElementPtr(classInterfacesArray, idxs, 2));
return DtoConstSlice( DtoConstSize_t(cd->vtblInterfaces->dim), ptr );
}
//////////////////////////////////////////////////////////////////////////////