@@ -165,7 +165,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
165165 ///
166166 /// This function can fail only if `ptr` points to an `extern static`.
167167 #[ inline]
168- pub fn global_base_pointer (
168+ pub fn global_root_pointer (
169169 & self ,
170170 ptr : Pointer < CtfeProvenance > ,
171171 ) -> InterpResult < ' tcx , Pointer < M :: Provenance > > {
@@ -178,7 +178,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
178178 bug ! ( "global memory cannot point to thread-local static" )
179179 }
180180 Some ( GlobalAlloc :: Static ( def_id) ) if self . tcx . is_foreign_item ( def_id) => {
181- return M :: extern_static_base_pointer ( self , def_id) ;
181+ return M :: extern_static_pointer ( self , def_id) ;
182182 }
183183 None => {
184184 assert ! (
@@ -189,7 +189,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
189189 _ => { }
190190 }
191191 // And we need to get the provenance.
192- M :: adjust_alloc_base_pointer ( self , ptr, M :: GLOBAL_KIND . map ( MemoryKind :: Machine ) )
192+ M :: adjust_alloc_root_pointer ( self , ptr, M :: GLOBAL_KIND . map ( MemoryKind :: Machine ) )
193193 }
194194
195195 pub fn fn_ptr ( & mut self , fn_val : FnVal < ' tcx , M :: ExtraFnVal > ) -> Pointer < M :: Provenance > {
@@ -203,9 +203,9 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
203203 id
204204 }
205205 } ;
206- // Functions are global allocations, so make sure we get the right base pointer.
206+ // Functions are global allocations, so make sure we get the right root pointer.
207207 // We know this is not an `extern static` so this cannot fail.
208- self . global_base_pointer ( Pointer :: from ( id) ) . unwrap ( )
208+ self . global_root_pointer ( Pointer :: from ( id) ) . unwrap ( )
209209 }
210210
211211 pub fn allocate_ptr (
@@ -246,7 +246,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
246246 ) ;
247247 let alloc = M :: adjust_allocation ( self , id, Cow :: Owned ( alloc) , Some ( kind) ) ?;
248248 self . memory . alloc_map . insert ( id, ( kind, alloc. into_owned ( ) ) ) ;
249- M :: adjust_alloc_base_pointer ( self , Pointer :: from ( id) , Some ( kind) )
249+ M :: adjust_alloc_root_pointer ( self , Pointer :: from ( id) , Some ( kind) )
250250 }
251251
252252 pub fn reallocate_ptr (
0 commit comments