[hot reload][debugger] Resolve field types before use (#93558)

lambdageek · thaystg · web-flow · commit 8c32e4494350 · 2023-10-19T11:04:56.000-04:00
* adding test case failing

* fixup test - expect null value, not empty string

* [debugger] resolve field types before use

* don't shadow names

* rename unused field in test

to make it more obvious that it should stay unused

---------

Co-authored-by: Thays Grazia &lt;thaystg@gmail.com&gt;
diff --git a/src/mono/mono/component/debugger-agent.c b/src/mono/mono/component/debugger-agent.c
@@ -5233,6 +5233,13 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 		nfields = 0;
 		iter = NULL;
 		while ((f = mono_class_get_fields_internal (klass, &iter))) {
+			if (G_UNLIKELY (!f->type)) {
+				ERROR_DECL(error);
+				mono_field_resolve_type (f, error);
+				mono_error_cleanup (error);
+				if (!f->type)
+					continue;
+			}
 			if (f->type->attrs & FIELD_ATTRIBUTE_STATIC)
 				continue;
 			if (mono_field_is_deleted (f))
@@ -5250,6 +5257,13 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 
 		iter = NULL;
 		while ((f = mono_class_get_fields_internal (klass, &iter))) {
+			if (G_UNLIKELY (!f->type)) {
+				ERROR_DECL(error);
+				mono_field_resolve_type (f, error);
+				mono_error_cleanup (error);
+				if (!f->type)
+					continue;
+			}
 			if (f->type->attrs & FIELD_ATTRIBUTE_STATIC)
 				continue;
 			if (mono_field_is_deleted (f))
@@ -5351,6 +5365,13 @@ decode_vtype (MonoType *t, MonoDomain *domain, gpointer void_addr, gpointer void
 
 	nfields = decode_int (buf, &buf, limit);
 	while ((f = mono_class_get_fields_internal (klass, &iter))) {
+		if (G_UNLIKELY (!f->type)) {
+			ERROR_DECL(error);
+			mono_field_resolve_type (f, error);
+			mono_error_cleanup (error);
+			if (!f->type)
+				continue;
+		}
 		if (f->type->attrs & FIELD_ATTRIBUTE_STATIC)
 			continue;
 		if (mono_field_is_deleted (f))
@@ -5459,6 +5480,13 @@ decode_vtype_compute_size (MonoType *t, MonoDomain *domain, gpointer void_buf, g
 
 	nfields = decode_int (buf, &buf, limit);
 	while ((f = mono_class_get_fields_internal (klass, &iter))) {
+		if (G_UNLIKELY (!f->type)) {
+			ERROR_DECL(error);
+			mono_field_resolve_type (f, error);
+			mono_error_cleanup (error);
+			if (!f->type)
+				continue;
+		}
 		if (f->type->attrs & FIELD_ATTRIBUTE_STATIC)
 			continue;
 		if (mono_field_is_deleted (f))
@@ -8476,6 +8504,13 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
 		buffer_add_int (buf, nfields);
 
 		while ((f = mono_class_get_fields_internal (klass, &iter))) {
+			if (G_UNLIKELY (!f->type)) {
+				ERROR_DECL(field_error);
+				mono_field_resolve_type (f, field_error);
+				mono_error_cleanup (field_error);
+				if (!f->type)
+					continue;
+			}
 			buffer_add_fieldid (buf, domain, f);
 			buffer_add_string (buf, f->name);
 			buffer_add_typeid (buf, domain, mono_class_from_mono_type_internal (f->type));
@@ -8856,6 +8891,13 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
 				int nfields = 0;
 				gpointer iter = NULL;
 				while ((f = mono_class_get_fields_internal (klass, &iter))) {
+					if (G_UNLIKELY (!f->type)) {
+						ERROR_DECL(field_error);
+						mono_field_resolve_type (f, field_error);
+						mono_error_cleanup (field_error);
+						if (!f->type)
+							continue;
+					}
 					if (f->type->attrs & FIELD_ATTRIBUTE_STATIC)
 						continue;
 					if (mono_field_is_deleted (f))
@@ -8866,6 +8908,13 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
 
 				iter = NULL;
 				while ((f = mono_class_get_fields_internal (klass, &iter))) {
+					if (G_UNLIKELY (!f->type)) {
+						ERROR_DECL(field_error);
+						mono_field_resolve_type (f, field_error);
+						mono_error_cleanup (field_error);
+						if (!f->type)
+							continue;
+					}
 					if (f->type->attrs & FIELD_ATTRIBUTE_STATIC)
 						continue;
 					if (mono_field_is_deleted (f))
diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/HotReloadTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/HotReloadTests.cs
@@ -596,7 +596,8 @@ await SendCommandAndCheck (JObject.FromObject(new { }), "Debugger.resume", scrip
                                            await CheckProps (c, new {
                                                            Field1 = TNumber(123),
                                                            Field2 = TString("spqr"),
-                                                   }, "c", num_fields: 2);
+                                                           Field3Unused = TString(null),
+                                                   }, "c", num_fields: 3);
                                        });
         }
 
diff --git a/src/mono/wasm/debugger/tests/ApplyUpdateReferencedAssembly3/MethodBody2_v2.cs b/src/mono/wasm/debugger/tests/ApplyUpdateReferencedAssembly3/MethodBody2_v2.cs
@@ -22,6 +22,7 @@ public C()
             }
             public double Field1;
             public string Field2;
+            public string Field3Unused;
         }
     }
         

Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,8 @@ await SendCommandAndCheck (JObject.FromObject(new { }), "Debugger.resume", scrip`
`596`	`596`	`await CheckProps (c, new {`
`597`	`597`	`Field1 = TNumber(123),`
`598`	`598`	`Field2 = TString("spqr"),`
`599`		`- }, "c", num_fields: 2);`
	`599`	`+ Field3Unused = TString(null),`
	`600`	`+ }, "c", num_fields: 3);`
`600`	`601`	`});`
`601`	`602`	`}`
`602`	`603`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public C()`
`22`	`22`	`}`
`23`	`23`	`public double Field1;`
`24`	`24`	`public string Field2;`
	`25`	`+ public string Field3Unused;`
`25`	`26`	`}`
`26`	`27`	`}`
`27`	`28`