Skip to content
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

Add stdlib version check for C++20 #3754

Merged
merged 1 commit into from
Dec 17, 2023
Merged

Add stdlib version check for C++20 #3754

merged 1 commit into from
Dec 17, 2023

Conversation

phprus
Copy link
Contributor

@phprus phprus commented Dec 13, 2023

Possible fix #3745

Comment on lines 108 to 112
#if (FMT_CPLUSPLUS >= 202002L || \
(FMT_CPLUSPLUS >= 201709L && FMT_GCC_VERSION >= 1002)) && \
((!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 10) && \
(!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 10000) && \
(!FMT_MSC_VERSION || FMT_MSC_VERSION >= 1928))
Copy link
Contributor

Choose a reason for hiding this comment

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

What is the idea behind this change? Shall we enable FMT_CONSTEXPR20 only if is_constant_evaluated is available instead? Something like

#if defined(FMT_HAS_IS_CONSTANT_EVALUATED) &&                 \
    ((FMT_CPLUSPLUS >= 202002L) &&                            \
     (!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE > 9)) || \
    (FMT_CPLUSPLUS >= 201709L && FMT_GCC_VERSION >= 1002)
#  define FMT_CONSTEXPR20 constexpr

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Main idea: Enable C++20 constexpr only if stdlib support C++20.
The condition (!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE > 9) partially check stdlib C++20 features. I extended it for libcxx and MSVC.

FMT_CONSTEXPR20 enabled if compiler support C++20 AND the version of stdlib is modern to support C++20.

Choose a reason for hiding this comment

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

The compiler does not define _LIBCPP_VERSION in Android's case.
This will result in FMT_CONSTEXPR20 being incorrectly set to constexpr.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@hchataing

Try to find the __config file in the source code of your standard library and look at the value of the _LIBCPP_VERSION macro.

Or in repository, like this:
https://android.googlesource.com/platform/external/libcxx/+/refs/tags/android-cts-10.0_r15/include/__config#36

Choose a reason for hiding this comment

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

👍 I see # define _LIBCPP_VERSION 170000

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@hchataing
Interesting!
libcxx version 170000 fully supports C++20 and you shouldn't have issue #3745.

Can you compile and run the program:

#include <iostream>

int main()
{
    std::cerr << _LIBCPP_VERSION << std::endl;
    return 0;
}

in issue #3745 build environment?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should just go with enabling C++20 constexpr only if consteval is also available.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, I meant is_constant_evaluated because that's what causing the OP's problem.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@vitaut
Done.

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
@vitaut vitaut merged commit 923005b into fmtlib:master Dec 17, 2023
41 checks passed
@vitaut
Copy link
Contributor

vitaut commented Dec 17, 2023

Thanks!

@hchataing
Copy link

Sorry I did not have the time to validate the fix 😞 It looks like it should be working.
Thanks for the help !

happymonkey1 pushed a commit to happymonkey1/fmt that referenced this pull request Apr 7, 2024
Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

isfinite declared constexpr for c++20
3 participants