summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libcxx/include/experimental/string_view4
-rw-r--r--libcxx/test/libcxx/test/config.py10
-rw-r--r--libcxx/www/lit_usage.html9
3 files changed, 21 insertions, 2 deletions
diff --git a/libcxx/include/experimental/string_view b/libcxx/include/experimental/string_view
index d423f39003a..b8d061fb915 100644
--- a/libcxx/include/experimental/string_view
+++ b/libcxx/include/experimental/string_view
@@ -313,7 +313,7 @@ _LIBCPP_BEGIN_NAMESPACE_LFTS
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
void remove_prefix(size_type __n) _NOEXCEPT
{
- _LIBCPP_ASSERT(n <= size(), "remove_prefix() can't remove more than size()");
+ _LIBCPP_ASSERT(__n <= size(), "remove_prefix() can't remove more than size()");
__data += __n;
__size -= __n;
}
@@ -321,7 +321,7 @@ _LIBCPP_BEGIN_NAMESPACE_LFTS
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
void remove_suffix(size_type __n) _NOEXCEPT
{
- _LIBCPP_ASSERT(n <= size(), "remove_suffix() can't remove more than size()");
+ _LIBCPP_ASSERT(__n <= size(), "remove_suffix() can't remove more than size()");
__size -= __n;
}
diff --git a/libcxx/test/libcxx/test/config.py b/libcxx/test/libcxx/test/config.py
index 43e3bb82c1e..5633d3d056f 100644
--- a/libcxx/test/libcxx/test/config.py
+++ b/libcxx/test/libcxx/test/config.py
@@ -91,6 +91,7 @@ class Configuration(object):
self.configure_env()
self.configure_compile_flags()
self.configure_link_flags()
+ self.configure_debug_mode()
self.configure_warnings()
self.configure_sanitizer()
self.configure_substitutions()
@@ -468,6 +469,15 @@ class Configuration(object):
else:
self.lit_config.fatal("unrecognized system: %r" % target_platform)
+ def configure_debug_mode(self):
+ debug_level = self.get_lit_conf('debug_level', None)
+ if not debug_level:
+ return
+ if debug_level not in ['0', '1']:
+ self.lit_config.fatal('Invalid value for debug_level "%s".'
+ % debug_level)
+ self.cxx.compile_flags += ['-D_LIBCPP_DEBUG=%s' % debug_level]
+
def configure_warnings(self):
enable_warnings = self.get_lit_bool('enable_warnings', False)
if enable_warnings:
diff --git a/libcxx/www/lit_usage.html b/libcxx/www/lit_usage.html
index 645143fa0bd..77179f21f60 100644
--- a/libcxx/www/lit_usage.html
+++ b/libcxx/www/lit_usage.html
@@ -175,6 +175,15 @@ Change the standard version used when building the tests.
</p>
<p>
+<h3 class="lit-option">debug_level=&lt;level&gt;</h3>
+<blockquote class="lit-option-desc">
+<b>Values: </b><code>0, 1</code></br>
+Enable the use of debug mode. Level 0 enables assertions and level 1 enables
+assertions and debugging of iterator misuse.
+</blockquote>
+</p>
+
+<p>
<h3 class="lit-option">use_sanitizer=&lt;sanitizer name&gt;</h3>
<blockquote class="lit-option-desc">
<b>Values: </b><code>Memory, MemoryWithOrigins, Address, Undefined</code></br>
OpenPOWER on IntegriCloud