Skip to content

[mono][debugger] Fix watch of local variable values #57771

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
thaystg merged 4 commits into from
Aug 20, 2021
Merged

[mono][debugger] Fix watch of local variable values #57771

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cad71d
Fix xamarin-android 6161
thaystg Aug 19, 2021
11b8986
Fixing leak.
thaystg Aug 19, 2021
ebc6bf4
Adding wasm debugger test.
thaystg Aug 19, 2021
0fa0251
only get locals in older protocol versions.
thaystg Aug 19, 2021
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
Prev Previous commit
Next Next commit
Fixing leak.
  • Loading branch information
@thaystg
thaystg committed Aug 19, 2021
commit 11b8986a46f4375248483b408c3037df44d812b8
18 changes: 12 additions & 6 deletions src/mono/mono/component/debugger-agent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9285,9 +9285,12 @@ frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
MonoDebugLocalsInfo *locals;

locals = mono_debug_lookup_locals (frame->de.method);
if (locals && CHECK_ICORDBG (FALSE)) { //on icordbg the index value is correct, we don't need to fix it.
g_assert (pos < locals->num_locals);
pos = locals->locals [pos].index;
if (locals) {
if (CHECK_ICORDBG (FALSE)) //on icordbg the index value is correct, we don't need to fix it.
{
g_assert (pos < locals->num_locals);
pos = locals->locals [pos].index;
}
mono_debug_free_locals (locals);
}

Expand Down Expand Up @@ -9339,9 +9342,12 @@ frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
MonoDebugLocalsInfo *locals;

locals = mono_debug_lookup_locals (frame->de.method);
if (locals && CHECK_ICORDBG (FALSE)) {
g_assert (pos < locals->num_locals);
pos = locals->locals [pos].index;
if (locals) {
if (CHECK_ICORDBG (FALSE))
{
g_assert (pos < locals->num_locals);
pos = locals->locals [pos].index;
}
mono_debug_free_locals (locals);
}
g_assert (pos >= 0 && pos < jit->num_locals);
Expand Down