Skip to content

Annotate some functions _MSVC_CONSTEXPR #2658

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.

Sign up for GitHub

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

Merged
Stephan T. Lavavej (StephanTLavavej) merged 1 commit into from
Apr 19, 2022
Merged

Annotate some functions _MSVC_CONSTEXPR #2658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stl/inc/memory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ namespace ranges {
noexcept(noexcept(::new (const_cast<void*>(static_cast<const volatile void*>(_Location)))
_Ty(_STD forward<_Types>(_Args)...))) /* strengthened */ {
// clang-format on
return ::new (const_cast<void*>(static_cast<const volatile void*>(_Location)))
_MSVC_CONSTEXPR return ::new (const_cast<void*>(static_cast<const volatile void*>(_Location)))
_Ty(_STD forward<_Types>(_Args)...);
}
};
Expand Down
2 changes: 1 addition & 1 deletion stl/inc/xutility
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ template <class _Ty, class... _Types,
class = void_t<decltype(::new (_STD declval<void*>()) _Ty(_STD declval<_Types>()...))>>
constexpr _Ty* construct_at(_Ty* const _Location, _Types&&... _Args) noexcept(
noexcept(::new (_Voidify_iter(_Location)) _Ty(_STD forward<_Types>(_Args)...))) /* strengthened */ {
return ::new (_Voidify_iter(_Location)) _Ty(_STD forward<_Types>(_Args)...);
_MSVC_CONSTEXPR return ::new (_Voidify_iter(_Location)) _Ty(_STD forward<_Types>(_Args)...);
}
#endif // _HAS_CXX20

Expand Down
4 changes: 4 additions & 0 deletions stl/inc/yvals_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,5 +1546,9 @@ compiler option, or define _ALLOW_RTCc_IN_STL to acknowledge that you have recei
#define _STL_INTERNAL_STATIC_ASSERT(...)
#endif // _ENABLE_STL_INTERNAL_CHECK

#ifndef _MSVC_CONSTEXPR // TRANSITION, VS2022v17.3p2
#define _MSVC_CONSTEXPR

@miscco Michael Schellenberger Costa (miscco) Apr 18, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we move that to the other custom attributes? Even if it has no value right now?

@CaseyCarter Casey Carter (CaseyCarter) Apr 18, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Does it need to be now, or would a followup be ok? I plan a followup to better integrate this with #2649 (move _HAS_MSVC_ATTRIBUTE to VCRuntime so it's used consistently for all of the _MSVC_MEOW attribute macros) and I'll bring it all together then.

@miscco Michael Schellenberger Costa (miscco) Apr 19, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Not a hill I would die on.

It is a bit icky to add something with the goal to clean it up afterwards, but I can appreciate that it has a dependency on VCRuntime so its fine by me

@CaseyCarter Casey Carter (CaseyCarter) Apr 19, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It is a bit icky to add something with the goal to clean it up afterwards, but I can appreciate that it has a dependency on VCRuntime so its fine by me

I'm also trying to avoid repeated CI cycles as things move back-and-forth between PRs, and trying to keep the compiler Devs unblocked. This is correct but not in the final form we'd like, which I'm happy to call good enough to decouple future library work from the ongoing compiler PR.

#endif

#endif // _STL_COMPILER_PREPROCESSOR
#endif // _YVALS_CORE_H_