Import libc++ 8.0.0.

1 files changed, 17 insertions, 32 deletions

diff --git a/lib/libcxx/docs/DesignDocs/AvailabilityMarkup.rst b/lib/libcxx/docs/DesignDocs/AvailabilityMarkup.rst
index b8b44509790..4e6d80b50bf 100644
--- a/lib/libcxx/docs/DesignDocs/AvailabilityMarkup.rst
+++ b/lib/libcxx/docs/DesignDocs/AvailabilityMarkup.rst
@@ -24,11 +24,11 @@ systems. For example::
 
     // Define availability macros.
     #if defined(_LIBCPP_USE_AVAILABILITY_APPLE)
-    #define _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS __attribute__((unavailable))
+    # define _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS __attribute__((unavailable))
     #else  if defined(_LIBCPP_USE_AVAILABILITY_SOME_OTHER_VENDOR)
-    #define _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS __attribute__((unavailable))
-	#else
-    #define _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS
+    # define _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS __attribute__((unavailable))
+    #else
+    # define _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS
     #endif
 
 When the library is updated by the platform vendor, the markup can be updated.
@@ -43,9 +43,9 @@ For example::
 In the source code, the macro can be added on a class if the full class requires
 type info from the library for example::
 
-	_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL
-	class _LIBCPP_EXCEPTION_ABI _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS bad_optional_access
-	    : public std::logic_error {
+    _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL
+    class _LIBCPP_EXCEPTION_ABI _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS bad_optional_access
+      : public std::logic_error {
 
 or on a particular symbol:
 
@@ -55,7 +55,7 @@ or on a particular symbol:
 Testing
 =======
 
-Some parameters can be passed to lit to run the test-suite and exercising the
+Some parameters can be passed to lit to run the test-suite and exercise the
 availability.
 
 * The `platform` parameter controls the deployment target. For example lit can
@@ -65,14 +65,11 @@ availability.
   the test-suite against the host system library. Alternatively a path to the
   directory containing a specific prebuilt libc++ can be used, for example:
   `--param=use_system_cxx_lib=/path/to/macOS/10.8/`.
-* The `with_availability` boolean parameter enables the availability markup.
 
 Tests can be marked as XFAIL based on multiple features made available by lit:
 
 
-* if either `use_system_cxx_lib` or  `with_availability` is passed to lit,
-  assuming `--param=platform=macosx10.8` is passed as well the following
-  features will be available:
+* if `--param=platform=macosx10.8` is passed, the following features will be available:
 
   - availability
   - availability=x86_64
@@ -81,11 +78,11 @@ Tests can be marked as XFAIL based on multiple features made available by lit:
   - availability=x86_64-apple-macosx10.8
   - availability=macosx10.8
 
-  This feature is used to XFAIL a test that *is* using a class of a method marked
+  This feature is used to XFAIL a test that *is* using a class or a method marked
   as unavailable *and* that is expected to *fail* if deployed on an older system.
 
-* if `use_system_cxx_lib` is passed to lit, the following features will also
-  be available:
+* if `use_system_cxx_lib` and `--param=platform=macosx10.8` are passed to lit,
+  the following features will also be available:
 
   - with_system_cxx_lib
   - with_system_cxx_lib=x86_64
@@ -94,21 +91,9 @@ Tests can be marked as XFAIL based on multiple features made available by lit:
   - with_system_cxx_lib=x86_64-apple-macosx10.8
   - with_system_cxx_lib=macosx10.8
 
-  This feature is used to XFAIL a test that is *not* using a class of a method
+  This feature is used to XFAIL a test that is *not* using a class or a method
   marked as unavailable *but* that is expected to fail if deployed on an older
-  system. For example if we know that it exhibits a but in the libc on a
-  particular system version.
-
-* if `with_availability` is passed to lit, the following features will also
-  be available:
-
-  - availability_markup
-  - availability_markup=x86_64
-  - availability_markup=macosx
-  - availability_markup=x86_64-macosx
-  - availability_markup=x86_64-apple-macosx10.8
-  - availability_markup=macosx10.8
-
-  This feature is used to XFAIL a test that *is* using a class of a method
-  marked as unavailable *but* that is expected to *pass* if deployed on an older
-  system. For example if it is using a symbol in a statically evaluated context.
+  system. For example, if the test exhibits a bug in the libc on a particular
+  system version, or if the test uses a symbol that is not available on an
+  older version of the dylib (but for which there is no availability markup,
+  otherwise the XFAIL should use `availability` above).