Chromium Code Reviews| Index: base/debug/stack_trace_unittest.cc |
| diff --git a/base/debug/stack_trace_unittest.cc b/base/debug/stack_trace_unittest.cc |
| index 560dc1ddde8dc5ee7dd42e62b0e0e296ad5a5ac4..a2105e7327f3a9bbf75a4cb01514cdc38faf4e55 100644 |
| --- a/base/debug/stack_trace_unittest.cc |
| +++ b/base/debug/stack_trace_unittest.cc |
| @@ -254,8 +254,10 @@ TEST_F(StackTraceTest, itoa_r) { |
| } |
| #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 build with frame pointer, and MSVC doesn't |
|
dcheng
2017/03/14 07:22:42
Nit: build->built
|
| +// provide intrinsics to query the frame pointer even for 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 @@ TEST_F(StackTraceTest, MAYBE_StackEnd) { |
| EXPECT_NE(0u, GetStackEnd()); |
| } |
| -#endif // HAVE_TRACE_STACK_FRAME_POINTERS |
| +#endif // HAVE_TRACE_STACK_FRAME_POINTERS && !defined(OS_WIN) |
| } // namespace debug |
| } // namespace base |