This is an archive of the discontinued LLVM Phabricator instance.

Differential D121735

[libc++] Fix incorrect availability markup for bad_optional_access & friends
ClosedPublic

Authored by ldionne on Mar 15 2022, 1:31 PM.

Details

Reviewers
hiraditya
ldionne
Group Reviewers
Restricted Project
Commits
rG0bc451e7e137: [libc++] Fix incorrect availability markup for bad_optional_access & friends
Summary

In 7fb40e1569d, I changed the availability for bad_optional_access and
friends from macOS 10.14 to 10.13 after conducting an investigation on
old dylibs. It turns out that macOS 10.13 did have bad_optional_access,
however the dylib on iOS didn't match the dylib on macOS, so those
exception classes were only introduced in iOS 12.

Thanks to Aditya Kumar for noticing this.

Diff Detail

Event Timeline

ldionne created this revision.Mar 15 2022, 1:31 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 15 2022, 1:31 PM
ldionne requested review of this revision.Mar 15 2022, 1:31 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 15 2022, 1:31 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
ldionne added a subscriber: hiraditya.Mar 15 2022, 1:32 PM
hiraditya accepted this revision.Mar 15 2022, 1:48 PM

LGTM, thanks for fixing it quickly.

Harbormaster completed remote builds in B154414: Diff 415558.Mar 15 2022, 3:14 PM
ldionne accepted this revision.Mar 16 2022, 6:03 AM
This revision is now accepted and ready to land.Mar 16 2022, 6:03 AM
Closed by commit rG0bc451e7e137: [libc++] Fix incorrect availability markup for bad_optional_access & friends (authored by ldionne). · Explain WhyMar 16 2022, 6:03 AM
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rG0bc451e7e137: [libc++] Fix incorrect availability markup for bad_optional_access & friends.

Revision Contents

PathSize
libcxx/
include/
9 lines

Diff 415797

libcxx/include/__availability

Show First 20 Lines • Show All 158 Lines • ▼ Show 20 Lines
# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200) || \ # if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200) || \
(defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 100000) || \ (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 100000) || \
(defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 100000) || \ (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 100000) || \
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 30000) (defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 30000)
# define _LIBCPP_AVAILABILITY_DISABLE_FTM___cpp_lib_shared_mutex # define _LIBCPP_AVAILABILITY_DISABLE_FTM___cpp_lib_shared_mutex
# define _LIBCPP_AVAILABILITY_DISABLE_FTM___cpp_lib_shared_timed_mutex # define _LIBCPP_AVAILABILITY_DISABLE_FTM___cpp_lib_shared_timed_mutex
# endif # endif
// Note: bad_optional_access & friends were not introduced in the matching
// macOS and iOS versions, so the version mismatch between macOS and others
// is intended.
# define _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS \ # define _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS \
__attribute__((availability(macosx,strict,introduced=10.13))) \ __attribute__((availability(macosx,strict,introduced=10.13))) \
__attribute__((availability(ios,strict,introduced=11.0))) \ __attribute__((availability(ios,strict,introduced=12.0))) \
__attribute__((availability(tvos,strict,introduced=11.0))) \ __attribute__((availability(tvos,strict,introduced=12.0))) \
__attribute__((availability(watchos,strict,introduced=4.0))) __attribute__((availability(watchos,strict,introduced=5.0)))
# define _LIBCPP_AVAILABILITY_BAD_VARIANT_ACCESS \ # define _LIBCPP_AVAILABILITY_BAD_VARIANT_ACCESS \
_LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS
# define _LIBCPP_AVAILABILITY_BAD_ANY_CAST \ # define _LIBCPP_AVAILABILITY_BAD_ANY_CAST \
_LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS
# define _LIBCPP_AVAILABILITY_UNCAUGHT_EXCEPTIONS \ # define _LIBCPP_AVAILABILITY_UNCAUGHT_EXCEPTIONS \
__attribute__((availability(macosx,strict,introduced=10.12))) \ __attribute__((availability(macosx,strict,introduced=10.12))) \
__attribute__((availability(ios,strict,introduced=10.0))) \ __attribute__((availability(ios,strict,introduced=10.0))) \
▲ Show 20 Lines • Show All 94 Lines • Show Last 20 Lines