Address feedback

Author: var-const

libcxx/docs/Hardening.rst

@@ -74,18 +74,9 @@ to control the level by passing **one** of the following options to the compiler
    pre-built components. Most libc++ code is header-based, so a user-provided
    value for ``_LIBCPP_HARDENING_MODE`` will be mostly respected.
 
-.. warning::
-
-Assertion semantics are currently an experimental feature.
-
-.. note::
-
-Assertion semantics are not available in the C++03 mode.
-
 In some cases, users might want to override the assertion semantic used by the
 library. This can be done similarly to setting the hardening mode; please refer
-to the :ref:`relevant section <assertion-semantics>`. Note that this feature is
-currently experimental.
+to the :ref:`relevant section <assertion-semantics>`.
 
 Notes for vendors
 -----------------
@@ -275,17 +266,9 @@ output. This is less secure and increases the size of the binary (among other
 things, it has to store the error message strings) but makes the failure easier
 to debug. It also allows testing the error messages in our test suite.
 
-.. warning::
-
-Assertion semantics are currently an experimental feature.
-
-.. note::
-
-Assertion semantics are not available in the C++03 mode.
-
-Experimentally, this default behavior can be customized by users via
-:ref:`assertion semantics <assertion-semantics>`; it can also be completely
-overridden by vendors by providing a :ref:`custom assertion failure handler
+This default behavior can be customized by users via :ref:`assertion semantics
+<assertion-semantics>`; it can also be completely overridden by vendors by
+providing a :ref:`custom assertion failure handler
 <override-assertion-handler>`.
 
 .. _assertion-semantics:
@@ -295,11 +278,11 @@ Assertion semantics
 
 .. warning::
 
-Assertion semantics are currently an experimental feature.
+  Assertion semantics are currently an experimental feature.
 
 .. note::
 
-Assertion semantics are not available in the C++03 mode.
+  Assertion semantics are not available in the C++03 mode.
 
 What happens when an assertion fails depends on the assertion semantic being
 used. Four assertion semantics are available, based on C++26 Contracts

libcxx/include/__config

@@ -201,10 +201,10 @@ _LIBCPP_HARDENING_MODE_DEBUG
 #  else
 #    if !_LIBCPP_HAS_EXPERIMENTAL_LIBRARY
 #      error "Assertion semantics are an experimental feature."
-#    endif // ! _LIBCPP_HAS_EXPERIMENTAL_LIBRARY
+#    endif
 #    if defined(_LIBCPP_CXX03_LANG)
 #      error "Assertion semantics are not available in the C++03 mode."
-#    endif // defined(_LIBCPP_CXX03_LANG)
+#    endif
 
 #  endif // _LIBCPP_ASSERTION_SEMANTIC
 

libcxx/include/__cxx03/__config

@@ -152,6 +152,10 @@ _LIBCPP_HARDENING_MODE_EXTENSIVE, \
 _LIBCPP_HARDENING_MODE_DEBUG
 #  endif
 
+#  ifdef _LIBCPP_ASSERTION_SEMANTIC
+#    error "Assertion semantics are not available in the C++03 mode."
+#  endif
+
 // } HARDENING
 
 #  define _LIBCPP_TOSTRING2(x) #x

libcxx/vendor/llvm/default_assertion_handler.in

@@ -25,7 +25,7 @@
 #  pragma GCC system_header
 #endif
 
-#if __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
+#if defined(_LIBCPP_CXX03_LANG) && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 
 // Keep the old implementation that doesn't support assertion semantics for backward compatibility with the frozen C++03
 // mode.
@@ -59,6 +59,6 @@ _LIBCPP_ASSERTION_SEMANTIC_ENFORCE
 
 #  endif // _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_IGNORE
 
-#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
+#endif // defined(_LIBCPP_CXX03_LANG) && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 
 #endif // _LIBCPP___ASSERTION_HANDLER