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.

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

ensure sub-bitfield bits are always defined [NFC] #49471

Merged
merged 1 commit into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/datatype.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ jl_datatype_t *jl_new_uninitialized_datatype(void)
t->maybe_subtype_of_cache = 1;
t->ismutationfree = 0;
t->isidentityfree = 0;
t->padding = 0;
t->name = NULL;
t->super = NULL;
t->parameters = NULL;
Expand Down
7 changes: 7 additions & 0 deletions src/julia.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ typedef struct _jl_value_t jl_value_t;
struct _jl_taggedvalue_bits {
uintptr_t gc:2;
uintptr_t in_image:1;
#ifdef _P64
uintptr_t padding:61;
#else
uintptr_t padding:29;
#endif
};

JL_EXTENSION struct _jl_taggedvalue_t {
Expand Down Expand Up @@ -555,6 +560,7 @@ typedef struct _jl_datatype_t {
uint16_t isprimitivetype:1; // whether this is declared with 'primitive type' keyword (sized, no fields, and immutable)
uint16_t ismutationfree:1; // whether any mutable memory is reachable through this type (in the type or via fields)
uint16_t isidentityfree:1; // whether this type or any object reachable through its fields has non-content-based identity
uint16_t padding:6;
} jl_datatype_t;

typedef struct _jl_vararg_t {
Expand All @@ -579,6 +585,7 @@ typedef struct _jl_binding_t {
uint8_t imported:1;
uint8_t usingfailed:1;
uint8_t deprecated:2; // 0=not deprecated, 1=renamed, 2=moved to another package
uint8_t padding:2;
} jl_binding_t;

typedef struct {
Expand Down
1 change: 1 addition & 0 deletions src/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ static jl_binding_t *new_binding(jl_module_t *mod, jl_sym_t *name)
b->imported = 0;
b->deprecated = 0;
b->usingfailed = 0;
b->padding = 0;
JL_GC_PUSH1(&b);
b->globalref = jl_new_globalref(mod, name, b);
JL_GC_POP();
Expand Down