Chromium Code Reviews| Index: base/debug/stack_trace.h |
| diff --git a/base/debug/stack_trace.h b/base/debug/stack_trace.h |
| index 4c9b73e87d61bca3db0965dda59bc46ca162d857..f4041d7d6eee2cb0872bf005b7fdefb1702e01aa 100644 |
| --- a/base/debug/stack_trace.h |
| +++ b/base/debug/stack_trace.h |
| @@ -23,9 +23,10 @@ struct _EXCEPTION_POINTERS; |
| struct _CONTEXT; |
| #endif |
| -#if defined(OS_POSIX) && ( \ |
| - defined(__i386__) || defined(__x86_64__) || \ |
| - (defined(__arm__) && !defined(__thumb__))) |
| +// TODO(699863): Clean up HAVE_TRACE_STACK_FRAME_POINTERS. |
| +#if (defined(OS_POSIX) && (defined(__i386__) || defined(__x86_64__) || \ |
| + (defined(__arm__) && !defined(__thumb__)))) || \ |
| + defined(OS_WIN) |
|
dcheng
2017/03/13 02:11:21
Nit: this condition is getting pretty hard to read
Wez
2017/03/14 05:22:39
Done, although I'm keeping the TODO because I woul
|
| #define HAVE_TRACE_STACK_FRAME_POINTERS 1 |
| #else |
| #define HAVE_TRACE_STACK_FRAME_POINTERS 0 |
| @@ -122,6 +123,7 @@ BASE_EXPORT size_t TraceStackFramePointers(const void** out_trace, |
| size_t max_depth, |
| size_t skip_initial); |
| +#if !defined(OS_WIN) |
| // Links stack frame |fp| to |parent_fp|, so that during stack unwinding |
| // TraceStackFramePointers() visits |parent_fp| after visiting |fp|. |
| // Both frame pointers must come from __builtin_frame_address(). |
| @@ -171,6 +173,7 @@ class BASE_EXPORT ScopedStackFrameLinker { |
| DISALLOW_COPY_AND_ASSIGN(ScopedStackFrameLinker); |
| }; |
| +#endif // !defined(OS_WIN) |
| #endif // HAVE_TRACE_STACK_FRAME_POINTERS |