<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class="">Yes, it looks like DemangleCXXABI() unconditionally calls __cxa_demangle(), even if the symbol doesn't start with _Z. I think there should be a test in DemangleCXXABI() similar to the one in DemangleSwift(), e.g:</div><div class=""><br class=""></div><div class=""><div class=""><font face="Menlo" class=""> // Check if we are dealing with a C++ mangled name first.</font></div><div class=""><font face="Menlo" class=""> if (name[0] != '_' || name[1] != 'Z') {</font></div><div class=""><font face="Menlo" class=""> return nullptr;</font></div><div class=""><font face="Menlo" class=""> }</font></div></div><div class=""><br class=""></div><div class="">-Dimitry</div><br class=""><div><blockquote type="cite" class=""><div class="">On 28 Jul 2016, at 22:13, Reid Kleckner via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">This test is failing on FreeBSD, it appears because __cxa_demangle consumes the leading 'f' of foo and returns "float":<div class=""><a href="http://lab.llvm.org:8011/builders/sanitizer_x86_64-freebsd/builds/12709/steps/test%20sanitizer/logs/stdio" class="">http://lab.llvm.org:8011/builders/sanitizer_x86_64-freebsd/builds/12709/steps/test%20sanitizer/logs/stdio</a><br class=""></div><div class=""><pre style="font-family: 'courier new', courier, monotype, monospace; font-size: inherit;" class=""><span class="gmail-stdout">FAIL: SanitizerCommon-Unit :: Sanitizer-x86_64-Test/Symbolizer.DemangleSwiftAndCXX (292 of 309)
******************** TEST 'SanitizerCommon-Unit :: Sanitizer-x86_64-Test/Symbolizer.DemangleSwiftAndCXX' FAILED ********************
Note: Google Test filter = Symbolizer.DemangleSwiftAndCXX
[==========] Running 1 test from 1 test case.
[----------] Global test environment set-up.
[----------] 1 test from Symbolizer
[ RUN ] Symbolizer.DemangleSwiftAndCXX
/usr/home/buildslave/slave_as-bldslv5/sanitizer_x86_64-freebsd/llvm.src/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc:65: Failure
Value of: DemangleSwiftAndCXX("foo")
Actual: "float"
Expected: "foo"
[ FAILED ] Symbolizer.DemangleSwiftAndCXX (3 ms)
[----------] 1 test from Symbolizer (3 ms total)
[----------] Global test environment tear-down
[==========] 1 test from 1 test case ran. (7 ms total)
[ PASSED ] 0 tests.
[ FAILED ] 1 test, listed below:
[ FAILED ] Symbolizer.DemangleSwiftAndCXX
1 FAILED TEST</span></pre></div></div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Fri, Apr 15, 2016 at 4:51 PM, Anna Zaks via llvm-commits <span dir="ltr" class=""><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank" class="">llvm-commits@lists.llvm.org</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: zaks<br class="">
Date: Fri Apr 15 18:51:00 2016<br class="">
New Revision: 266494<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=266494&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=266494&view=rev</a><br class="">
Log:<br class="">
[sanitizers] Teach the internal demangler about Swift names<br class="">
<br class="">
Add support for Swift names when symbolicating sanitizer traces. This is<br class="">
now relevant since TSan and ASan support have been added to Swift on OS X.<br class="">
<br class="">
Differential Revision: <a href="http://reviews.llvm.org/D19135" rel="noreferrer" target="_blank" class="">http://reviews.llvm.org/D19135</a><br class="">
<br class="">
Modified:<br class="">
compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h<br class="">
compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_mac.cc<br class="">
compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc<br class="">
compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc<br class="">
<br class="">
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h?rev=266494&r1=266493&r2=266494&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h?rev=266494&r1=266493&r2=266494&view=diff</a><br class="">
==============================================================================<br class="">
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h (original)<br class="">
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h Fri Apr 15 18:51:00 2016<br class="">
@@ -28,7 +28,7 @@ const char *ExtractUptr(const char *str,<br class="">
const char *ExtractTokenUpToDelimiter(const char *str, const char *delimiter,<br class="">
char **result);<br class="">
<br class="">
-const char *DemangleCXXABI(const char *name);<br class="">
+const char *DemangleSwiftAndCXX(const char *name);<br class="">
<br class="">
// SymbolizerTool is an interface that is implemented by individual "tools"<br class="">
// that can perform symbolication (external llvm-symbolizer, libbacktrace,<br class="">
<br class="">
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_mac.cc<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_mac.cc?rev=266494&r1=266493&r2=266494&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_mac.cc?rev=266494&r1=266493&r2=266494&view=diff</a><br class="">
==============================================================================<br class="">
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_mac.cc (original)<br class="">
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_mac.cc Fri Apr 15 18:51:00 2016<br class="">
@@ -32,7 +32,7 @@ bool DlAddrSymbolizer::SymbolizePC(uptr<br class="">
Dl_info info;<br class="">
int result = dladdr((const void *)addr, &info);<br class="">
if (!result) return false;<br class="">
- const char *demangled = DemangleCXXABI(info.dli_sname);<br class="">
+ const char *demangled = DemangleSwiftAndCXX(info.dli_sname);<br class="">
stack->info.function = demangled ? internal_strdup(demangled) : nullptr;<br class="">
return true;<br class="">
}<br class="">
@@ -41,7 +41,7 @@ bool DlAddrSymbolizer::SymbolizeData(upt<br class="">
Dl_info info;<br class="">
int result = dladdr((const void *)addr, &info);<br class="">
if (!result) return false;<br class="">
- const char *demangled = DemangleCXXABI(info.dli_sname);<br class="">
+ const char *demangled = DemangleSwiftAndCXX(info.dli_sname);<br class="">
datainfo->name = internal_strdup(demangled);<br class="">
datainfo->start = (uptr)info.dli_saddr;<br class="">
return true;<br class="">
<br class="">
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc?rev=266494&r1=266493&r2=266494&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc?rev=266494&r1=266493&r2=266494&view=diff</a><br class="">
==============================================================================<br class="">
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc (original)<br class="">
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc Fri Apr 15 18:51:00 2016<br class="">
@@ -26,6 +26,7 @@<br class="">
#include "sanitizer_symbolizer_libbacktrace.h"<br class="">
#include "sanitizer_symbolizer_mac.h"<br class="">
<br class="">
+#include <dlfcn.h> // for dlsym()<br class="">
#include <errno.h><br class="">
#include <stdlib.h><br class="">
#include <sys/wait.h><br class="">
@@ -61,6 +62,38 @@ const char *DemangleCXXABI(const char *n<br class="">
return name;<br class="">
}<br class="">
<br class="">
+// Attempts to demangle a Swift name. The demangler will return nullptr<br class="">
+/// if a non-Swift name is passed in.<br class="">
+const char *DemangleSwift(const char *name) {<br class="">
+ // Not to call dlsym every time we demangle, check if we are dealing with<br class="">
+ // Swift mangled name first.<br class="">
+ if (name[0] != '_' || name[1] != 'T') {<br class="">
+ return nullptr;<br class="">
+ }<br class="">
+<br class="">
+ // As of now, there are no headers for the Swift runtime. Once they are<br class="">
+ // present, we will weakly link since we do not require Swift runtime to be<br class="">
+ // linked.<br class="">
+ typedef char *(*swift_demangle_ft)(const char *mangledName,<br class="">
+ size_t mangledNameLength,<br class="">
+ char *outputBuffer,<br class="">
+ size_t *outputBufferSize,<br class="">
+ uint32_t flags);<br class="">
+ swift_demangle_ft swift_demangle_f =<br class="">
+ (swift_demangle_ft) dlsym(RTLD_DEFAULT, "swift_demangle");<br class="">
+ if (swift_demangle_f)<br class="">
+ return swift_demangle_f(name, internal_strlen(name), 0, 0, 0);<br class="">
+<br class="">
+ return nullptr;<br class="">
+}<br class="">
+<br class="">
+const char *DemangleSwiftAndCXX(const char *name) {<br class="">
+ CHECK(name);<br class="">
+ if (const char *swift_demangled_name = DemangleSwift(name))<br class="">
+ return swift_demangled_name;<br class="">
+ return DemangleCXXABI(name);<br class="">
+}<br class="">
+<br class="">
bool SymbolizerProcess::StartSymbolizerSubprocess() {<br class="">
if (!FileExists(path_)) {<br class="">
if (!reported_invalid_path_) {<br class="">
@@ -364,7 +397,7 @@ class InternalSymbolizer : public Symbol<br class="">
#endif // SANITIZER_SUPPORTS_WEAK_HOOKS<br class="">
<br class="">
const char *Symbolizer::PlatformDemangle(const char *name) {<br class="">
- return DemangleCXXABI(name);<br class="">
+ return DemangleSwiftAndCXX(name);<br class="">
}<br class="">
<br class="">
void Symbolizer::PlatformPrepareForSandboxing() {}<br class="">
<br class="">
Modified: compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc?rev=266494&r1=266493&r2=266494&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc?rev=266494&r1=266493&r2=266494&view=diff</a><br class="">
==============================================================================<br class="">
--- compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc (original)<br class="">
+++ compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc Fri Apr 15 18:51:00 2016<br class="">
@@ -55,4 +55,14 @@ TEST(Symbolizer, ExtractTokenUpToDelimit<br class="">
InternalFree(token);<br class="">
}<br class="">
<br class="">
+TEST(Symbolizer, DemangleSwiftAndCXX) {<br class="">
+ // Swift names are not demangled in default llvm build because Swift<br class="">
+ // runtime is not linked in.<br class="">
+ EXPECT_STREQ("_TtSd", DemangleSwiftAndCXX("_TtSd"));<br class="">
+ // Check that the rest demangles properly.<br class="">
+ EXPECT_STREQ("f1(char*, int)", DemangleSwiftAndCXX("_Z2f1Pci"));<br class="">
+ EXPECT_STREQ("foo", DemangleSwiftAndCXX("foo"));<br class="">
+ EXPECT_STREQ("", DemangleSwiftAndCXX(""));<br class="">
+}<br class="">
+<br class="">
} // namespace __sanitizer<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
llvm-commits mailing list<br class="">
<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="">
</blockquote></div><br class=""></div>
_______________________________________________<br class="">llvm-commits mailing list<br class=""><a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a><br class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits<br class=""></div></blockquote></div><br class=""></body></html>