Merge pull request #999 from Unity-Technologies/unity-master-fix-get-offset-initialization

mderoy · web-flow · commit 2682b1eb2a41 · 2018-08-13T10:49:44.000-04:00
Fix issue where get offset could return 0 when the type is uninited
diff --git a/mono/metadata/class.c b/mono/metadata/class.c
@@ -9685,6 +9685,7 @@ mono_field_get_flags (MonoClassField *field)
 guint32
 mono_field_get_offset (MonoClassField *field)
 {
+	mono_class_setup_fields(field->parent);
 	return field->offset;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9685,6 +9685,7 @@ mono_field_get_flags (MonoClassField *field)`
`9685`	`9685`	`guint32`
`9686`	`9686`	`mono_field_get_offset (MonoClassField *field)`
`9687`	`9687`	`{`
	`9688`	`+ mono_class_setup_fields(field->parent);`
`9688`	`9689`	`return field->offset;`
`9689`	`9690`	`}`
`9690`	`9691`