# HG changeset patch # User Frits van Bommel # Date 1235833784 -3600 # Node ID b1b23a64ad8cd35fb30d8e9f8d4a7617da02e93b # Parent 4c20df3837f91cc3eff93ee23dbcbcfd7960c7f0 Use LLVM alignment data instead of hand-picked. diff -r 4c20df3837f9 -r b1b23a64ad8c dmd/mtype.c --- a/dmd/mtype.c Sat Feb 28 16:09:35 2009 +0100 +++ b/dmd/mtype.c Sat Feb 28 16:09:44 2009 +0100 @@ -65,6 +65,8 @@ #include "aggregate.h" #include "hdrgen.h" +#include "gen/tollvm.h" + FuncDeclaration *hasThis(Scope *sc); @@ -999,43 +1001,8 @@ } unsigned TypeBasic::alignsize() -{ unsigned sz; - - //LDC: it's bad that we always have to check LLVM's align and - // dmd's align info match. Can't we somehow get at LLVM's align - // here? - - switch (ty) - { - case Tfloat80: - case Timaginary80: - case Tcomplex80: - if (global.params.cpu == ARCHx86_64) - sz = 16; - else - sz = 4; - break; - - case Tint64: - case Tuns64: - case Tfloat64: - case Timaginary64: - case Tcomplex64: - if (global.params.cpu == ARCHx86_64) - sz = 8; - else - sz = 4; - break; - - case Tcomplex32: - sz = 4; - break; - - default: - sz = size(0); - break; - } - return sz; +{ + return getABITypeAlign(DtoType(this)); }