[llvm-branch-commits] [compiler-rt-branch] r277423 - Merging r277297:

[Dimitry Andric via llvm-branch-commits]

Author: dim
Date: Tue Aug  2 01:42:41 2016
New Revision: 277423

URL: http://llvm.org/viewvc/llvm-project?rev=277423&view=rev
Log:
Merging r277297:

------------------------------------------------------------------------
r277297 | dim | 2016-07-31 21:27:46 +0200 (Sun, 31 Jul 2016) | 21 lines

XFAIL one sanitizer symbolizer test for FreeBSD

Summary:
Due to a QoI issuse in FreeBSD's libcxxrt-based demangler, one sanitizer
symbolizer test consistently appears to fail:

    Value of: DemangleSwiftAndCXX("foo")
      Actual: "float"
    Expected: "foo"

This is because libcxxrt's __cxa_demangle() incorrectly demangles the "foo"
identifier to "float".  It should return an error instead.

For now, XFAIL this particular test for FreeBSD, until we can fix libcxxrt
properly (which might take some time to coordinate with upstream).

Reviewers: rnk, zaks.anna, emaste

Subscribers: emaste, llvm-commits, kubabrecka

Differential Revision: https://reviews.llvm.org/D23001
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_39/   (props changed)
    compiler-rt/branches/release_39/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc

Propchange: compiler-rt/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  2 01:42:41 2016
@@ -1 +1 @@
-/compiler-rt/trunk:275946,275948
+/compiler-rt/trunk:275946,275948,277297

Modified: compiler-rt/branches/release_39/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_39/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc?rev=277423&r1=277422&r2=277423&view=diff
==============================================================================
--- compiler-rt/branches/release_39/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc (original)
+++ compiler-rt/branches/release_39/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc Tue Aug  2 01:42:41 2016
@@ -62,7 +62,9 @@ TEST(Symbolizer, DemangleSwiftAndCXX) {
   EXPECT_STREQ("_TtSd", DemangleSwiftAndCXX("_TtSd"));
   // Check that the rest demangles properly.
   EXPECT_STREQ("f1(char*, int)", DemangleSwiftAndCXX("_Z2f1Pci"));
+#if !SANITIZER_FREEBSD // QoI issue with libcxxrt on FreeBSD
   EXPECT_STREQ("foo", DemangleSwiftAndCXX("foo"));
+#endif
   EXPECT_STREQ("", DemangleSwiftAndCXX(""));
 }
 #endif