| Index: base/debug/stack_trace.h
|
| diff --git a/base/debug/stack_trace.h b/base/debug/stack_trace.h
|
| index ab1d2ebe6a3c00244b5d09cb1e4fcadce16ab093..5796f560d374c240f1d8026a96e08b30b8c9a7fd 100644
|
| --- a/base/debug/stack_trace.h
|
| +++ b/base/debug/stack_trace.h
|
| @@ -11,6 +11,7 @@
|
| #include <string>
|
|
|
| #include "base/base_export.h"
|
| +#include "base/debug/debugging_flags.h"
|
| #include "base/macros.h"
|
| #include "build/build_config.h"
|
|
|
| @@ -23,24 +24,6 @@ struct _EXCEPTION_POINTERS;
|
| struct _CONTEXT;
|
| #endif
|
|
|
| -// TODO(699863): Clean up HAVE_TRACE_STACK_FRAME_POINTERS.
|
| -#if defined(OS_POSIX)
|
| -
|
| -#if defined(__i386__) || defined(__x86_64__)
|
| -#define HAVE_TRACE_STACK_FRAME_POINTERS 1
|
| -#elif defined(__arm__) && !defined(__thumb__)
|
| -#define HAVE_TRACE_STACK_FRAME_POINTERS 1
|
| -#else // defined(__arm__) && !defined(__thumb__)
|
| -#define HAVE_TRACE_STACK_FRAME_POINTERS 0
|
| -#endif // defined(__arm__) && !defined(__thumb__)
|
| -
|
| -#elif defined(OS_WIN)
|
| -#define HAVE_TRACE_STACK_FRAME_POINTERS 1
|
| -
|
| -#else // defined(OS_WIN)
|
| -#define HAVE_TRACE_STACK_FRAME_POINTERS 0
|
| -#endif // defined(OS_WIN)
|
| -
|
| namespace base {
|
| namespace debug {
|
|
|
| @@ -56,7 +39,7 @@ namespace debug {
|
| BASE_EXPORT bool EnableInProcessStackDumping();
|
|
|
| // Returns end of the stack, or 0 if we couldn't get it.
|
| -#if HAVE_TRACE_STACK_FRAME_POINTERS
|
| +#if BUILDFLAG(CAN_UNWIND_WITH_FRAME_POINTERS)
|
| BASE_EXPORT uintptr_t GetStackEnd();
|
| #endif
|
|
|
| @@ -119,7 +102,7 @@ class BASE_EXPORT StackTrace {
|
| size_t count_;
|
| };
|
|
|
| -#if HAVE_TRACE_STACK_FRAME_POINTERS
|
| +#if BUILDFLAG(CAN_UNWIND_WITH_FRAME_POINTERS)
|
| // Traces the stack by using frame pointers. This function is faster but less
|
| // reliable than StackTrace. It should work for debug and profiling builds,
|
| // but not for release builds (although there are some exceptions).
|
| @@ -184,7 +167,7 @@ class BASE_EXPORT ScopedStackFrameLinker {
|
| };
|
| #endif // !defined(OS_WIN)
|
|
|
| -#endif // HAVE_TRACE_STACK_FRAME_POINTERS
|
| +#endif // BUILDFLAG(CAN_UNWIND_WITH_FRAME_POINTERS)
|
|
|
| namespace internal {
|
|
|
|
|