Unrolled build for rust-lang#124024

rust-timer · web-flow · commit 6ed8bcce5b7c · 2024-04-16T15:39:26.000-04:00
Rollup merge of rust-lang#124024 - RalfJung:interpret-comment, r=oli-obk interpret: remove outdated comment In rust-lang#107756, allocation became generally fallible, so the "only panic if there is provenance" no longer applies. r? ``@oli-obk``
diff --git a/compiler/rustc_const_eval/src/interpret/machine.rs b/compiler/rustc_const_eval/src/interpret/machine.rs
@@ -347,8 +347,6 @@ pub trait Machine<'mir, 'tcx: 'mir>: Sized {
     /// allocation (because a copy had to be done to adjust things), machine memory will
     /// cache the result. (This relies on `AllocMap::get_or` being able to add the
     /// owned allocation to the map even when the map is shared.)
-    ///
-    /// This must only fail if `alloc` contains provenance.
     fn adjust_allocation<'b>(
         ecx: &InterpCx<'mir, 'tcx, Self>,
         id: AllocId,
diff --git a/compiler/rustc_const_eval/src/interpret/memory.rs b/compiler/rustc_const_eval/src/interpret/memory.rs
@@ -227,7 +227,6 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         self.allocate_raw_ptr(alloc, kind)
     }
 
-    /// This can fail only if `alloc` contains provenance.
     pub fn allocate_raw_ptr(
         &mut self,
         alloc: Allocation,

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,6 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {`
`227`	`227`	`self.allocate_raw_ptr(alloc, kind)`
`228`	`228`	`}`
`229`	`229`
`230`		- /// This can fail only if `alloc` contains provenance.
`231`	`230`	`pub fn allocate_raw_ptr(`
`232`	`231`	`&mut self,`
`233`	`232`	`alloc: Allocation,`