Commit 9bedae5
deps: cherry-pick 6bc4bfe from V8 upstream
Only changes to src/base/debug/stack_trace_posix.cc included
Original commit message:
Fixes to V8 GN build process on aix platform
src/base/debug/stack_trace_posix.cc: suppressed unused function warnings
for functions DemangleSymbols, OutputPointer(in order to compile with
-Werror flag)
test/cctest/test-isolate-independent-builtins.cc: corrections to make
ByteInText test case compatible with aix. (affects aix only)
Change-Id: I49e45e63545404c77aaed3f51b26557f6f03455e
Reviewed-on: https://chromium-review.googlesource.com/927484
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Jakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52071}
PR-URL: #23958
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: George Adams <george.adams@uk.ibm.com>1 parent f473d04 commit 9bedae5
2 files changed
Lines changed: 4 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11,7 +11,7 @@ | |||
| 11 | 11 | #define V8_MAJOR_VERSION 6 | |
| 12 | 12 | #define V8_MINOR_VERSION 2 | |
| 13 | 13 | #define V8_BUILD_NUMBER 414 | |
| 14 | - #define V8_PATCH_LEVEL 72 | ||
| 14 | + #define V8_PATCH_LEVEL 73 | ||
| 15 | 15 | ||
| 16 | 16 | // Use 1 for candidates and 0 otherwise. | |
| 17 | 17 | // (Boolean macro values are not supported by all preprocessors.) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -72,6 +72,7 @@ const char kMangledSymbolPrefix[] = "_Z"; | |||
| 72 | 72 | const char kSymbolCharacters[] = | |
| 73 | 73 | "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"; | |
| 74 | 74 | ||
| 75 | + #if HAVE_EXECINFO_H | ||
| 75 | 76 | // Demangles C++ symbols in the given text. Example: | |
| 76 | 77 | // | |
| 77 | 78 | // "out/Debug/base_unittests(_ZN10StackTraceC1Ev+0x20) [0x817778c]" | |
@@ -81,7 +82,6 @@ void DemangleSymbols(std::string* text) { | |||
| 81 | 82 | // Note: code in this function is NOT async-signal safe (std::string uses | |
| 82 | 83 | // malloc internally). | |
| 83 | 84 | ||
| 84 | - #if HAVE_EXECINFO_H | ||
| 85 | 85 | ||
| 86 | 86 | std::string::size_type search_from = 0; | |
| 87 | 87 | while (search_from < text->size()) { | |
@@ -117,9 +117,8 @@ void DemangleSymbols(std::string* text) { | |||
| 117 | 117 | search_from = mangled_start + 2; | |
| 118 | 118 | } | |
| 119 | 119 | } | |
| 120 | - | ||
| 121 | - #endif // HAVE_EXECINFO_H | ||
| 122 | 120 | } | |
| 121 | + #endif // HAVE_EXECINFO_H | ||
| 123 | 122 | ||
| 124 | 123 | class BacktraceOutputHandler { | |
| 125 | 124 | public: | |
@@ -129,6 +128,7 @@ class BacktraceOutputHandler { | |||
| 129 | 128 | virtual ~BacktraceOutputHandler() {} | |
| 130 | 129 | }; | |
| 131 | 130 | ||
| 131 | + #if HAVE_EXECINFO_H | ||
| 132 | 132 | void OutputPointer(void* pointer, BacktraceOutputHandler* handler) { | |
| 133 | 133 | // This should be more than enough to store a 64-bit number in hex: | |
| 134 | 134 | // 16 hex digits + 1 for null-terminator. | |
@@ -139,7 +139,6 @@ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) { | |||
| 139 | 139 | handler->HandleOutput(buf); | |
| 140 | 140 | } | |
| 141 | 141 | ||
| 142 | - #if HAVE_EXECINFO_H | ||
| 143 | 142 | void ProcessBacktrace(void* const* trace, size_t size, | |
| 144 | 143 | BacktraceOutputHandler* handler) { | |
| 145 | 144 | // NOTE: This code MUST be async-signal safe (it's used by in-process | |
0 commit comments