@@ -127,7 +127,7 @@ impl<'gcc, 'tcx> StaticMethods for CodegenCx<'gcc, 'tcx> {
127
127
//
128
128
// We could remove this hack whenever we decide to drop macOS 10.10 support.
129
129
if self . tcx . sess . target . options . is_like_osx {
130
- // The `inspect` method is okay here because we checked relocations , and
130
+ // The `inspect` method is okay here because we checked for provenance , and
131
131
// because we are doing this access to inspect the final interpreter state
132
132
// (not as part of the interpreter execution).
133
133
//
@@ -296,17 +296,17 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
296
296
297
297
pub fn const_alloc_to_gcc < ' gcc , ' tcx > ( cx : & CodegenCx < ' gcc , ' tcx > , alloc : ConstAllocation < ' tcx > ) -> RValue < ' gcc > {
298
298
let alloc = alloc. inner ( ) ;
299
- let mut llvals = Vec :: with_capacity ( alloc. relocations ( ) . len ( ) + 1 ) ;
299
+ let mut llvals = Vec :: with_capacity ( alloc. provenance ( ) . len ( ) + 1 ) ;
300
300
let dl = cx. data_layout ( ) ;
301
301
let pointer_size = dl. pointer_size . bytes ( ) as usize ;
302
302
303
303
let mut next_offset = 0 ;
304
- for & ( offset, alloc_id) in alloc. relocations ( ) . iter ( ) {
304
+ for & ( offset, alloc_id) in alloc. provenance ( ) . iter ( ) {
305
305
let offset = offset. bytes ( ) ;
306
306
assert_eq ! ( offset as usize as u64 , offset) ;
307
307
let offset = offset as usize ;
308
308
if offset > next_offset {
309
- // This `inspect` is okay since we have checked that it is not within a relocation , it
309
+ // This `inspect` is okay since we have checked that it is not within a pointer with provenance , it
310
310
// is within the bounds of the allocation, and it doesn't affect interpreter execution
311
311
// (we inspect the result after interpreter execution). Any undef byte is replaced with
312
312
// some arbitrary byte value.
@@ -319,7 +319,7 @@ pub fn const_alloc_to_gcc<'gcc, 'tcx>(cx: &CodegenCx<'gcc, 'tcx>, alloc: ConstAl
319
319
read_target_uint ( dl. endian ,
320
320
// This `inspect` is okay since it is within the bounds of the allocation, it doesn't
321
321
// affect interpreter execution (we inspect the result after interpreter execution),
322
- // and we properly interpret the relocation as a relocation pointer offset.
322
+ // and we properly interpret the provenance as a relocation pointer offset.
323
323
alloc. inspect_with_uninit_and_ptr_outside_interpreter ( offset..( offset + pointer_size) ) ,
324
324
)
325
325
. expect ( "const_alloc_to_llvm: could not read relocation pointer" )
@@ -336,7 +336,7 @@ pub fn const_alloc_to_gcc<'gcc, 'tcx>(cx: &CodegenCx<'gcc, 'tcx>, alloc: ConstAl
336
336
}
337
337
if alloc. len ( ) >= next_offset {
338
338
let range = next_offset..alloc. len ( ) ;
339
- // This `inspect` is okay since we have check that it is after all relocations , it is
339
+ // This `inspect` is okay since we have check that it is after all provenance , it is
340
340
// within the bounds of the allocation, and it doesn't affect interpreter execution (we
341
341
// inspect the result after interpreter execution). Any undef byte is replaced with some
342
342
// arbitrary byte value.
0 commit comments