Skip to content

P2231 Completing constexpr in optional and variant#2005

Merged
StephanTLavavej merged 41 commits intomicrosoft:mainfrom
miscco:P2231-constexpr-optional
Aug 26, 2021
Merged

P2231 Completing constexpr in optional and variant#2005
StephanTLavavej merged 41 commits intomicrosoft:mainfrom
miscco:P2231-constexpr-optional

Conversation

@miscco
Copy link
Copy Markdown
Contributor

@miscco miscco commented Jun 12, 2021 •
edited
Loading

This implements the library changes in optional and variant.

That said, the tests are in a certain state that needs to be fixed. I will tackle that soon^TM

Fixes #1982

@StephanTLavavej StephanTLavavej added cxx20 C++20 feature defect report Applied retroactively labels Jun 13, 2021
CaseyCarter
CaseyCarter suggested changes Jun 15, 2021
View reviewed changes
Comment thread stl/inc/optional Outdated
Comment thread stl/inc/optional
Comment thread stl/inc/yvals_core.h Outdated
Comment thread tests/std/tests/VSO_0157762_feature_test_macros/test.compile.pass.cpp Outdated
Comment thread stl/inc/optional Outdated
Comment thread stl/inc/variant Outdated
miscco and others added 3 commits June 24, 2021 20:56
@miscco @CaseyCarter
Address review comments
0c36ad9 
Co-authored-by: Casey Carter <cacarter@microsoft.com>
@miscco
Make the test pass
ca40908
@miscco
Fix typo
09eff91
@CaseyCarter

This comment has been minimized.

Sign in to view
@azure-pipelines

This comment has been minimized.

Sign in to view
@miscco

This comment has been minimized.

Sign in to view
@miscco

This comment has been minimized.

Sign in to view
miscco
miscco commented Jun 25, 2021
View reviewed changes
Comment thread stl/inc/variant
@miscco miscco force-pushed the P2231-constexpr-optional branch from 16e3c24 to 9af7f80 Compare June 25, 2021 10:25
@miscco miscco force-pushed the P2231-constexpr-optional branch from 9af7f80 to d5cd6f5 Compare June 25, 2021 10:25
@miscco miscco marked this pull request as ready for review June 25, 2021 10:41
@miscco miscco requested a review from a team as a code owner June 25, 2021 10:41
@miscco
Copy link
Copy Markdown
Contributor Author

miscco commented Jun 26, 2021

As discussed in discord we are currently locked due to https://developercommunity2.visualstudio.com/t/1331017

There is no real way of working around that, so we need to wait until the fix is in

@CaseyCarter CaseyCarter added the blocked Something is preventing work on this label Jun 28, 2021
@CaseyCarter
Minor test cleanup
a2c4d94 
* A 64-alternative variant is "big" enough.
* Clang doesn't know yet that a union with at least one literal member is a literal type.
CaseyCarter
CaseyCarter reviewed Aug 9, 2021
View reviewed changes
Comment thread tests/std/tests/P2231R1_complete_constexpr_optional_variant/test.cpp Outdated
@CaseyCarter CaseyCarter self-requested a review August 17, 2021 22:23
CaseyCarter
CaseyCarter approved these changes Aug 17, 2021
View reviewed changes
Comment thread stl/inc/yvals_core.h
Comment thread tests/std/tests/P2231R1_complete_constexpr_optional_variant/test.cpp
Comment thread tests/std/tests/P2231R1_complete_constexpr_optional_variant/test.cpp
@CaseyCarter CaseyCarter removed their assignment Aug 17, 2021
@CaseyCarter CaseyCarter mentioned this pull request Aug 18, 2021
Closed
@StephanTLavavej StephanTLavavej self-assigned this Aug 18, 2021
StephanTLavavej
StephanTLavavej reviewed Aug 19, 2021
View reviewed changes
Comment thread tests/std/tests/P2231R1_complete_constexpr_optional_variant/test.cpp Outdated
#endif // TRANSITION
optional<T> copy_assigned;
assert(!copy_assigned.has_value());
copy_assigned = constructed;
Copy link
Copy Markdown
Member

@StephanTLavavej StephanTLavavej Aug 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I observe that constructed has been moved-from above, but the Standard guarantees that it still has_value(), and the types being tested are unchanged when they're moved-from, so this is well-defined. (Ditto for the variant tests below.) No change requested.

Copy link
Copy Markdown
Contributor Author

@miscco miscco Aug 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed so that we properly use first move_constructed and then copy_assigned

Comment thread tests/std/tests/P2231R1_complete_constexpr_optional_variant/test.cpp
@StephanTLavavej StephanTLavavej removed their assignment Aug 19, 2021
@StephanTLavavej
Copy link
Copy Markdown
Member

StephanTLavavej commented Aug 19, 2021

@miscco @CaseyCarter I pushed a conflict-free merge with main while I was in the neighborhood, followed by extending the test to cover converting construction (and updated the converting assignment tests to follow the pattern elsewhere).

CaseyCarter
CaseyCarter reviewed Aug 19, 2021
View reviewed changes
Comment thread tests/std/tests/P2231R1_complete_constexpr_optional_variant/test.cpp Outdated
CaseyCarter
CaseyCarter reviewed Aug 19, 2021
View reviewed changes
Comment thread tests/std/tests/P2231R1_complete_constexpr_optional_variant/test.cpp Outdated
@StephanTLavavej StephanTLavavej self-assigned this Aug 26, 2021
@StephanTLavavej
Copy link
Copy Markdown
Member

StephanTLavavej commented Aug 26, 2021

I'm mirroring this to an MSVC-internal PR. Please notify me if any further changes are pushed.

@StephanTLavavej StephanTLavavej merged commit 96a4c16 into microsoft:main Aug 26, 2021
@StephanTLavavej
Copy link
Copy Markdown
Member

StephanTLavavej commented Aug 26, 2021

Thanks for constexpring all the things! 😸 🚀 💯

@miscco miscco deleted the P2231-constexpr-optional branch August 27, 2021 04:58
@StephanTLavavej StephanTLavavej mentioned this pull request Jul 13, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@StephanTLavavej StephanTLavavej StephanTLavavej approved these changes

+2 more reviewers

@CaseyCarter CaseyCarter CaseyCarter approved these changes

@AdamBucior AdamBucior AdamBucior left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@StephanTLavavej StephanTLavavej

Labels

cxx20 C++20 feature defect report Applied retroactively

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

P2231R1 Completing constexpr In optional And variant

4 participants

@miscco @CaseyCarter @StephanTLavavej @AdamBucior