Skip to content

[lldb] Use llvm::bit_ceil (NFC) #138723

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
merged 1 commit into from
May 6, 2025
Merged

[lldb] Use llvm::bit_ceil (NFC) #138723

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
12 changes: 1 addition & 11 deletions lldb/source/Breakpoint/WatchpointAlgorithms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,6 @@ WatchpointAlgorithms::AtomizeWatchpointRequest(
return resources;
}

// This should be `std::bit_ceil(aligned_size)` but
// that requires C++20.
// Calculates the smallest integral power of two that is not smaller than x.
static uint64_t bit_ceil(uint64_t input) {
if (input <= 1 || llvm::popcount(input) == 1)
return input;

return 1ULL << (64 - llvm::countl_zero(input));
}

/// Convert a user's watchpoint request (\a user_addr and \a user_size)
/// into hardware watchpoints, for a target that can watch a power-of-2
/// region of memory (1, 2, 4, 8, etc), aligned to that same power-of-2
Expand Down Expand Up @@ -102,7 +92,7 @@ WatchpointAlgorithms::PowerOf2Watchpoints(addr_t user_addr, size_t user_size,
/// Round up \a user_size to the next power-of-2 size
/// user_size == 8 -> aligned_size == 8
/// user_size == 9 -> aligned_size == 16
aligned_size = bit_ceil(aligned_size);
aligned_size = llvm::bit_ceil(aligned_size);

addr_t aligned_start = user_addr & ~(aligned_size - 1);

Expand Down
Loading