diff --git a/gen/llvmhelpers.cpp b/gen/llvmhelpers.cpp index cecbbf58..ce278447 100644 --- a/gen/llvmhelpers.cpp +++ b/gen/llvmhelpers.cpp @@ -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; diff --git a/ir/irclass.cpp b/ir/irclass.cpp index c6759971..bfe8f003 100644 --- a/ir/irclass.cpp +++ b/ir/irclass.cpp @@ -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] = { diff --git a/ir/irtypeclass.cpp b/ir/irtypeclass.cpp index 1c323ac5..e2f5d3cb 100644 --- a/ir/irtypeclass.cpp +++ b/ir/irtypeclass.cpp @@ -171,11 +171,7 @@ void IrTypeClass::addBaseClassData( ArrayIter 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);