# HG changeset patch # User ChristianK # Date 1214163367 -7200 # Node ID 94435b0ab2ddd1227976c0c6f208705b576aad91 # Parent ebfa488f4abcf662b3ed16e564d851824a9dc972 [svn r315] Build full const initializer for static arrays in DtoConstInitializer if necessary. diff -r ebfa488f4abc -r 94435b0ab2dd gen/llvmhelpers.cpp --- a/gen/llvmhelpers.cpp Sun Jun 22 15:21:34 2008 +0200 +++ b/gen/llvmhelpers.cpp Sun Jun 22 21:36:07 2008 +0200 @@ -969,7 +969,22 @@ if (!init) { Logger::println("const default initializer for %s", type->toChars()); - _init = type->defaultInit()->toConstElem(gIR); + + if(type->ty == Tsarray) + { + Logger::println("type is a static array, building constant array initializer"); + TypeSArray* arrtype = (TypeSArray*)type; + Type* elemtype = type->next; + + integer_t arraydim; + arraydim = arrtype->dim->toInteger(); + + std::vector inits(arraydim, elemtype->defaultInit()->toConstElem(gIR)); + const LLArrayType* arrty = LLArrayType::get(DtoType(elemtype),arraydim); + _init = LLConstantArray::get(arrty, inits); + } + else + _init = type->defaultInit()->toConstElem(gIR); } else if (ExpInitializer* ex = init->isExpInitializer()) {