Skip to content

[v636] Fix mac-beta builds after the latest update#21376

Draft
devajithvs wants to merge 8 commits intoroot-project:v6-36-00-patchesfrom
devajithvs:mac-beta-6.36
Draft

[v636] Fix mac-beta builds after the latest update#21376
devajithvs wants to merge 8 commits intoroot-project:v6-36-00-patchesfrom
devajithvs:mac-beta-6.36

Conversation

@devajithvs
Copy link
Contributor

@devajithvs devajithvs commented Feb 25, 2026

Backport __builtin_clzg implementation in Clang: llvm/llvm-project@c1c2551a2876f.

This along with the other backports fixes mac-beta build on v6.36.

TODO: Add new llvm tag.

This Pull request:

Changes or fixes:

Checklist:

  • tested changes locally
  • updated the docs (if necessary)

This PR fixes #

@devajithvs devajithvs self-assigned this Feb 25, 2026
@devajithvs devajithvs added the clean build Ask CI to do non-incremental build on PR label Feb 25, 2026
@devajithvs devajithvs closed this Feb 25, 2026
@devajithvs devajithvs reopened this Feb 25, 2026
@github-actions
Copy link

github-actions bot commented Feb 25, 2026

Test Results

    16 files      16 suites   2d 10h 19m 59s ⏱️
 2 747 tests  2 745 ✅ 0 💤 2 ❌
42 454 runs  42 452 ✅ 0 💤 2 ❌

For more details on these failures, see this check.

Results for commit 45b6e9b.

♻️ This comment has been updated with latest results.

@hahnjo
Copy link
Member

hahnjo commented Feb 26, 2026

Next errors when building std:

  While building module 'Core':
  While building module 'std' imported from input_line_1:1:
  In file included from <module-includes>:32:
  In file included from /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/type_traits:487:
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__type_traits/is_convertible.h:32:99: error: '_Tp' does not refer to a value
  struct _LIBCPP_NO_SPECIALIZATIONS is_nothrow_convertible : bool_constant<__is_nothrow_convertible(_Tp, _Up)> {};
                                                                                                    ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__type_traits/is_convertible.h:31:17: note: declared here
  template <class _Tp, class _Up>
                  ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__type_traits/is_convertible.h:32:104: error: '_Up' does not refer to a value
  struct _LIBCPP_NO_SPECIALIZATIONS is_nothrow_convertible : bool_constant<__is_nothrow_convertible(_Tp, _Up)> {};
                                                                                                         ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__type_traits/is_convertible.h:31:28: note: declared here
  template <class _Tp, class _Up>
                             ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__type_traits/is_convertible.h:35:102: error: '_Tp' does not refer to a value
  _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_nothrow_convertible_v = __is_nothrow_convertible(_Tp, _Up);
                                                                                                       ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__type_traits/is_convertible.h:34:17: note: declared here
  template <class _Tp, class _Up>
                  ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__type_traits/is_convertible.h:35:107: error: '_Up' does not refer to a value
  _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_nothrow_convertible_v = __is_nothrow_convertible(_Tp, _Up);
                                                                                                            ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__type_traits/is_convertible.h:34:28: note: declared here
  template <class _Tp, class _Up>
                             ^

and

  While building module 'Core':
  While building module 'std' imported from input_line_1:1:
  In file included from <module-includes>:156:
  In file included from /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/algorithm:1850:
  In file included from /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__algorithm/count.h:16:
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__bit/popcount.h:27:10: error: use of undeclared identifier '__builtin_popcountg'
    return __builtin_popcountg(__t);
           ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__stop_token/atomic_unique_lock.h:31:22: note: in instantiation of function template specialization 'std::__popcount<unsigned long long>' requested here
    static_assert(std::__popcount(static_cast<unsigned long long>(_LockedBit)) == 1,
                       ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__stop_token/atomic_unique_lock.h:31:17: error: static assertion expression is not an integral constant expression
    static_assert(std::__popcount(static_cast<unsigned long long>(_LockedBit)) == 1,
                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

overmighty and others added 7 commits February 26, 2026 14:37
Fixes #82058.

(cherry picked from commit 21d83324fbdbd91de0115d48f3b55979f57807b7)
Fixes #83075, fixes #83076.

(cherry picked from commit c1c2551a2876f536b5a06f48fa809aeedbc3d7ba)
…++ (#80436)

GCC 13 has implemented this builtin.

(cherry picked from commit 9cc2122bf5a81f7063c2a32b2cb78c8d615578a1)
Our implementation previously accepted signed arguments and performed
integer promotion on the argument. GCC's implementation requires an
unsigned argument and does not perform integer promotion on it.

(cherry picked from commit fc8d48106387b8b79531902788ef93571f924da7)
… (#84318)

(cherry picked from commit 487cfbe494413e12123b55dead5ef8742ef49fb2)
Fixes warning: "space between quotes and suffix is deprecated in C++23 [-Wdeprecated-literal-operator]"

(cherry picked from commit 55ccbd4)
This gets rid of the deprecation warning about operator ""

(cherry picked from commit ae939b5)
@devajithvs devajithvs marked this pull request as draft February 26, 2026 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clean build Ask CI to do non-incremental build on PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants