2004-01-23 Zoltan Varga <vargaz@freemail.hu>

	* profiler.c (merge_methods): Fix merging of profile info. Fixes #53010.

svn path=/trunk/mono/; revision=22431

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index ba9d70f13c9bc91faa29e0d01c7d82700515313b..ad74edb751300e2b2f234b2ab83f8665b44e6f38 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,5 +1,7 @@
 2004-01-23  Zoltan Varga  <vargaz@freemail.hu>
 
+       * profiler.c (merge_methods): Fix merging of profile info. Fixes #53010.
+
        * loader.c (mono_lookup_pinvoke_call): Strip .dll from library names.
        Fixes #22532.
 

diff --git a/mono/metadata/profiler.c b/mono/metadata/profiler.c
index 5ab26dd6c6c61bf940d5fa5ae09a4dc673c88831..7bbdee0ef9e672778f4b6a516b990b1f372998d7 100644 (file)
--- a/mono/metadata/profiler.c
+++ b/mono/metadata/profiler.c
@@ -806,7 +806,7 @@ merge_methods (MonoMethod *method, MethodProfile *profile, MonoProfiler *prof)
        MethodProfile *mprof;
        AllocInfo *talloc_info, *alloc_info;
        CallerInfo *tcaller_info, *caller_info;
-       
+
        mprof = g_hash_table_lookup (prof->methods, method);
        if (!mprof) {
                /* the master thread didn't see this method, just transfer the info as is */
@@ -848,7 +848,7 @@ merge_methods (MonoMethod *method, MethodProfile *profile, MonoProfiler *prof)
                        caller_info = mono_mempool_alloc0 (prof->mempool, sizeof (CallerInfo));
                        *caller_info = *tcaller_info;
                        caller_info->next = mprof->caller_info;
-                       mprof->caller_info = caller_info->next;
+                       mprof->caller_info = caller_info;
                }
        }
 }