<div dir="ltr">This test is failing on FreeBSD, it appears because __cxa_demangle consumes the leading 'f' of foo and returns "float":<div><a href="http://lab.llvm.org:8011/builders/sanitizer_x86_64-freebsd/builds/12709/steps/test%20sanitizer/logs/stdio">http://lab.llvm.org:8011/builders/sanitizer_x86_64-freebsd/builds/12709/steps/test%20sanitizer/logs/stdio</a><br></div><div><pre style="font-family:"courier new",courier,monotype,monospace;color:rgb(0,0,0);font-size:medium"><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><div class="gmail_quote">On Fri, Apr 15, 2016 at 4:51 PM, Anna Zaks via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: zaks<br>
Date: Fri Apr 15 18:51:00 2016<br>
New Revision: 266494<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=266494&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=266494&view=rev</a><br>
Log:<br>
[sanitizers] Teach the internal demangler about Swift names<br>
<br>
Add support for Swift names when symbolicating sanitizer traces. This is<br>
now relevant since TSan and ASan support have been added to Swift on OS X.<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D19135" rel="noreferrer" target="_blank">http://reviews.llvm.org/D19135</a><br>
<br>
Modified:<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_mac.cc<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc<br>
compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h<br>
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">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>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h Fri Apr 15 18:51:00 2016<br>
@@ -28,7 +28,7 @@ const char *ExtractUptr(const char *str,<br>
const char *ExtractTokenUpToDelimiter(const char *str, const char *delimiter,<br>
char **result);<br>
<br>
-const char *DemangleCXXABI(const char *name);<br>
+const char *DemangleSwiftAndCXX(const char *name);<br>
<br>
// SymbolizerTool is an interface that is implemented by individual "tools"<br>
// that can perform symbolication (external llvm-symbolizer, libbacktrace,<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_mac.cc<br>
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">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>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_mac.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_mac.cc Fri Apr 15 18:51:00 2016<br>
@@ -32,7 +32,7 @@ bool DlAddrSymbolizer::SymbolizePC(uptr<br>
Dl_info info;<br>
int result = dladdr((const void *)addr, &info);<br>
if (!result) return false;<br>
- const char *demangled = DemangleCXXABI(info.dli_sname);<br>
+ const char *demangled = DemangleSwiftAndCXX(info.dli_sname);<br>
stack->info.function = demangled ? internal_strdup(demangled) : nullptr;<br>
return true;<br>
}<br>
@@ -41,7 +41,7 @@ bool DlAddrSymbolizer::SymbolizeData(upt<br>
Dl_info info;<br>
int result = dladdr((const void *)addr, &info);<br>
if (!result) return false;<br>
- const char *demangled = DemangleCXXABI(info.dli_sname);<br>
+ const char *demangled = DemangleSwiftAndCXX(info.dli_sname);<br>
datainfo->name = internal_strdup(demangled);<br>
datainfo->start = (uptr)info.dli_saddr;<br>
return true;<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc<br>
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">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>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc Fri Apr 15 18:51:00 2016<br>
@@ -26,6 +26,7 @@<br>
#include "sanitizer_symbolizer_libbacktrace.h"<br>
#include "sanitizer_symbolizer_mac.h"<br>
<br>
+#include <dlfcn.h> // for dlsym()<br>
#include <errno.h><br>
#include <stdlib.h><br>
#include <sys/wait.h><br>
@@ -61,6 +62,38 @@ const char *DemangleCXXABI(const char *n<br>
return name;<br>
}<br>
<br>
+// Attempts to demangle a Swift name. The demangler will return nullptr<br>
+/// if a non-Swift name is passed in.<br>
+const char *DemangleSwift(const char *name) {<br>
+ // Not to call dlsym every time we demangle, check if we are dealing with<br>
+ // Swift mangled name first.<br>
+ if (name[0] != '_' || name[1] != 'T') {<br>
+ return nullptr;<br>
+ }<br>
+<br>
+ // As of now, there are no headers for the Swift runtime. Once they are<br>
+ // present, we will weakly link since we do not require Swift runtime to be<br>
+ // linked.<br>
+ typedef char *(*swift_demangle_ft)(const char *mangledName,<br>
+ size_t mangledNameLength,<br>
+ char *outputBuffer,<br>
+ size_t *outputBufferSize,<br>
+ uint32_t flags);<br>
+ swift_demangle_ft swift_demangle_f =<br>
+ (swift_demangle_ft) dlsym(RTLD_DEFAULT, "swift_demangle");<br>
+ if (swift_demangle_f)<br>
+ return swift_demangle_f(name, internal_strlen(name), 0, 0, 0);<br>
+<br>
+ return nullptr;<br>
+}<br>
+<br>
+const char *DemangleSwiftAndCXX(const char *name) {<br>
+ CHECK(name);<br>
+ if (const char *swift_demangled_name = DemangleSwift(name))<br>
+ return swift_demangled_name;<br>
+ return DemangleCXXABI(name);<br>
+}<br>
+<br>
bool SymbolizerProcess::StartSymbolizerSubprocess() {<br>
if (!FileExists(path_)) {<br>
if (!reported_invalid_path_) {<br>
@@ -364,7 +397,7 @@ class InternalSymbolizer : public Symbol<br>
#endif // SANITIZER_SUPPORTS_WEAK_HOOKS<br>
<br>
const char *Symbolizer::PlatformDemangle(const char *name) {<br>
- return DemangleCXXABI(name);<br>
+ return DemangleSwiftAndCXX(name);<br>
}<br>
<br>
void Symbolizer::PlatformPrepareForSandboxing() {}<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc<br>
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">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>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc Fri Apr 15 18:51:00 2016<br>
@@ -55,4 +55,14 @@ TEST(Symbolizer, ExtractTokenUpToDelimit<br>
InternalFree(token);<br>
}<br>
<br>
+TEST(Symbolizer, DemangleSwiftAndCXX) {<br>
+ // Swift names are not demangled in default llvm build because Swift<br>
+ // runtime is not linked in.<br>
+ EXPECT_STREQ("_TtSd", DemangleSwiftAndCXX("_TtSd"));<br>
+ // Check that the rest demangles properly.<br>
+ EXPECT_STREQ("f1(char*, int)", DemangleSwiftAndCXX("_Z2f1Pci"));<br>
+ EXPECT_STREQ("foo", DemangleSwiftAndCXX("foo"));<br>
+ EXPECT_STREQ("", DemangleSwiftAndCXX(""));<br>
+}<br>
+<br>
} // namespace __sanitizer<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>