Skip to content

Type-assert DataType.layout in some Base functions #59886

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

Merged
merged 4 commits into from
Oct 20, 2025
Merged

Type-assert DataType.layout in some Base functions #59886

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f11fe81
Type-assert `DataType.layout` in some Base functions
JamesWrigley Oct 18, 2025
3e723b5
Merge branch 'master' into ptr-invalidations
DilumAluthge Oct 18, 2025
b572338
Update base/runtime_internals.jl
JamesWrigley Oct 20, 2025
540a58a
Update base/runtime_internals.jl
JamesWrigley Oct 20, 2025
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
10 changes: 6 additions & 4 deletions base/runtime_internals.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,9 @@ alignment of the elements, not the whole object.
"""
function datatype_alignment(dt::DataType)
@_foldable_meta
dt.layout == C_NULL && throw(UndefRefError())
alignment = unsafe_load(convert(Ptr{DataTypeLayout}, dt.layout)).alignment
layout = dt.layout::Ptr{Cvoid}
layout == C_NULL && throw(UndefRefError())
alignment = unsafe_load(convert(Ptr{DataTypeLayout}, layout)).alignment
return Int(alignment)
end

Expand Down Expand Up @@ -664,8 +665,9 @@ Return the number of pointers in the layout of a datatype.
"""
function datatype_npointers(dt::DataType)
@_foldable_meta
dt.layout == C_NULL && throw(UndefRefError())
return unsafe_load(convert(Ptr{DataTypeLayout}, dt.layout)).npointers
layout = dt.layout::Ptr{Cvoid}
layout == C_NULL && throw(UndefRefError())
return unsafe_load(convert(Ptr{DataTypeLayout}, layout)).npointers
end

"""
Expand Down