diff options
| author | bors <bors@rust-lang.org> | 2022-09-21 00:41:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-21 00:41:33 +0000 |
| commit | 4ecfdfac51b159f68fce608792affb34a70e6f73 (patch) | |
| tree | 865094472832265f18c603b4c58f6484ce3e69a7 /src | |
| parent | 7743aa836ee16d04831a34ee1ff109bf9d411277 (diff) | |
| parent | 6dbd9a29c21db63e2c72f5e7f4f8b5ba58023875 (diff) | |
| download | rust-4ecfdfac51b159f68fce608792affb34a70e6f73.tar.gz rust-4ecfdfac51b159f68fce608792affb34a70e6f73.zip | |
Auto merge of #100214 - scottmcm:strict-range, r=thomcc
Optimize `array::IntoIter` `.into_iter()` on arrays was slower than it needed to be (especially compared to slice iterator) since it uses `Range<usize>`, which needs to handle degenerate ranges like `10..4`. This PR adds an internal `IndexRange` type that's like `Range<usize>` but with a safety invariant that means it doesn't need to worry about those cases -- it only handles `start <= end` -- and thus can give LLVM more information to optimize better. I added one simple demonstration of the improvement as a codegen test. (`vec::IntoIter` uses pointers instead of indexes, so doesn't have this problem, but that only works because its elements are boxed. `array::IntoIter` can't use pointers because that would keep it from being movable.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/codegen/slice-iter-len-eq-zero.rs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/test/codegen/slice-iter-len-eq-zero.rs b/src/test/codegen/slice-iter-len-eq-zero.rs index fd19e624cdd..1124028253d 100644 --- a/src/test/codegen/slice-iter-len-eq-zero.rs +++ b/src/test/codegen/slice-iter-len-eq-zero.rs @@ -1,5 +1,6 @@ // no-system-llvm // compile-flags: -O +// ignore-debug: the debug assertions add extra comparisons #![crate_type = "lib"] type Demo = [u8; 3]; @@ -12,3 +13,16 @@ pub fn slice_iter_len_eq_zero(y: std::slice::Iter<'_, Demo>) -> bool { // CHECK: ret i1 %2 y.len() == 0 } + +// CHECK-LABEL: @array_into_iter_len_eq_zero +#[no_mangle] +pub fn array_into_iter_len_eq_zero(y: std::array::IntoIter<Demo, 123>) -> bool { + // This should be able to just check that the indexes are equal, and not + // need any subtractions or comparisons to handle `start > end`. + + // CHECK-NOT: icmp + // CHECK-NOT: sub + // CHECK: %1 = icmp eq {{i16|i32|i64}} + // CHECK: ret i1 %1 + y.len() == 0 +} |
