Skip to content

GH-49569: [CI][Python][C++] Add check targetting Apple clang on deciding whether to use std::bit_width or std::log2p1 #49570

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

Open
raulcd wants to merge 3 commits into
base: main
Choose a base branch
from
+12 −7
Open

GH-49569: [CI][Python][C++] Add check targetting Apple clang on deciding whether to use std::bit_width or std::log2p1 #49570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
066bf57
GH-49569: [CI][Python][C++] Add check for _LIBCPP_VERSION on deciding…
raulcd Mar 20, 2026
a982f19
Try using __apple_build_version__ instead of __clang__
raulcd Mar 20, 2026
4736f08
Add the change into other places we perform the check
raulcd Mar 20, 2026
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
3 changes: 2 additions & 1 deletion cpp/src/arrow/util/align_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ inline BitmapWordAlignParams BitmapWordAlign(const uint8_t* data, int64_t bit_of
int64_t length) {
// TODO: We can remove this condition once CRAN upgrades its macOS
// SDK from 11.3.
#if defined(__clang__) && !defined(__cpp_lib_bitops) && !defined(__EMSCRIPTEN__)
// __apple_build_version__ should be defined only on Apple clang
#if defined(__apple_build_version__) && !defined(__cpp_lib_bitops)
static_assert((ALIGN_IN_BYTES != 0) && ((ALIGN_IN_BYTES & (ALIGN_IN_BYTES - 1)) == 0),
"ALIGN_IN_BYTES should be a positive power of two");
#else
Expand Down
7 changes: 4 additions & 3 deletions cpp/src/arrow/util/bit_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,10 @@ static inline uint64_t TrailingBits(uint64_t v, int num_bits) {
static inline int Log2(uint64_t x) {
// DCHECK_GT(x, 0);

// TODO: We can remove this condition once CRAN upgrades its macOS
// SDK from 11.3.
#if defined(__clang__) && !defined(__cpp_lib_bitops) && !defined(__EMSCRIPTEN__)
// TODO: We can remove this condition once CRAN upgrades its macOS
// SDK from 11.3.
// __apple_build_version__ should be defined only on Apple clang
#if defined(__apple_build_version__) && !defined(__cpp_lib_bitops)
return std::log2p1(x - 1);
#else
return std::bit_width(x - 1);
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/util/rle_encoding_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,8 @@ TEST(BitRle, Random) {
}
// TODO: We can remove this condition once CRAN upgrades its macOS
// SDK from 11.3.
#if defined(__clang__) && !defined(__cpp_lib_bitops) && !defined(__EMSCRIPTEN__)
// __apple_build_version__ should be defined only on Apple clang
#if defined(__apple_build_version__) && !defined(__cpp_lib_bitops)
if (!CheckRoundTrip(values, std::log2p1(values.size()))) {
#else
if (!CheckRoundTrip(values, std::bit_width(values.size()))) {
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/parquet/chunker_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ uint64_t CalculateMask(int64_t min_chunk_size, int64_t max_chunk_size, int norm_
// by taking the floor(log2(target_size))
// TODO: We can remove this condition once CRAN upgrades its macOS
// SDK from 11.3.
#if defined(__clang__) && !defined(__cpp_lib_bitops) && !defined(__EMSCRIPTEN__)
// __apple_build_version__ should be defined only on Apple clang
#if defined(__apple_build_version__) && !defined(__cpp_lib_bitops)
auto target_bits = std::log2p1(static_cast<uint64_t>(target_size));
#else
auto target_bits = std::bit_width(static_cast<uint64_t>(target_size));
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/parquet/encoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,8 @@ void DeltaBitPackEncoder<DType>::FlushBlock() {
// See overflow comment above.
// TODO: We can remove this condition once CRAN upgrades its macOS
// SDK from 11.3.
#if defined(__clang__) && !defined(__cpp_lib_bitops) && !defined(__EMSCRIPTEN__)
// __apple_build_version__ should be defined only on Apple clang
#if defined(__apple_build_version__) && !defined(__cpp_lib_bitops)
const auto bit_width = bit_width_data[i] =
std::log2p1(static_cast<UT>(max_delta) - static_cast<UT>(min_delta));
#else
Expand Down
Loading