diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2004-10-15 03:21:44 +0400 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2004-10-15 03:21:44 +0400 |
| commit | 51f5800c2dfaea59325338e13d51c82fe644c23f (patch) | |
| tree | d4d3ccb1015dcaf0947582a425d8e89709848add | |
| parent | e415b219de4c399a2760a572204995dd915b6574 (diff) | |
Merge from HEAD.
svn path=/branches/mono-1-0/mono/; revision=35015
| -rw-r--r-- | mono/mini/ChangeLog | 5 | ||||
| -rw-r--r-- | mono/mini/trace.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 8e09b509dbc..8fdbc8ea14f 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,8 @@ +2004-10-15 Zoltan Varga <vargaz@freemail.hu> + + * trace.c (mono_trace_eval): Use mono_method_desc_full_match. Fixes + #68388. + 2004-09-17 Zoltan Varga <vargaz@freemail.hu> * mini.c (mono_method_to_ir): Fix LDSTR in dynamic methods. Fixes #66132. diff --git a/mono/mini/trace.c b/mono/mini/trace.c index 49c9d86d636..1a687005faf 100644 --- a/mono/mini/trace.c +++ b/mono/mini/trace.c @@ -36,7 +36,7 @@ mono_trace_eval (MonoMethod *method) if (method->klass->image == mono_assembly_get_image (trace_spec.assembly)) inc = 1; break; case MONO_TRACEOP_METHOD: - if (mono_method_desc_match ((MonoMethodDesc *) op->data, method)) + if (mono_method_desc_full_match ((MonoMethodDesc *) op->data, method)) inc = 1; break; case MONO_TRACEOP_CLASS: if (strcmp (method->klass->name_space, op->data) == 0) |