diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-04-16 17:54:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-16 17:54:46 +0200 |
| commit | 4971d9ffe4730acaa01e7ca71d9cf633a52bb720 (patch) | |
| tree | f973ac7cb1f8542df3f4abd4359fa7799a690437 /compiler/rustc_const_eval/src | |
| parent | 864ab0cc3636b4039d2d7f64df41f1e3e0ad3163 (diff) | |
| parent | 5b8b9cfaaac046d105a1d716b182a84dbd582678 (diff) | |
| download | rust-4971d9ffe4730acaa01e7ca71d9cf633a52bb720.tar.gz rust-4971d9ffe4730acaa01e7ca71d9cf633a52bb720.zip | |
Rollup merge of #124024 - RalfJung:interpret-comment, r=oli-obk
interpret: remove outdated comment In https://github.com/rust-lang/rust/pull/107756, allocation became generally fallible, so the "only panic if there is provenance" no longer applies. r? ``@oli-obk``
Diffstat (limited to 'compiler/rustc_const_eval/src')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/machine.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/memory.rs | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/machine.rs b/compiler/rustc_const_eval/src/interpret/machine.rs index be66ac548d3..3aeae5ebf6d 100644 --- 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 index ca2beb40ce8..fbb0907f7d0 100644 --- 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, |