projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5567 from kumpera/fix_59334
[mono.git]
/
mono
/
mini
/
debugger-agent.c
diff --git
a/mono/mini/debugger-agent.c
b/mono/mini/debugger-agent.c
index 4a2637c1943e4339c4aaca8a2762a8a538012405..29f94ba1e06e0b4870e9d4bda438e4ab39a9718d 100644
(file)
--- a/
mono/mini/debugger-agent.c
+++ b/
mono/mini/debugger-agent.c
@@
-2670,7
+2670,7
@@
thread_interrupt (DebuggerTlsData *tls, MonoThreadInfo *info, MonoJitInfo *ji)
}
copy_unwind_state_from_frame_data (&tls->async_state, &data, jit_tls);
}
copy_unwind_state_from_frame_data (&tls->async_state, &data, jit_tls);
- copy_unwind_state_from_frame_data (&tls->context, &data, jit_tls);
+ /* Don't set tls->context, it could race with the thread processing a breakpoint etc. */
} else {
tls->async_state.valid = FALSE;
}
} else {
tls->async_state.valid = FALSE;
}
@@
-7691,7
+7691,7
@@
vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
tls->abort_requested = TRUE;
tls->abort_requested = TRUE;
- mono_thread_internal_abort (THREAD_TO_INTERNAL (thread));
+ mono_thread_internal_abort (THREAD_TO_INTERNAL (thread)
, FALSE
);
mono_loader_unlock ();
break;
}
mono_loader_unlock ();
break;
}