projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[gc] Fix gc bitmap for array of pointers. They don't contain references
[mono.git]
/
mono
/
metadata
/
debug-helpers.c
diff --git
a/mono/metadata/debug-helpers.c
b/mono/metadata/debug-helpers.c
index f38a054125710fab5281f9e0facb68b7aa1e5e4f..aa62ad230e5cc51e95cabfaa96f6748dcc51e4f4 100644
(file)
--- a/
mono/metadata/debug-helpers.c
+++ b/
mono/metadata/debug-helpers.c
@@
-468,6
+468,8
@@
match_class (MonoMethodDesc *desc, int pos, MonoClass *klass)
gboolean
mono_method_desc_full_match (MonoMethodDesc *desc, MonoMethod *method)
{
gboolean
mono_method_desc_full_match (MonoMethodDesc *desc, MonoMethod *method)
{
+ if (!desc->klass)
+ return FALSE;
if (!match_class (desc, strlen (desc->klass), method->klass))
return FALSE;
if (!match_class (desc, strlen (desc->klass), method->klass))
return FALSE;
@@
-573,7
+575,7
@@
dis_one (GString *str, MonoDisHelper *dh, MonoMethod *method, const unsigned cha
size_t len2;
char *blob2 = NULL;
size_t len2;
char *blob2 = NULL;
- if (!
method->klass->image->dynamic
) {
+ if (!
image_is_dynamic (method->klass->image) && !method_is_dynamic (method)
) {
token = read32 (ip);
blob = mono_metadata_user_string (method->klass->image, mono_metadata_token_index (token));
token = read32 (ip);
blob = mono_metadata_user_string (method->klass->image, mono_metadata_token_index (token));