Skip to content

Commit 9bedae5

Browse files
Vasili Skurydzinrvagg
Vasili Skurydzin
authored andcommitted
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 <[email protected]> Reviewed-by: Michael Achenbach <[email protected]> Commit-Queue: Jakob Gruber <[email protected]> Cr-Commit-Position: refs/heads/master@{#52071} PR-URL: #23958 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Beth Griggs <[email protected]> Reviewed-By: George Adams <[email protected]>
1 parent f473d04 commit 9bedae5

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

deps/v8/include/v8-version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define V8_MAJOR_VERSION 6
1212
#define V8_MINOR_VERSION 2
1313
#define V8_BUILD_NUMBER 414
14-
#define V8_PATCH_LEVEL 72
14+
#define V8_PATCH_LEVEL 73
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

deps/v8/src/base/debug/stack_trace_posix.cc

+3-4
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ const char kMangledSymbolPrefix[] = "_Z";
7272
const char kSymbolCharacters[] =
7373
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
7474

75+
#if HAVE_EXECINFO_H
7576
// Demangles C++ symbols in the given text. Example:
7677
//
7778
// "out/Debug/base_unittests(_ZN10StackTraceC1Ev+0x20) [0x817778c]"
@@ -81,7 +82,6 @@ void DemangleSymbols(std::string* text) {
8182
// Note: code in this function is NOT async-signal safe (std::string uses
8283
// malloc internally).
8384

84-
#if HAVE_EXECINFO_H
8585

8686
std::string::size_type search_from = 0;
8787
while (search_from < text->size()) {
@@ -117,9 +117,8 @@ void DemangleSymbols(std::string* text) {
117117
search_from = mangled_start + 2;
118118
}
119119
}
120-
121-
#endif // HAVE_EXECINFO_H
122120
}
121+
#endif // HAVE_EXECINFO_H
123122

124123
class BacktraceOutputHandler {
125124
public:
@@ -129,6 +128,7 @@ class BacktraceOutputHandler {
129128
virtual ~BacktraceOutputHandler() {}
130129
};
131130

131+
#if HAVE_EXECINFO_H
132132
void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
133133
// This should be more than enough to store a 64-bit number in hex:
134134
// 16 hex digits + 1 for null-terminator.
@@ -139,7 +139,6 @@ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
139139
handler->HandleOutput(buf);
140140
}
141141

142-
#if HAVE_EXECINFO_H
143142
void ProcessBacktrace(void* const* trace, size_t size,
144143
BacktraceOutputHandler* handler) {
145144
// NOTE: This code MUST be async-signal safe (it's used by in-process

0 commit comments

Comments
 (0)