mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #120387 - RalfJung:large-array-followup, r=oli-obk

Browse Source 
interpret/memory: fix safety comment for large array memset optimization

Also fix the doc comment for `check_and_deref_ptr`.
This commit is contained in:
Guillaume Gomez 2024-01-30 11:19:14 +01:00 committed by GitHub
commit e0e96a1829
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_const_eval/src/interpret/memory.rs
View File

@ -396,7 +396,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
/// to the allocation it points to. Supports both shared and mutable references, as the actual /// to the allocation it points to. Supports both shared and mutable references, as the actual
/// checking is offloaded to a helper closure. /// checking is offloaded to a helper closure.
/// ///
/// If this returns `None`, the size is 0; it can however return `Some` even for size 0. /// Returns `None` if and only if the size is 0.
fn check_and_deref_ptr<T>( fn check_and_deref_ptr<T>(
&self, &self,
ptr: Pointer<Option<M::Provenance>>, ptr: Pointer<Option<M::Provenance>>,
@ -1214,10 +1214,9 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
let size_in_bytes = size.bytes_usize(); let size_in_bytes = size.bytes_usize();
// For particularly large arrays (where this is perf-sensitive) it's common that // For particularly large arrays (where this is perf-sensitive) it's common that
// we're writing a single byte repeatedly. So, optimize that case to a memset. // we're writing a single byte repeatedly. So, optimize that case to a memset.
if size_in_bytes == 1 && num_copies >= 1 { if size_in_bytes == 1 {
// SAFETY: `src_bytes` would be read from anyway by copies below (num_copies >= 1). debug_assert!(num_copies >= 1); // we already handled the zero-sized cases above.
// Since size_in_bytes = 1, then the `init.no_bytes_init()` check above guarantees // SAFETY: `src_bytes` would be read from anyway by `copy` below (num_copies >= 1).
// that this read at type `u8` is OK -- it must be an initialized byte.
let value = *src_bytes; let value = *src_bytes;
dest_bytes.write_bytes(value, (size * num_copies).bytes_usize()); dest_bytes.write_bytes(value, (size * num_copies).bytes_usize());
} else if src_alloc_id == dest_alloc_id { } else if src_alloc_id == dest_alloc_id {