Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make jl_datatype_size reflect non-padded field size #46322

Closed
wants to merge 1 commit into from
Closed

Make jl_datatype_size reflect non-padded field size #46322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/datatype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ static unsigned union_isinlinable(jl_value_t *ty, int pointerfree, size_t *nbyte
size_t sz = jl_datatype_size(ty);
size_t al = jl_datatype_align(ty);
// primitive types in struct slots need their sizes aligned. issue #37974
if (asfield && jl_is_primitivetype(ty))
if (asfield)
sz = LLT_ALIGN(sz, al);
if (*nbytes < sz)
*nbytes = sz;
Expand Down Expand Up @@ -465,6 +465,8 @@ void jl_compute_field_offsets(jl_datatype_t *st)
uint32_t fld_npointers = ((jl_datatype_t*)fld)->layout->npointers;
if (((jl_datatype_t*)fld)->layout->haspadding)
haspadding = 1;
if (jl_datatype_size(fld) < fsz)
haspadding = 1;
if (i >= nfields - st->name->n_uninitialized && fld_npointers &&
fld_npointers * sizeof(void*) != fsz) {
// field may be undef (may be uninitialized and contains pointer),
Expand All @@ -491,8 +493,13 @@ void jl_compute_field_offsets(jl_datatype_t *st)
}
if (isatomic && fsz > MAX_ATOMIC_SIZE)
needlock = 1;
if (isatomic && fsz <= MAX_ATOMIC_SIZE)
al = fsz = next_power_of_two(fsz);
if (isatomic && fsz <= MAX_ATOMIC_SIZE) {
size_t nfsz = next_power_of_two(fsz);
if (nfsz > fsz) {
haspadding = 1;
}
al = fsz = nfsz;
}
if (al != 0) {
size_t alsz = LLT_ALIGN(sz, al);
if (alsz != sz)
Expand Down Expand Up @@ -525,9 +532,7 @@ void jl_compute_field_offsets(jl_datatype_t *st)
if (al > alignm)
alignm = al;
}
st->size = LLT_ALIGN(sz, alignm);
if (st->size > sz)
haspadding = 1;
st->size = sz;
if (should_malloc && npointers)
pointers = (uint32_t*)malloc_s(npointers * sizeof(uint32_t));
else
Expand Down Expand Up @@ -1470,6 +1475,7 @@ static inline void memassign_safe(int hasptr, jl_value_t *parent, char *dst, con
memmove_refs((void**)dst, (void**)src, nptr);
jl_gc_multi_wb(parent, src);
src = (jl_value_t*)((char*)src + nptr * sizeof(void*));
dst += nptr * sizeof(void*);
nb -= nptr * sizeof(void*);
}
else {
Expand Down
2 changes: 1 addition & 1 deletion test/atomics.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ swap(x, y) = y
let T1 = Refxy{NTuple{3,UInt8}},
T2 = ARefxy{NTuple{3,UInt8}}
@test sizeof(T1) == 6
@test sizeof(T2) == 8
@test sizeof(T2) == 7
@test fieldoffset(T1, 1) == 0
@test fieldoffset(T2, 1) == 0
@test fieldoffset(T1, 2) == 3
Expand Down
4 changes: 2 additions & 2 deletions test/compiler/codegen.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,10 +540,10 @@ let a = Core.Intrinsics.trunc_int(UInt24, 3),
f(t) = t[2]
@test f((a, true)) === true
@test f((a, false)) === false
@test sizeof(Tuple{UInt24,Bool}) == 8
@test sizeof(Tuple{UInt24,Bool}) == 5
@test sizeof(UInt24) == 3
@test sizeof(Union{UInt8,UInt24}) == 3
@test sizeof(Base.RefValue{Union{UInt8,UInt24}}) == 8
@test sizeof(Base.RefValue{Union{UInt8,UInt24}}) == 5
end

# issue #39232
Expand Down
8 changes: 4 additions & 4 deletions test/core.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6085,7 +6085,7 @@ let
@test b.x === Int8(91)
@test b.z === Int8(23)
@test b.y === A23367((Int8(1), Int8(2), Int8(3), Int8(4), Int8(5), Int8(6), Int8(7)))
@test sizeof(b) == 12
@test sizeof(b) == 11
@test A23367(Int8(1)).x === Int8(1)
@test A23367(Int8(0)).x === Int8(0)
@test A23367(Int16(1)).x === Int16(1)
Expand Down Expand Up @@ -6118,17 +6118,17 @@ struct UnionFieldInlineStruct
y::Union{Float64, Missing}
end

@test sizeof(Vector{UnionFieldInlineStruct}(undef, 2)) == sizeof(UnionFieldInlineStruct) * 2
@test sizeof(Vector{UnionFieldInlineStruct}(undef, 2)) >= sizeof(UnionFieldInlineStruct) * 2

let x = UnionFieldInlineStruct(1, 3.14)
AInlineUnion = [x for i = 1:10]
@test sizeof(AInlineUnion) == sizeof(UnionFieldInlineStruct) * 10
@test sizeof(AInlineUnion) >= sizeof(UnionFieldInlineStruct) * 10
BInlineUnion = Vector{UnionFieldInlineStruct}(undef, 10)
copyto!(BInlineUnion, AInlineUnion)
@test AInlineUnion == BInlineUnion
@test BInlineUnion[end] == x
CInlineUnion = vcat(AInlineUnion, BInlineUnion)
@test sizeof(CInlineUnion) == sizeof(UnionFieldInlineStruct) * 20
@test sizeof(CInlineUnion) >= sizeof(UnionFieldInlineStruct) * 20
@test CInlineUnion[end] == x
end

Expand Down