Merge pull request #809 from Unity-Technologies/unity-master-debugger-clear-types-for-assembly

Reuse class unload cache filter logic in debugger (case 974228)

case 974228 - Fix crash on exit when using script debugger

Debugger maintains it's own list of loaded classes. The unload/filter
logic does not handle composite types like arrays and generic instances.
Expose and reuse the logic from metadata that properly detects any
usage of an image within a type.

This prevents the cache from containing MonoClass values which have
already been freed by the metadata cleaning code.

Author: joncham

mono/metadata/metadata-internals.h

@@ -964,5 +964,8 @@ mono_loader_get_strict_strong_names (void);
 char*
 mono_signature_get_managed_fmt_string (MonoMethodSignature *sig);
 
+gboolean
+mono_type_in_image (MonoType *type, MonoImage *image);
+
 #endif /* __MONO_METADATA_INTERNALS_H__ */
 

mono/metadata/metadata.c

@@ -2401,6 +2401,12 @@ type_in_image (MonoType *type, MonoImage *image)
 	}
 }
 
+gboolean
+mono_type_in_image (MonoType *type, MonoImage *image)
+{
+	return type_in_image (type, image);
+}
+
 static inline void
 image_sets_lock (void)
 {

mono/mini/debugger-agent.c

@@ -8059,7 +8059,7 @@ clear_event_requests_for_assembly (MonoAssembly *assembly)
 static gboolean
 type_comes_from_assembly (gpointer klass, gpointer also_klass, gpointer assembly)
 {
-	return (mono_class_get_image ((MonoClass*)klass) == mono_assembly_get_image ((MonoAssembly*)assembly));
+	return mono_type_in_image (mono_class_get_type ((MonoClass*)klass), mono_assembly_get_image ((MonoAssembly*)assembly));
 }
 
 /*