From 51d83d5c4ba2fdd3a2399b96425d5cbd7f57d028 Mon Sep 17 00:00:00 2001
From: Jameson Nash <vtjnash@gmail.com>
Date: Mon, 24 Apr 2023 18:44:36 -0400
Subject: [PATCH] ensure sub-bitfield bits are always defined (#49471)

Helps avoid UB or inconsistencies between Julia and C definitions.
---
 src/datatype.c | 1 +
 src/julia.h    | 7 +++++++
 src/module.c   | 1 +
 3 files changed, 9 insertions(+)

diff --git a/src/datatype.c b/src/datatype.c
index db334c7343d80e..d500d762999a36 100644
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -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;
diff --git a/src/julia.h b/src/julia.h
index 216628c9aebdcf..e1032f6ac31114 100644
--- a/src/julia.h
+++ b/src/julia.h
@@ -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 {
@@ -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 {
@@ -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 {
diff --git a/src/module.c b/src/module.c
index a232c6e9f83672..4ac0d48a6f9e00 100644
--- a/src/module.c
+++ b/src/module.c
@@ -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();