Merge pull request #1128 from klickverbot/vector-init

Fix misaligned vector variable initializers
ldc-developers · Sep 26, 2015 · b313929 · b313929
2 parents 97819eb + c897015
commit b313929
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/gen/arrays.cpp b/gen/arrays.cpp
@@ -363,15 +363,15 @@ static void DtoSetArray(DValue* array, LLValue* dim, LLValue* ptr)
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-LLConstant* DtoConstArrayInitializer(ArrayInitializer* arrinit)
+LLConstant* DtoConstArrayInitializer(ArrayInitializer* arrinit, Type* targetType)
 {
-    IF_LOG Logger::println("DtoConstArrayInitializer: %s | %s", arrinit->toChars(), arrinit->type->toChars());
+    IF_LOG Logger::println("DtoConstArrayInitializer: %s | %s", arrinit->toChars(), targetType->toChars());
     LOG_SCOPE;
 
     assert(arrinit->value.dim == arrinit->index.dim);
 
     // get base array type
-    Type* arrty = arrinit->type->toBasetype();
+    Type* arrty = targetType->toBasetype();
     size_t arrlen = arrinit->dim;
 
     // for statis arrays, dmd does not include any trailing default

diff --git a/gen/arrays.h b/gen/arrays.h
@@ -30,8 +30,11 @@ llvm::StructType* DtoArrayType(Type* arrayTy);
 llvm::StructType* DtoArrayType(LLType* elemTy);
 llvm::ArrayType* DtoStaticArrayType(Type* sarrayTy);
 
-LLType* DtoConstArrayInitializerType(ArrayInitializer* arrinit);
-LLConstant* DtoConstArrayInitializer(ArrayInitializer* si);
+/// Creates a (global) constant with the element data for the given arary
+/// initializer. targetType is explicit because the frontend sometimes emits
+/// ArrayInitializers for vectors typed as static arrays.
+LLConstant* DtoConstArrayInitializer(ArrayInitializer* si, Type* targetType);
+
 LLConstant* DtoConstSlice(LLConstant* dim, LLConstant* ptr, Type *type = 0);
 
 /// Returns whether the array literal can be evaluated to a (LLVM) constant.

diff --git a/gen/llvmhelpers.cpp b/gen/llvmhelpers.cpp
@@ -1178,7 +1178,7 @@ LLConstant* DtoConstInitializer(Loc& loc, Type* type, Initializer* init)
     else if (ArrayInitializer* ai = init->isArrayInitializer())
     {
         Logger::println("const array initializer");
-        _init = DtoConstArrayInitializer(ai);
+        _init = DtoConstArrayInitializer(ai, type);
     }
     else if (init->isVoidInitializer())
     {