Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Unified Diff: runtime/vm/profiler.cc

Issue 451033002: Don't try to read return address from the stack of another thread on Win64. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: fixed Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/profiler.cc
diff --git a/runtime/vm/profiler.cc b/runtime/vm/profiler.cc
index 7c1980172931214b3a974397dcb171f4c6bf2244..83e2235f51636015c73abf847d78940388e50d31 100644
--- a/runtime/vm/profiler.cc
+++ b/runtime/vm/profiler.cc
@@ -1679,7 +1679,8 @@ static void SetPCMarkerIfSafe(Sample* sample) {
#if defined(TARGET_OS_WINDOWS)
// If the fp is at the beginning of a page, it may be unsafe to access
// the pc marker, because we are reading it from a different thread on
- // Windows. The next page may be a guard page.
+ // Windows. The marker is below fp and the previous page may be a guard
+ // page.
const intptr_t kPageMask = VirtualMemory::PageSize() - 1;
if ((sample->fp() & kPageMask) == 0) {
return;
@@ -2047,7 +2048,11 @@ void Profiler::RecordSampleInterruptCallback(
sample->set_user_tag(isolate->user_tag());
sample->set_sp(state.sp);
sample->set_fp(state.fp);
+#if !(defined(TARGET_OS_WINDOWS) && defined(TARGET_ARCH_X64))
+ // It is never safe to read other thread's stack unless on Win64
+ // other thread is inside Dart code.
SetPCMarkerIfSafe(sample);
+#endif
// Walk the call stack.
if (FLAG_profile_vm) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698