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

datatype: reorganize layout calculation code #33724

Merged
merged 3 commits into from
Nov 18, 2019
Merged

datatype: reorganize layout calculation code #33724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7600b14
datatype: reorder layout computation [NFCI]
vtjnash Oct 30, 2019
b7d5328
datatype: fix memory leak in layout of non-concrete types
vtjnash Oct 30, 2019
4e0d353
datatype: generalize the format used for isptr handling
carnaval Nov 1, 2019
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: 5 additions & 5 deletions base/reflection.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,10 @@ datatype_fieldtypes(x::DataType) = ccall(:jl_get_fieldtypes, Any, (Any,), x)

struct DataTypeLayout
nfields::UInt32
npointers::UInt32
alignment::UInt32
# alignment : 28;
# alignment : 9;
# haspadding : 1;
# pointerfree : 1;
# fielddesc_type : 2;
end

Expand Down Expand Up @@ -380,8 +380,8 @@ Can be called on any `isconcretetype`.
function datatype_pointerfree(dt::DataType)
@_pure_meta
dt.layout == C_NULL && throw(UndefRefError())
alignment = unsafe_load(convert(Ptr{DataTypeLayout}, dt.layout)).alignment
return (alignment >> 10) & 0xFFFFF == 0
npointers = unsafe_load(convert(Ptr{DataTypeLayout}, dt.layout)).npointers
return npointers == 0
end

"""
Expand All @@ -397,7 +397,7 @@ function datatype_fielddesc_type(dt::DataType)
@_pure_meta
dt.layout == C_NULL && throw(UndefRefError())
alignment = unsafe_load(convert(Ptr{DataTypeLayout}, dt.layout)).alignment
return (alignment >> 30) & 3
return (alignment >> 10) & 3
end

"""
Expand Down
Loading