avoid phi node for pointers flowing into Vec appends
This commit is contained in:
parent
e6071522db
commit
468eb45b3f
3 changed files with 40 additions and 4 deletions
|
|
@ -448,9 +448,11 @@ impl<T> [T] {
|
|||
// SAFETY:
|
||||
// allocated above with the capacity of `s`, and initialize to `s.len()` in
|
||||
// ptr::copy_to_non_overlapping below.
|
||||
unsafe {
|
||||
s.as_ptr().copy_to_nonoverlapping(v.as_mut_ptr(), s.len());
|
||||
v.set_len(s.len());
|
||||
if s.len() > 0 {
|
||||
unsafe {
|
||||
s.as_ptr().copy_to_nonoverlapping(v.as_mut_ptr(), s.len());
|
||||
v.set_len(s.len());
|
||||
}
|
||||
}
|
||||
v
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2818,7 +2818,11 @@ impl<T, A: Allocator> Vec<T, A> {
|
|||
let count = other.len();
|
||||
self.reserve(count);
|
||||
let len = self.len();
|
||||
unsafe { ptr::copy_nonoverlapping(other as *const T, self.as_mut_ptr().add(len), count) };
|
||||
if count > 0 {
|
||||
unsafe {
|
||||
ptr::copy_nonoverlapping(other as *const T, self.as_mut_ptr().add(len), count)
|
||||
};
|
||||
}
|
||||
self.len += count;
|
||||
}
|
||||
|
||||
|
|
|
|||
30
tests/codegen-llvm/lib-optimizations/append-elements.rs
Normal file
30
tests/codegen-llvm/lib-optimizations/append-elements.rs
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
//@ compile-flags: -O -Zmerge-functions=disabled
|
||||
//@ min-llvm-version: 21
|
||||
#![crate_type = "lib"]
|
||||
|
||||
//! Check that a temporary intermediate allocations can eliminated and replaced
|
||||
//! with memcpy forwarding.
|
||||
//! This requires Vec code to be structured in a way that avoids phi nodes from the
|
||||
//! zero-capacity length flowing into the memcpy arguments.
|
||||
|
||||
// CHECK-LABEL: @vec_append_with_temp_alloc
|
||||
#[no_mangle]
|
||||
pub fn vec_append_with_temp_alloc(dst: &mut Vec<u8>, src: &[u8]) {
|
||||
// CHECK-NOT: call void @llvm.memcpy
|
||||
// CHECK: call void @llvm.memcpy.{{.*}}%dst.i{{.*}}%src.0
|
||||
// CHECK-NOT: call void @llvm.memcpy
|
||||
let temp = src.to_vec();
|
||||
dst.extend(&temp);
|
||||
// CHECK: ret
|
||||
}
|
||||
|
||||
// CHECK-LABEL: @string_append_with_temp_alloc
|
||||
#[no_mangle]
|
||||
pub fn string_append_with_temp_alloc(dst: &mut String, src: &str) {
|
||||
// CHECK-NOT: call void @llvm.memcpy
|
||||
// CHECK: call void @llvm.memcpy.{{.*}}%dst.i{{.*}}%src.0
|
||||
// CHECK-NOT: call void @llvm.memcpy
|
||||
let temp = src.to_string();
|
||||
dst.push_str(&temp);
|
||||
// CHECK: ret
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue