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

Unified Diff: runtime/vm/profiler.cc

Issue 293133007: Guard against frames across pages, in the profiler. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 7 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 | runtime/vm/thread_interrupter_win.cc » ('j') | 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 de2afea156800d813254301cd5df6486242ec88a..1c6e2cc4a7fee40c976caeb15d48f9a80dbe1fd2 100644
--- a/runtime/vm/profiler.cc
+++ b/runtime/vm/profiler.cc
@@ -1687,7 +1687,7 @@ class ProfilerNativeStackWalker : public ValueObject {
// Stack pointer should not be above frame pointer.
return 1;
}
- intptr_t gap = original_fp_ - original_sp_;
+ const intptr_t gap = original_fp_ - original_sp_;
if (gap >= kMaxStep) {
// Gap between frame pointer and stack pointer is
// too large.
@@ -1698,8 +1698,19 @@ class ProfilerNativeStackWalker : public ValueObject {
// the isolates stack limit.
lower_bound_ = original_sp_;
}
- // Store the PC marker for the top frame.
- sample_->set_pc_marker(GetCurrentFramePcMarker(fp));
+#if defined(TARGET_OS_WINDOWS)
+ // If the original_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.
+ const intptr_t kPageMask = kMaxStep - 1;
+ bool safe_to_read_pc_marker = (original_fp_ & kPageMask) != 0;
+#else
+ bool safe_to_read_pc_marker = true;
+#endif
+ if (safe_to_read_pc_marker && (gap > 0)) {
+ // Store the PC marker for the top frame.
+ sample_->set_pc_marker(GetCurrentFramePcMarker(fp));
+ }
int i = 0;
for (; i < FLAG_profile_depth; i++) {
if (FLAG_profile_verify_stack_walk) {
« no previous file with comments | « no previous file | runtime/vm/thread_interrupter_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698