fixup! make arrays follow alignment as well.

Author: vchuravy

src/array.c

@@ -122,7 +122,6 @@ static jl_array_t *_new_array_(jl_value_t *atype, uint32_t ndims, size_t *dims,
     a->flags.ndims = ndims;
     a->flags.ptrarray = !isunboxed;
     a->elsize = elsz;
-    a->elalign = elalign;
     a->flags.isshared = 0;
     a->flags.isaligned = 1;
     a->offset = 0;
@@ -197,7 +196,6 @@ JL_DLLEXPORT jl_array_t *jl_reshape_array(jl_value_t *atype, jl_array_t *data,
     assert(isboxed == data->flags.ptrarray);
     if (!isboxed) {
         a->elsize = elsz;
-        a->elalign = align;
         jl_value_t *ownerty = jl_typeof(owner);
         size_t oldelsz = 0, oldalign = 0;
         if (ownerty == (jl_value_t*)jl_string_type) {
@@ -214,7 +212,6 @@ JL_DLLEXPORT jl_array_t *jl_reshape_array(jl_value_t *atype, jl_array_t *data,
     }
     else {
         a->elsize = sizeof(void*);
-        a->elalign = sizeof(void*);
         a->flags.ptrarray = 1;
     }
 
@@ -268,7 +265,6 @@ JL_DLLEXPORT jl_array_t *jl_string_to_array(jl_value_t *str)
     a->data = jl_string_data(str);
     a->flags.isaligned = 0;
     a->elsize = 1;
-    a->elalign = 0;
     a->flags.ptrarray = 0;
     jl_array_data_owner(a) = str;
     a->flags.how = 3;
@@ -316,7 +312,6 @@ JL_DLLEXPORT jl_array_t *jl_ptr_to_array_1d(jl_value_t *atype, void *data,
     a->length = nel;
 #endif
     a->elsize = elsz;
-    a->elalign = align;
     a->flags.ptrarray = !isunboxed;
     a->flags.ndims = 1;
     a->flags.isshared = 1;
@@ -383,7 +378,6 @@ JL_DLLEXPORT jl_array_t *jl_ptr_to_array(jl_value_t *atype, void *data,
     a->length = nel;
 #endif
     a->elsize = elsz;
-    a->elalign = align;
     a->flags.ptrarray = !isunboxed;
     a->flags.ndims = ndims;
     a->offset = 0;
@@ -1047,7 +1041,7 @@ JL_DLLEXPORT void jl_array_sizehint(jl_array_t *a, size_t sz)
 JL_DLLEXPORT jl_array_t *jl_array_copy(jl_array_t *ary)
 {
     size_t elsz = ary->elsize;
-    size_t elalign = ary->elalign;
+    size_t elalign = ary->flags.ptrarray ? sizeof(void*) : jl_datatype_align(jl_tparam0(jl_typeof(ary)));
     size_t len = jl_array_len(ary);
     jl_array_t *new_ary = _new_array_(jl_typeof(ary), jl_array_ndims(ary),
                                       &ary->nrows, !ary->flags.ptrarray, elsz, elalign);

src/dump.c

@@ -574,16 +574,17 @@ static void jl_serialize_value_(jl_serializer_state *s, jl_value_t *v, int as_li
     }
     else if (jl_is_array(v)) {
         jl_array_t *ar = (jl_array_t*)v;
+	size_t elalign = ar->flags.ptrarray ? sizeof(void*) : jl_datatype_align(jl_tparam0(jl_typeof(ar)));
         if (ar->flags.ndims == 1 && ar->elsize < 128) {
             writetag(s->s, (jl_value_t*)Array1d_tag);
             write_uint8(s->s, (ar->flags.ptrarray<<7) | (ar->elsize & 0x7f));
-            write_uint8(s->s, ar->elalign & 0x7f);
+            write_uint8(s->s, elalign);
         }
         else {
             writetag(s->s, (jl_value_t*)jl_array_type);
             write_uint16(s->s, ar->flags.ndims);
             write_uint16(s->s, (ar->flags.ptrarray<<15) | (ar->elsize & 0x7fff));
-            write_uint16(s->s, ar->elalign);
+            write_uint16(s->s, elalign);
         }
         for (i=0; i < ar->flags.ndims; i++)
             jl_serialize_value(s, jl_box_long(jl_array_dim(ar,i)));
@@ -1338,15 +1339,15 @@ static jl_value_t *jl_deserialize_value_array(jl_serializer_state *s, jl_value_t
         elalign = read_uint8(s->s);
         isunboxed = !(elsize >> 7);
         elsize = elsize & 0x7f;
-        elalign = elalign & 0x7f;
+        elalign = elalign;
     }
     else {
         ndims = read_uint16(s->s);
         elsize = read_uint16(s->s);
         elalign = read_uint16(s->s);
         isunboxed = !(elsize >> 15);
         elsize = elsize & 0x7fff;
-        elalign = elalign & 0x7fff;
+        elalign = elalign;
     }
     uintptr_t pos = backref_list.len;
     if (usetable)

src/julia.h

@@ -155,7 +155,6 @@ JL_EXTENSION typedef struct {
 #endif
     jl_array_flags_t flags;
     uint16_t elsize;
-    uint16_t elalign;
     uint32_t offset;  // for 1-d only. does not need to get big.
     size_t nrows;
     union {