Title: [257457] releases/WebKitGTK/webkit-2.28/Source/WTF
- Revision
- 257457
- Author
- [email protected]
- Date
- 2020-02-26 02:58:16 -0800 (Wed, 26 Feb 2020)
Log Message
Merge r257298 - [Linux] StackTrace symbols are not demangled
https://bugs.webkit.org/show_bug.cgi?id=207933
Reviewed by Yusuke Suzuki.
Demangle symbols provided by backtrace_symbols.
* wtf/StackTrace.cpp:
(WTF::StackTrace::dump const):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WTF/ChangeLog (257456 => 257457)
--- releases/WebKitGTK/webkit-2.28/Source/WTF/ChangeLog 2020-02-26 10:58:13 UTC (rev 257456)
+++ releases/WebKitGTK/webkit-2.28/Source/WTF/ChangeLog 2020-02-26 10:58:16 UTC (rev 257457)
@@ -1,3 +1,15 @@
+2020-02-25 Philippe Normand <[email protected]>
+
+ [Linux] StackTrace symbols are not demangled
+ https://bugs.webkit.org/show_bug.cgi?id=207933
+
+ Reviewed by Yusuke Suzuki.
+
+ Demangle symbols provided by backtrace_symbols.
+
+ * wtf/StackTrace.cpp:
+ (WTF::StackTrace::dump const):
+
2020-02-14 Alex Christensen <[email protected]>
Allow UIDNAInfo.errors from uidna_nameToUnicode that would not cause URL parsing failures
Modified: releases/WebKitGTK/webkit-2.28/Source/WTF/wtf/StackTrace.cpp (257456 => 257457)
--- releases/WebKitGTK/webkit-2.28/Source/WTF/wtf/StackTrace.cpp 2020-02-26 10:58:13 UTC (rev 257456)
+++ releases/WebKitGTK/webkit-2.28/Source/WTF/wtf/StackTrace.cpp 2020-02-26 10:58:16 UTC (rev 257457)
@@ -130,16 +130,15 @@
const char* cxaDemangled = nullptr;
#if HAVE(BACKTRACE_SYMBOLS)
mangledName = symbols[i];
-#elif HAVE(DLADDR)
+#elif OS(WINDOWS)
+ if (DbgHelper::SymFromAddress(hProc, reinterpret_cast<DWORD64>(stack[i]), 0, symbolInfo))
+ mangledName = symbolInfo->Name;
+#endif
auto demangled = demangle(stack[i]);
if (demangled) {
mangledName = demangled->mangledName();
cxaDemangled = demangled->demangledName();
}
-#elif OS(WINDOWS)
- if (DbgHelper::SymFromAddress(hProc, reinterpret_cast<DWORD64>(stack[i]), 0, symbolInfo))
- mangledName = symbolInfo->Name;
-#endif
const int frameNumber = i + 1;
if (mangledName || cxaDemangled)
out.printf("%s%-3d %p %s\n", indentString, frameNumber, stack[i], cxaDemangled ? cxaDemangled : mangledName);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
