Skip to content

Commit c2590e6

Browse files
committed
Auto merge of rust-lang#102535 - scottmcm:optimize-split-at-partition-point, r=thomcc
Tell LLVM that `partition_point` returns a valid fencepost This was already done for a successful `binary_search`, but this way `partition_point` can get similar optimizations. Demonstration that nightly can't do this optimization today, and leaves in the panicking path: <https://play.rust-lang.org/?version=nightly&mode=release&edition=2021&gist=e1074cd2faf5f68e49cffd728ded243a> r? `@thomcc`
2 parents 47b2eee + c7af338 commit c2590e6

File tree

2 files changed

+32
-3
lines changed

2 files changed

+32
-3
lines changed

Diff for: library/core/src/slice/mod.rs

+12-3
Original file line numberDiff line numberDiff line change
@@ -2426,15 +2426,20 @@ impl<T> [T] {
24262426
where
24272427
F: FnMut(&'a T) -> Ordering,
24282428
{
2429+
// INVARIANTS:
2430+
// - 0 <= left <= left + size = right <= self.len()
2431+
// - f returns Less for everything in self[..left]
2432+
// - f returns Greater for everything in self[right..]
24292433
let mut size = self.len();
24302434
let mut left = 0;
24312435
let mut right = size;
24322436
while left < right {
24332437
let mid = left + size / 2;
24342438

2435-
// SAFETY: the call is made safe by the following invariants:
2436-
// - `mid >= 0`
2437-
// - `mid < size`: `mid` is limited by `[left; right)` bound.
2439+
// SAFETY: the while condition means `size` is strictly positive, so
2440+
// `size/2 < size`. Thus `left + size/2 < left + size`, which
2441+
// coupled with the `left + size <= self.len()` invariant means
2442+
// we have `left + size/2 < self.len()`, and this is in-bounds.
24382443
let cmp = f(unsafe { self.get_unchecked(mid) });
24392444

24402445
// The reason why we use if/else control flow rather than match
@@ -2452,6 +2457,10 @@ impl<T> [T] {
24522457

24532458
size = right - left;
24542459
}
2460+
2461+
// SAFETY: directly true from the overall invariant.
2462+
// Note that this is `<=`, unlike the assume in the `Ok` path.
2463+
unsafe { crate::intrinsics::assume(left <= self.len()) };
24552464
Err(left)
24562465
}
24572466

Diff for: src/test/codegen/binary-search-index-no-bound-check.rs

+20
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,23 @@ pub fn binary_search_index_no_bounds_check(s: &[u8]) -> u8 {
1616
42
1717
}
1818
}
19+
20+
// Similarly, check that `partition_point` is known to return a valid fencepost.
21+
22+
// CHECK-LABEL: @unknown_split
23+
#[no_mangle]
24+
pub fn unknown_split(x: &[i32], i: usize) -> (&[i32], &[i32]) {
25+
// This just makes sure that the subsequent function is looking for the
26+
// absence of something that might actually be there.
27+
28+
// CHECK: call core::panicking::panic
29+
x.split_at(i)
30+
}
31+
32+
// CHECK-LABEL: @partition_point_split_no_bounds_check
33+
#[no_mangle]
34+
pub fn partition_point_split_no_bounds_check(x: &[i32], needle: i32) -> (&[i32], &[i32]) {
35+
// CHECK-NOT: call core::panicking::panic
36+
let i = x.partition_point(|p| p < &needle);
37+
x.split_at(i)
38+
}

0 commit comments

Comments
 (0)