mirror of
https://github.com/xomboverlord/ldc.git
synced 2026-01-21 15:23:13 +01:00
Remove some unnecessary #ifs. The D1 frontend has a Type::nextOf() which just
returns `next`.
This commit is contained in:
@@ -1422,13 +1422,8 @@ bool hasUnalignedFields(Type* t)
|
||||
{
|
||||
t = t->toBasetype();
|
||||
if (t->ty == Tsarray) {
|
||||
#if DMDV2
|
||||
assert(t->nextOf()->size() % t->nextOf()->alignsize() == 0);
|
||||
return hasUnalignedFields(t->nextOf());
|
||||
#else
|
||||
assert(t->next->size() % t->next->alignsize() == 0);
|
||||
return hasUnalignedFields(t->next);
|
||||
#endif
|
||||
} else if (t->ty != Tstruct)
|
||||
return false;
|
||||
|
||||
|
||||
@@ -111,11 +111,7 @@ LLGlobalVariable * IrStruct::getInterfaceArraySymbol()
|
||||
"don't implement any interfaces");
|
||||
|
||||
VarDeclarationIter idx(ClassDeclaration::classinfo->fields, 3);
|
||||
#if DMDV2
|
||||
const llvm::Type* InterfaceTy = DtoType(idx->type->nextOf());
|
||||
#else
|
||||
const llvm::Type* InterfaceTy = DtoType(idx->type->next);
|
||||
#endif
|
||||
|
||||
// create Interface[N]
|
||||
const llvm::ArrayType* array_type = llvm::ArrayType::get(InterfaceTy,n);
|
||||
@@ -330,11 +326,7 @@ llvm::GlobalVariable * IrStruct::getInterfaceVtbl(BaseClass * b, bool new_instan
|
||||
|
||||
// start with the interface info
|
||||
VarDeclarationIter interfaces_idx(ClassDeclaration::classinfo->fields, 3);
|
||||
#if DMDV2
|
||||
Type* first = interfaces_idx->type->nextOf()->pointerTo();
|
||||
#else
|
||||
Type* first = interfaces_idx->type->next->pointerTo();
|
||||
#endif
|
||||
|
||||
// index into the interfaces array
|
||||
llvm::Constant* idxs[2] = {
|
||||
|
||||
@@ -171,11 +171,7 @@ void IrTypeClass::addBaseClassData(
|
||||
ArrayIter<BaseClass> it2(*base->vtblInterfaces);
|
||||
|
||||
VarDeclarationIter interfaces_idx(ClassDeclaration::classinfo->fields, 3);
|
||||
#if DMDV2
|
||||
Type* first = interfaces_idx->type->nextOf()->pointerTo();
|
||||
#else
|
||||
Type* first = interfaces_idx->type->next->pointerTo();
|
||||
#endif
|
||||
|
||||
// align offset
|
||||
offset = (offset + PTRSIZE - 1) & ~(PTRSIZE - 1);
|
||||
|
||||
Reference in New Issue
Block a user