commit 54425eca76c8bdeb17ef72c0ab4861f4ebe47d2c
author Eric Fiselier <eric@efcs.ca> Tue Jan 24 12:26:01 2017 +0000
committer Eric Fiselier <eric@efcs.ca> Tue Jan 24 12:26:01 2017 +0000
tree 0833f118d53e982f335b4ef95fa998b06c98e0cb
parent f671792b45b38394df3644979f659b55a153c9bc

Revert "[libcxx] Never use <cassert> within libc++"

This reverts commit r292883. Unfortunately <string_view> uses
_LIBCPP_ASSERT in a way which is not compatible with the C++11 dylib
build. I'll investigate more tomorrow.

llvm-svn: 292923
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: f9e7bf3a43fd28c9ffd1523f1c832275e80a9f85

src/condition_variable.cpp

diff --git a/src/condition_variable.cpp b/src/condition_variable.cpp
index 3f60727..25e6603 100644
--- a/src/condition_variable.cpp
+++ b/src/condition_variable.cpp
@@ -14,6 +14,7 @@
 #include "condition_variable"
 #include "thread"
 #include "system_error"
+#include "cassert"
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 

src/experimental/filesystem/path.cpp

diff --git a/src/experimental/filesystem/path.cpp b/src/experimental/filesystem/path.cpp
index daf2c2b..96b81f7 100644
--- a/src/experimental/filesystem/path.cpp
+++ b/src/experimental/filesystem/path.cpp
@@ -6,9 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+#undef NDEBUG
 #include "experimental/filesystem"
 #include "string_view"
 #include "utility"
+#include "cassert"
 
 namespace { namespace parser
 {
@@ -111,6 +113,7 @@
   void decrement() noexcept {
     const PosPtr REnd = &Path.front() - 1;
     const PosPtr RStart = getCurrentTokenStartPos() - 1;
+    assert(RStart != REnd);
 
     switch (State) {
     case PS_AtEnd: {
@@ -319,6 +322,7 @@
       auto NextCh = PP.peek();
       if (NextCh && *NextCh == '/') {
         ++PP;
+        assert(PP.State == PathParser::PS_InRootDir);
         return createView(__pn_.data(), &PP.RawEntry.back());
       }
       return PP.RawEntry;

src/mutex.cpp

diff --git a/src/mutex.cpp b/src/mutex.cpp
index b858e88..338b79f 100644
--- a/src/mutex.cpp
+++ b/src/mutex.cpp
@@ -11,6 +11,7 @@
 #include "mutex"
 #include "limits"
 #include "system_error"
+#include "cassert"
 #include "include/atomic_support.h"
 
 _LIBCPP_BEGIN_NAMESPACE_STD
@@ -44,7 +45,7 @@
 {
     int ec = __libcpp_mutex_unlock(&__m_);
     (void)ec;
-    _LIBCPP_ASSERT(ec == 0, "call to mutex::unlock failed");
+    assert(ec == 0);
 }
 
 // recursive_mutex
@@ -60,7 +61,7 @@
 {
     int e = __libcpp_recursive_mutex_destroy(&__m_);
     (void)e;
-    _LIBCPP_ASSERT(e == 0, "call to ~recursive_mutex() failed");
+    assert(e == 0);
 }
 
 void
@@ -76,7 +77,7 @@
 {
     int e = __libcpp_recursive_mutex_unlock(&__m_);
     (void)e;
-    _LIBCPP_ASSERT(e == 0, "call to recursive_mutex::unlock() failed");
+    assert(e == 0);
 }
 
 bool

src/system_error.cpp

diff --git a/src/system_error.cpp b/src/system_error.cpp
index cbbbb5d..9411499 100644
--- a/src/system_error.cpp
+++ b/src/system_error.cpp
@@ -17,9 +17,9 @@
 #include "cstring"
 #include "cstdio"
 #include "cstdlib"
+#include "cassert"
 #include "string"
 #include "string.h"
-#include "__debug"
 
 #if defined(__ANDROID__)
 #include <android/api-level.h>
@@ -96,7 +96,7 @@
             std::snprintf(buffer, strerror_buff_size, "Unknown error %d", ev);
             return string(buffer);
         } else {
-            _LIBCPP_ASSERT(new_errno == ERANGE, "unexpected error from ::strerr_r");
+            assert(new_errno == ERANGE);
             // FIXME maybe? 'strerror_buff_size' is likely to exceed the
             // maximum error size so ERANGE shouldn't be returned.
             std::abort();