bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move provenance checks out of interning method.

Browse source
This commit is contained in:
Camille GILLOT 2023-10-10 15:42:23 +00:00
parent ebc87bf567
commit ff6812cd20
3 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_const_eval/src/interpret/intern.rs
View file

@ -450,7 +450,7 @@ pub fn intern_const_alloc_recursive<
Ok(())
}
/// Intern `ret`, checking it references no other allocation.
/// Intern `ret`. This function assumes that `ret` references no other allocation.
#[instrument(level = "debug", skip(ecx))]
pub fn intern_const_alloc_for_constprop<
'mir,
@ -461,17 +461,7 @@ pub fn intern_const_alloc_for_constprop<
ecx: &mut InterpCx<'mir, 'tcx, M>,
ret: &MPlaceTy<'tcx>,
) -> InterpResult<'tcx, ()> {
let Some((size, _align)) = ecx.size_and_align_of_mplace(ret)? else {
throw_inval!(ConstPropNonsense)
};
let alloc_ref = ecx.get_ptr_alloc(ret.ptr(), size)?.unwrap();
// Do not try interning a value that contains provenance.
if alloc_ref.has_provenance() {
throw_inval!(ConstPropNonsense)
}
// remove allocation
// Move allocation to `tcx`.
let alloc_id = ret.ptr().provenance.unwrap();
let Some((_, mut alloc)) = ecx.memory.alloc_map.remove(&alloc_id) else {
// Pointer not found in local memory map. It is either a pointer to the global

2
compiler/rustc_const_eval/src/interpret/memory.rs
View file

@ -1011,7 +1011,7 @@ impl<'tcx, 'a, Prov: Provenance, Extra, Bytes: AllocBytes> AllocRef<'a, 'tcx, Pr
}
/// Returns whether the allocation has provenance anywhere in the range of the `AllocRef`.
pub(crate) fn has_provenance(&self) -> bool {
pub fn has_provenance(&self) -> bool {
!self.alloc.provenance().range_empty(self.range, &self.tcx)
}
}