@@ -21,8 +21,9 @@ use rustc_target::abi::{Align, HasDataLayout, Size};
2121use crate :: const_eval:: CheckAlignment ;
2222
2323use super :: {
24- alloc_range, AllocId , AllocMap , AllocRange , Allocation , CheckInAllocMsg , GlobalAlloc , InterpCx ,
25- InterpResult , Machine , MayLeak , Pointer , PointerArithmetic , Provenance , Scalar ,
24+ alloc_range, AllocBytes , AllocId , AllocMap , AllocRange , Allocation , CheckInAllocMsg ,
25+ GlobalAlloc , InterpCx , InterpResult , Machine , MayLeak , Pointer , PointerArithmetic , Provenance ,
26+ Scalar ,
2627} ;
2728
2829#[ derive( Debug , PartialEq , Copy , Clone ) ]
@@ -114,16 +115,16 @@ pub struct Memory<'mir, 'tcx, M: Machine<'mir, 'tcx>> {
114115/// A reference to some allocation that was already bounds-checked for the given region
115116/// and had the on-access machine hooks run.
116117#[ derive( Copy , Clone ) ]
117- pub struct AllocRef < ' a , ' tcx , Prov : Provenance , Extra > {
118- alloc : & ' a Allocation < Prov , Extra > ,
118+ pub struct AllocRef < ' a , ' tcx , Prov : Provenance , Extra , Bytes : AllocBytes = Box < [ u8 ] > > {
119+ alloc : & ' a Allocation < Prov , Extra , Bytes > ,
119120 range : AllocRange ,
120121 tcx : TyCtxt < ' tcx > ,
121122 alloc_id : AllocId ,
122123}
123124/// A reference to some allocation that was already bounds-checked for the given region
124125/// and had the on-access machine hooks run.
125- pub struct AllocRefMut < ' a , ' tcx , Prov : Provenance , Extra > {
126- alloc : & ' a mut Allocation < Prov , Extra > ,
126+ pub struct AllocRefMut < ' a , ' tcx , Prov : Provenance , Extra , Bytes : AllocBytes = Box < [ u8 ] > > {
127+ alloc : & ' a mut Allocation < Prov , Extra , Bytes > ,
127128 range : AllocRange ,
128129 tcx : TyCtxt < ' tcx > ,
129130 alloc_id : AllocId ,
@@ -483,7 +484,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
483484 & self ,
484485 id : AllocId ,
485486 is_write : bool ,
486- ) -> InterpResult < ' tcx , Cow < ' tcx , Allocation < M :: Provenance , M :: AllocExtra > > > {
487+ ) -> InterpResult < ' tcx , Cow < ' tcx , Allocation < M :: Provenance , M :: AllocExtra , M :: Bytes > > > {
487488 let ( alloc, def_id) = match self . tcx . try_get_global_alloc ( id) {
488489 Some ( GlobalAlloc :: Memory ( mem) ) => {
489490 // Memory of a constant or promoted or anonymous memory referenced by a static.
@@ -526,14 +527,25 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
526527 )
527528 }
528529
530+ /// Get the base address for the bytes in an `Allocation` specified by the
531+ /// `AllocID` passed in; error if no such allocation exists.
532+ ///
533+ /// It is up to the caller to take sufficient care when using this address:
534+ /// there could be provenance or uninit memory in there, and other memory
535+ /// accesses could invalidate the exposed pointer.
536+ pub fn alloc_base_addr ( & self , id : AllocId ) -> InterpResult < ' tcx , * const u8 > {
537+ let alloc = self . get_alloc_raw ( id) ?;
538+ Ok ( alloc. base_addr ( ) )
539+ }
540+
529541 /// Gives raw access to the `Allocation`, without bounds or alignment checks.
530542/// The caller is responsible for calling the access hooks!
531543///
532544/// You almost certainly want to use `get_ptr_alloc`/`get_ptr_alloc_mut` instead.
533545fn get_alloc_raw (
534546 & self ,
535547 id : AllocId ,
536- ) -> InterpResult < ' tcx , & Allocation < M :: Provenance , M :: AllocExtra > > {
548+ ) -> InterpResult < ' tcx , & Allocation < M :: Provenance , M :: AllocExtra , M :: Bytes > > {
537549 // The error type of the inner closure here is somewhat funny. We have two
538550 // ways of "erroring": An actual error, or because we got a reference from
539551 // `get_global_alloc` that we can actually use directly without inserting anything anywhere.
@@ -569,7 +581,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
569581 ptr : Pointer < Option < M :: Provenance > > ,
570582 size : Size ,
571583 align : Align ,
572- ) -> InterpResult < ' tcx , Option < AllocRef < ' a , ' tcx , M :: Provenance , M :: AllocExtra > > > {
584+ ) -> InterpResult < ' tcx , Option < AllocRef < ' a , ' tcx , M :: Provenance , M :: AllocExtra , M :: Bytes > > >
585+ {
573586 let ptr_and_alloc = self . check_and_deref_ptr (
574587 ptr,
575588 size,
@@ -612,7 +625,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
612625fn get_alloc_raw_mut (
613626 & mut self ,
614627 id : AllocId ,
615- ) -> InterpResult < ' tcx , ( & mut Allocation < M :: Provenance , M :: AllocExtra > , & mut M ) > {
628+ ) -> InterpResult < ' tcx , ( & mut Allocation < M :: Provenance , M :: AllocExtra , M :: Bytes > , & mut M ) > {
616629 // We have "NLL problem case #3" here, which cannot be worked around without loss of
617630 // efficiency even for the common case where the key is in the map.
618631 // <https://rust-lang.github.io/rfcs/2094-nll.html#problem-case-3-conditional-control-flow-across-functions>
@@ -641,7 +654,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
641654 ptr : Pointer < Option < M :: Provenance > > ,
642655 size : Size ,
643656 align : Align ,
644- ) -> InterpResult < ' tcx , Option < AllocRefMut < ' a , ' tcx , M :: Provenance , M :: AllocExtra > > > {
657+ ) -> InterpResult < ' tcx , Option < AllocRefMut < ' a , ' tcx , M :: Provenance , M :: AllocExtra , M :: Bytes > > >
658+ {
645659 let parts = self . get_ptr_access ( ptr, size, align) ?;
646660 if let Some ( ( alloc_id, offset, prov) ) = parts {
647661 let tcx = * self . tcx ;
@@ -840,11 +854,11 @@ pub struct DumpAllocs<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> {
840854impl < ' a , ' mir , ' tcx , M : Machine < ' mir , ' tcx > > std:: fmt:: Debug for DumpAllocs < ' a , ' mir , ' tcx , M > {
841855 fn fmt ( & self , fmt : & mut std:: fmt:: Formatter < ' _ > ) -> std:: fmt:: Result {
842856 // Cannot be a closure because it is generic in `Prov`, `Extra`.
843- fn write_allocation_track_relocs < ' tcx , Prov : Provenance , Extra > (
857+ fn write_allocation_track_relocs < ' tcx , Prov : Provenance , Extra , Bytes : AllocBytes > (
844858 fmt : & mut std:: fmt:: Formatter < ' _ > ,
845859 tcx : TyCtxt < ' tcx > ,
846860 allocs_to_print : & mut VecDeque < AllocId > ,
847- alloc : & Allocation < Prov , Extra > ,
861+ alloc : & Allocation < Prov , Extra , Bytes > ,
848862 ) -> std:: fmt:: Result {
849863 for alloc_id in alloc. provenance ( ) . provenances ( ) . filter_map ( |prov| prov. get_alloc_id ( ) )
850864 {
@@ -912,7 +926,9 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> std::fmt::Debug for DumpAllocs<'a,
912926}
913927
914928/// Reading and writing.
915- impl < ' tcx , ' a , Prov : Provenance , Extra > AllocRefMut < ' a , ' tcx , Prov , Extra > {
929+ impl < ' tcx , ' a , Prov : Provenance , Extra , Bytes : AllocBytes >
930+ AllocRefMut < ' a , ' tcx , Prov , Extra , Bytes >
931+ {
916932 /// `range` is relative to this allocation reference, not the base of the allocation.
917933pub fn write_scalar ( & mut self , range : AllocRange , val : Scalar < Prov > ) -> InterpResult < ' tcx > {
918934 let range = self . range . subrange ( range) ;
@@ -937,7 +953,7 @@ impl<'tcx, 'a, Prov: Provenance, Extra> AllocRefMut<'a, 'tcx, Prov, Extra> {
937953 }
938954}
939955
940- impl < ' tcx , ' a , Prov : Provenance , Extra > AllocRef < ' a , ' tcx , Prov , Extra > {
956+ impl < ' tcx , ' a , Prov : Provenance , Extra , Bytes : AllocBytes > AllocRef < ' a , ' tcx , Prov , Extra , Bytes > {
941957 /// `range` is relative to this allocation reference, not the base of the allocation.
942958pub fn read_scalar (
943959 & self ,
0 commit comments