From 7fb40e1569dd66292b647f4501b85517e9247953 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Tue, 9 Jun 2020 14:08:55 -0400 Subject: [PATCH] [libc++] Fix too stringent availability markup for bad_optional_access The availability markup for bad_optional_access marked it as being added in MacOS 10.14 and aligned releases, however it appears to have been added in Mac OS 10.13 and aligned releases. --- libcxx/include/__config | 8 ++++---- libcxx/utils/libcxx/test/config.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git ./projects/libcxx/include/__config ./projects/libcxx/include/__config index cf596a7872ab..26fadcff7ced 100644 --- ./projects/libcxx/include/__config +++ ./projects/libcxx/include/__config @@ -1392,10 +1392,10 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container( __attribute__((availability(tvos,strict,introduced=10.0))) \ __attribute__((availability(watchos,strict,introduced=3.0))) # define _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS \ - __attribute__((availability(macosx,strict,introduced=10.14))) \ - __attribute__((availability(ios,strict,introduced=12.0))) \ - __attribute__((availability(tvos,strict,introduced=12.0))) \ - __attribute__((availability(watchos,strict,introduced=5.0))) + __attribute__((availability(macosx,strict,introduced=10.13))) \ + __attribute__((availability(ios,strict,introduced=11.0))) \ + __attribute__((availability(tvos,strict,introduced=11.0))) \ + __attribute__((availability(watchos,strict,introduced=4.0))) # define _LIBCPP_AVAILABILITY_BAD_VARIANT_ACCESS \ _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS # define _LIBCPP_AVAILABILITY_BAD_ANY_CAST \