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

Unified Diff: base/debug/stack_trace_unittest.cc

Issue 2790443002: Revert of Cleaner fall-back stack capture for --enable-heap-profiling=native. (Closed)
Patch Set: Created 3 years, 9 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 | « base/debug/stack_trace.cc ('k') | base/trace_event/heap_profiler_allocation_context_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/debug/stack_trace_unittest.cc
diff --git a/base/debug/stack_trace_unittest.cc b/base/debug/stack_trace_unittest.cc
index bbcf388376a602733519d3100cdeb761ffb3bcce..79b0cb84055ecd04311ad45425e71ff82214f387 100644
--- a/base/debug/stack_trace_unittest.cc
+++ b/base/debug/stack_trace_unittest.cc
@@ -254,8 +254,10 @@
}
#endif // defined(OS_POSIX) && !defined(OS_ANDROID)
-#if HAVE_TRACE_STACK_FRAME_POINTERS
-
+#if HAVE_TRACE_STACK_FRAME_POINTERS && !defined(OS_WIN)
+// Windows x64 binaries cannot be built with frame pointer, and MSVC doesn't
+// provide intrinsics to query the frame pointer even for the x86 build, nor
+// does it allow us to take the address of labels, so skip these under Windows.
template <size_t Depth>
void NOINLINE ExpectStackFramePointers(const void** frames,
size_t max_depth) {
@@ -313,7 +315,7 @@
EXPECT_NE(0u, GetStackEnd());
}
-#endif // HAVE_TRACE_STACK_FRAME_POINTERS
+#endif // HAVE_TRACE_STACK_FRAME_POINTERS && !defined(OS_WIN)
} // namespace debug
} // namespace base
« no previous file with comments | « base/debug/stack_trace.cc ('k') | base/trace_event/heap_profiler_allocation_context_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698