Skip to content

[release/9.0-staging] [mono][debugger] Fix assertion when stepping #118459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steveisok merged 3 commits into from
Sep 4, 2025
Merged

[release/9.0-staging] [mono][debugger] Fix assertion when stepping #118459

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93a3fa4
Fix assertion when stepping
thaystg Aug 6, 2025
0c3450e
Backport of https://github.com/dotnet/runtime/pull/118542/
thaystg Aug 8, 2025
166d10e
Merge branch 'release/9.0-staging' into backport/pr-118458-to-release…
steveisok Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/mono/mono/mini/mini-arm64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4204,7 +4204,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)

arm_ldrx (code, ARMREG_IP1, info_var->inst_basereg, GTMREG_TO_INT (info_var->inst_offset));
/* Add the bp_tramp_offset */
val = ((bp_tramp_offset / 4) * sizeof (target_mgreg_t)) + MONO_STRUCT_OFFSET (SeqPointInfo, bp_addrs);
val = (bp_tramp_offset * sizeof (target_mgreg_t)) + MONO_STRUCT_OFFSET (SeqPointInfo, bp_addrs);
/* Load the info->bp_addrs [bp_tramp_offset], which is either 0 or the address of the bp trampoline */
code = emit_ldrx (code, ARMREG_IP1, ARMREG_IP1, val);
/* Skip the load if its 0 */
Expand Down Expand Up @@ -6873,9 +6873,7 @@ mono_arch_set_breakpoint (MonoJitInfo *ji, guint8 *ip)

if (enable_ptrauth)
NOT_IMPLEMENTED;
g_assert (native_offset % 4 == 0);
g_assert (info->bp_addrs [native_offset / 4] == 0);
info->bp_addrs [native_offset / 4] = (guint8*)mini_get_breakpoint_trampoline ();
info->bp_addrs [native_offset] = (guint8*)mini_get_breakpoint_trampoline ();
} else {
/* ip points to an ldrx */
code += 4;
Expand All @@ -6898,8 +6896,7 @@ mono_arch_clear_breakpoint (MonoJitInfo *ji, guint8 *ip)
if (enable_ptrauth)
NOT_IMPLEMENTED;

g_assert (native_offset % 4 == 0);
info->bp_addrs [native_offset / 4] = NULL;
info->bp_addrs [native_offset] = NULL;
} else {
/* ip points to an ldrx */
code += 4;
Expand Down
Loading
⚡