# HG changeset patch
# User Robert Clipsham <robert@octarineparrot.com>
# Date 1243961090 -3600
# Node ID 69a195e07d8970be324e1768226c73544133972f
# Parent  e0b2d67cfe7cf9e62f2490f962e0ab06c3ebf915# Parent  ed70675862c8fc2e63ad9255ee276ccc4cef1d8f
Merge.

diff -r e0b2d67cfe7c -r 69a195e07d89 gen/llvmhelpers.cpp
--- a/gen/llvmhelpers.cpp	Tue Jun 02 17:43:06 2009 +0100
+++ b/gen/llvmhelpers.cpp	Tue Jun 02 17:44:50 2009 +0100
@@ -1422,13 +1422,8 @@
 {
     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 -r e0b2d67cfe7c -r 69a195e07d89 ir/irclass.cpp
--- a/ir/irclass.cpp	Tue Jun 02 17:43:06 2009 +0100
+++ b/ir/irclass.cpp	Tue Jun 02 17:44:50 2009 +0100
@@ -111,11 +111,7 @@
                     "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 @@
 
     // 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 -r e0b2d67cfe7c -r 69a195e07d89 ir/irtypeclass.cpp
--- a/ir/irtypeclass.cpp	Tue Jun 02 17:43:06 2009 +0100
+++ b/ir/irtypeclass.cpp	Tue Jun 02 17:44:50 2009 +0100
@@ -171,11 +171,7 @@
         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);