Skip to content

Commit fdeeffe

Browse files
vtjnashJeffBezanson
authored andcommitted
Revert "fix #6645, 8-byte alignment of Float64 on 32-bit" (#34088)
This workaround is no longer needed.
1 parent 0b7ecf6 commit fdeeffe

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

src/array.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,8 @@ JL_DLLEXPORT void jl_arrayunset(jl_array_t *a, size_t i)
600600
((jl_value_t**)a->data)[i] = NULL;
601601
}
602602

603-
// at this size and bigger, allocate resized array data with malloc
603+
// at this size and bigger, allocate resized array data with malloc directly
604+
// instead of managing them separately as gc objects
604605
#define MALLOC_THRESH 1048576
605606

606607
// Resize the buffer to a max size of `newlen`
@@ -652,13 +653,7 @@ static int NOINLINE array_resize_buffer(jl_array_t *a, size_t newlen)
652653
}
653654
else {
654655
newbuf = 1;
655-
if (
656-
#ifdef _P64
657-
nbytes >= MALLOC_THRESH
658-
#else
659-
elsz > 4
660-
#endif
661-
) {
656+
if (nbytes >= MALLOC_THRESH) {
662657
a->data = jl_gc_managed_malloc(nbytes);
663658
jl_gc_track_malloced_array(ptls, a);
664659
a->flags.how = 2;

0 commit comments

Comments
 (0)