Skip to content

Commit 559011c

Browse files
authored
[debugger] Fix debugging after hot reloading (#55599)
* Fix deug after hotreload. * do not change mono.proj * fix formatting. * Remove extra space.
1 parent 21e36e8 commit 559011c

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/mono/mono/metadata/mono-debug.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,8 +1120,12 @@ mono_debug_get_seq_points (MonoDebugMethodInfo *minfo, char **source_file, GPtrA
11201120
if (img->has_updates) {
11211121
int idx = mono_metadata_token_index (minfo->method->token);
11221122
gpointer ptr = mono_metadata_update_get_updated_method_ppdb (img, idx);
1123-
mono_ppdb_get_seq_points_enc (ptr, seq_points, n_seq_points);
1124-
} else if (minfo->handle->ppdb)
1123+
if (ptr != NULL) {
1124+
mono_ppdb_get_seq_points_enc (ptr, seq_points, n_seq_points);
1125+
return;
1126+
}
1127+
}
1128+
if (minfo->handle->ppdb)
11251129
mono_ppdb_get_seq_points (minfo, source_file, source_file_list, source_files, seq_points, n_seq_points);
11261130
else
11271131
mono_debug_symfile_get_seq_points (minfo, source_file, source_file_list, source_files, seq_points, n_seq_points);

src/mono/mono/mini/interp/transform.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9757,7 +9757,10 @@ mono_interp_transform_method (InterpMethod *imethod, ThreadContext *context, Mon
97579757

97589758
MonoJitMemoryManager *jit_mm = get_default_jit_mm ();
97599759
jit_mm_lock (jit_mm);
9760-
g_hash_table_replace (jit_mm->seq_points, imethod->method, imethod->jinfo->seq_points);
9760+
gpointer seq_points = g_hash_table_lookup (jit_mm->seq_points, imethod->method);
9761+
if (!seq_points || seq_points != imethod->jinfo->seq_points)
9762+
g_hash_table_replace (jit_mm->seq_points, imethod->method, imethod->jinfo->seq_points);
9763+
97619764
jit_mm_unlock (jit_mm);
97629765

97639766
// FIXME: Add a different callback ?

0 commit comments

Comments
 (0)