Skip to content

[release/6.0-rc1] [mono][debugger] Fix watch of local variable values #57787

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

[release/6.0-rc1] [mono][debugger] Fix watch of local variable values #57787

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
704c3c7
Fix xamarin-android 6161
thaystg Aug 19, 2021
c296b5c
Fixing leak.
thaystg Aug 19, 2021
b8472b4
Adding wasm debugger test. Fixing using protocol version.
thaystg Aug 19, 2021
8bd038d
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
only get locals in older protocol versions.
  • Loading branch information
@thaystg
thaystg authored and github-actions committed Aug 19, 2021
commit 8bd038dad0e0278f09261bd60c4ce58d270a26f0
24 changes: 10 additions & 14 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 @@ -9289,16 +9289,14 @@ frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
pos = - pos - 1;
cmd_stack_frame_get_parameter (frame, sig, pos, buf, jit);
} else {
MonoDebugLocalsInfo *locals;

locals = mono_debug_lookup_locals (frame->de.method);
if (locals) {
if (!CHECK_PROTOCOL_VERSION (2, 59)) //from newer protocol versions it's sent the pdb index
{
if (!CHECK_PROTOCOL_VERSION (2, 59)) { //from newer protocol versions it's sent the pdb index
MonoDebugLocalsInfo *locals;
locals = mono_debug_lookup_locals (frame->de.method);
if (locals) {
g_assert (pos < locals->num_locals);
pos = locals->locals [pos].index;
mono_debug_free_locals (locals);
}
mono_debug_free_locals (locals);
}

PRINT_DEBUG_MSG (4, "[dbg] send local %d.\n", pos);
Expand Down Expand Up @@ -9346,16 +9344,14 @@ frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
var = &jit->params [pos];
is_arg = TRUE;
} else {
MonoDebugLocalsInfo *locals;

locals = mono_debug_lookup_locals (frame->de.method);
if (locals) {
if (!CHECK_PROTOCOL_VERSION (2, 59)) //from newer protocol versions it's sent the pdb index
{
if (!CHECK_PROTOCOL_VERSION (2, 59)) { //from newer protocol versions it's sent the pdb index
MonoDebugLocalsInfo *locals;
locals = mono_debug_lookup_locals (frame->de.method);
if (locals) {
g_assert (pos < locals->num_locals);
pos = locals->locals [pos].index;
mono_debug_free_locals (locals);
}
mono_debug_free_locals (locals);
}
g_assert (pos >= 0 && pos < jit->num_locals);

Expand Down