make fieldtype computation stable/pure

vtjnash · DilumAluthge · commit 99bdd00183d7 · 2022-03-22T10:26:59.000-04:00
diff --git a/src/datatype.c b/src/datatype.c
@@ -1788,9 +1788,9 @@ JL_DLLEXPORT int jl_field_isdefined(jl_value_t *v, size_t i) JL_NOTSAFEPOINT
     return fval != NULL ? 1 : 0;
 }
 
-JL_DLLEXPORT size_t jl_get_field_offset(jl_datatype_t *ty, int field) JL_NOTSAFEPOINT
+JL_DLLEXPORT size_t jl_get_field_offset(jl_datatype_t *ty, int field)
 {
-    if (ty->layout == NULL || field > jl_datatype_nfields(ty) || field < 1)
+    if (!jl_struct_try_layout(ty) || field > jl_datatype_nfields(ty) || field < 1)
         jl_bounds_error_int((jl_value_t*)ty, field);
     return jl_field_offset(ty, field - 1);
 }
diff --git a/src/jl_exported_funcs.inc b/src/jl_exported_funcs.inc
@@ -214,7 +214,6 @@
     XX(jl_get_excstack) \
     XX(jl_get_fenv_consts) \
     XX(jl_get_field) \
-    XX(jl_get_field_offset) \
     XX(jl_get_global) \
     XX(jl_get_image_file) \
     XX(jl_get_JIT) \

Original file line number	Diff line number	Diff line change
`@@ -1788,9 +1788,9 @@ JL_DLLEXPORT int jl_field_isdefined(jl_value_t *v, size_t i) JL_NOTSAFEPOINT`
`1788`	`1788`	`return fval != NULL ? 1 : 0;`
`1789`	`1789`	`}`
`1790`	`1790`
`1791`		`-JL_DLLEXPORT size_t jl_get_field_offset(jl_datatype_t *ty, int field) JL_NOTSAFEPOINT`
	`1791`	`+JL_DLLEXPORT size_t jl_get_field_offset(jl_datatype_t *ty, int field)`
`1792`	`1792`	`{`
`1793`		`- if (ty->layout == NULL \|\| field > jl_datatype_nfields(ty) \|\| field < 1)`
	`1793`	`+ if (!jl_struct_try_layout(ty) \|\| field > jl_datatype_nfields(ty) \|\| field < 1)`
`1794`	`1794`	`jl_bounds_error_int((jl_value_t*)ty, field);`
`1795`	`1795`	`return jl_field_offset(ty, field - 1);`
`1796`	`1796`	`}`