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 afeb91bbf13cf226d040aada2ffbaf981ca5cd32..aa62ad230e5cc51e95cabfaa96f6748dcc51e4f4 100644
(file)
--- a/
mono/metadata/debug-helpers.c
+++ b/
mono/metadata/debug-helpers.c
@@
-1,5
+1,5
@@
/*
/*
- *
console-io.c: ConsoleDriver internal calls
+ *
debug-helpers.c:
*
* Author:
* Mono Project (http://www.mono-project.com)
*
* Author:
* Mono Project (http://www.mono-project.com)
@@
-326,10
+326,10
@@
mono_method_desc_new (const char *name, gboolean include_namespace)
g_free (class_nspace);
return NULL;
}
g_free (class_nspace);
return NULL;
}
- *method_name++ = 0;
/* allow two :: to separate the method name */
/* allow two :: to separate the method name */
- if (*method_name == ':')
- method_name++;
+ if (method_name != class_nspace && method_name [-1] == ':')
+ method_name [-1] = 0;
+ *method_name++ = 0;
class_name = strrchr (class_nspace, '.');
if (class_name) {
*class_name++ = 0;
class_name = strrchr (class_nspace, '.');
if (class_name) {
*class_name++ = 0;
@@
-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));
@@
-1020,4
+1022,3
@@
mono_class_describe_statics (MonoClass* klass)
}
}
}
}
}
}
-