-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement the ABI plan from GH-1814 #1929
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Condition `<format>` and "`<chronat>`" on `__cpp_lib_format` instead of `__cpp_lib_concepts`. * Condition the `view` concept - and everything that relies on it, including all of `<ranges>` - on `__cpp_lib_ranges` in addition to `__cpp_lib_concepts`. * Add C++23 STL and testing infrastructure: * Define `_HAS_CXX23` in `<yvals_core.h>`. We'll eventually want this to move into `<vcruntime.h>` so all `_HAS_CXXMEOW` definitions are nicely localized. * `_HAS_CXX23` is defined to `1` iff `_HAS_CXX20 != 0` and `_MSVC_LANG` (if defined) or `__cplusplus` (otherwise) is greater than C++20's value of `202002L`. For Clang coverage, we'll have to manually define `_HAS_CXX23` to `1` until Clang updates their `__cplusplus` value for `/std:c++latest`. * Rename `meow_concepts_woof.lst` to `meow_concepts_latest_woof.lst`. * Update test matrices: Copy all `meow_latest_woof.lst` matrices to `meow_20_woof.lst`. Add `/std:c++20` coverage to the latter (still spelled `/std:c++latest` for Clang which doesn't grok `/std:c++20`) by duplicating the C++17 configs. `/std:c++latest` becomes C++23 mode (with additions of `/D_HAS_CXX23` for Clang). * Replace uses of `meow_latest_woof.lst` with `meow_20_woof.lst`, except for a few tests that are only intended to have `latest` coverage, notably `include_each_header_alone` and all of `libcxx`. * Only define `__cpp_lib_format` and `__cpp_lib_ranges` in C++23 mode. Update the feature-test macro test accordingly.
miscco
reviewed
May 24, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I took the liberty to not check every file
tests/std/tests/P0645R10_text_formatting_legacy_text_encoding/env.lst
Outdated
Show resolved
Hide resolved
barcharcraz
approved these changes
May 25, 2021
StephanTLavavej
approved these changes
May 26, 2021
This was referenced Jun 2, 2021
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
<format>
and "<chronat>
" on__cpp_lib_format
instead of__cpp_lib_concepts
.view
concept - and everything that relies on it, including all of<ranges>
- on__cpp_lib_ranges
in addition to__cpp_lib_concepts
._HAS_CXX23
in<yvals_core.h>
. We'll eventually want this to move into<vcruntime.h>
so all_HAS_CXXMEOW
definitions are nicely localized._HAS_CXX23
is defined to1
iff_HAS_CXX20 != 0
and_MSVC_LANG
(if defined) or__cplusplus
(otherwise) is greater than C++20's value of202002L
. For Clang coverage, we'll have to manually define_HAS_CXX23
to1
until Clang updates their__cplusplus
value for/std:c++latest
.meow_concepts_woof.lst
tomeow_concepts_latest_woof.lst
.meow_latest_woof.lst
matrices tomeow_20_woof.lst
. Add/std:c++20
coverage to the latter (still spelled/std:c++latest
for Clang which doesn't grok/std:c++20
) by duplicating the C++17 configs./std:c++latest
becomes C++23 mode (with additions of/D_HAS_CXX23
for Clang).meow_latest_woof.lst
withmeow_20_woof.lst
, except for a few tests that are only intended to havelatest
coverage, notablyinclude_each_header_alone
and all oflibcxx
.__cpp_lib_format
and__cpp_lib_ranges
in C++23 mode. Update the feature-test macro test accordingly.Note: I didn't a ton of new C++20 configurations, only as many as we had C++17 configurations. This increased the CI runtime from 22:05 to 23:40 while covering 114k vs. 108k test cases. If we are concerned about this increase, we can probably steal a C++14 configuration from each matrix instead and promote it to C++20. This would keep the CI impact the same by sacrificing some C++14 coverage for C++20 coverage. Given that the impact is <10% and this change is high priority, I'd prefer to apply this as-is and followup later with any such tweaking if we feel it's necessary.