adjust offset_from logic: check that both pointers are in-bounds

2022-03-10 18:30:32 -05:00
parent 458262b131
commit 63ed8e41ce
6 changed files with 100 additions and 46 deletions
--- a/compiler/rustc_const_eval/src/interpret/memory.rs
+++ b/compiler/rustc_const_eval/src/interpret/memory.rs
@@ -385,9 +385,9 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
                CheckInAllocMsg::DerefTest | CheckInAllocMsg::MemoryAccessTest => {
                    AllocCheck::Dereferenceable
                }
-                CheckInAllocMsg::PointerArithmeticTest | CheckInAllocMsg::InboundsTest => {
-                    AllocCheck::Live
-                }
+                CheckInAllocMsg::PointerArithmeticTest
+                | CheckInAllocMsg::OffsetFromTest
+                | CheckInAllocMsg::InboundsTest => AllocCheck::Live,
            };
            let (size, align) = self.get_size_and_align(alloc_id, check)?;
            Ok((size, align, ()))