Emit a null check when loading valuetype fields (#1866)

Co-authored-by: Bill Holmes <bill.holmes@unity3d.com>
Unity-Technologies · Oct 24, 2023 · 2d3b912 · 2d3b912
1 parent 705cdd8
commit 2d3b912
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
@@ -9745,7 +9745,9 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 				} else {
 					MonoInst *load;
 
-					MONO_EMIT_NULL_CHECK (cfg, sp [0]->dreg, foffset > mono_target_pagesize ());
+					// We may call a copy / wbarrier function which doesn't do null checks; 
+					// passing MONO_TYPE_ISSTRUCT to macro so that we emit the null check when accessing fields that are structs */
+					MONO_EMIT_NULL_CHECK (cfg, sp [0]->dreg, foffset > mono_target_pagesize () || MONO_TYPE_ISSTRUCT(field->type));
 
 #ifdef MONO_ARCH_SIMD_INTRINSICS
 					if (sp [0]->opcode == OP_LDADDR && m_class_is_simd_type (klass) && cfg->opt & MONO_OPT_SIMD) {