user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rustup to rustc 1.39.0-nightly (6e19f3f38 2019-09-06)

Browse source
This commit is contained in:
bjorn3 2019-09-07 10:51:00 +02:00
parent a2e905f22d
commit bfb49e7d19
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/constant.rs
View file

@ -206,7 +206,7 @@ fn data_id_for_static(
linkage: Linkage,
) -> DataId {
let instance = Instance::mono(tcx, def_id);
let symbol_name = tcx.symbol_name(instance).as_str();
let symbol_name = tcx.symbol_name(instance).name.as_str();
let ty = instance.ty(tcx);
let is_mutable = if tcx.is_mutable_static(def_id) {
true
@ -318,19 +318,19 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut Module<impl Backend>, cx: &mu
let mut data_ctx = DataContext::new();
let mut bytes = alloc.bytes.to_vec();
let mut bytes = alloc.inspect_with_undef_and_ptr_outside_interpreter(0..alloc.len()).to_vec();
// The machO backend of faerie doesn't align data objects correctly unless we do this.
while bytes.len() as u64 % 16 != 0 {
bytes.push(0xde);
}
data_ctx.define(bytes.into_boxed_slice());
for &(offset, (_tag, reloc)) in alloc.relocations.iter() {
for &(offset, (_tag, reloc)) in alloc.relocations().iter() {
let addend = {
let endianness = tcx.data_layout.endian;
let offset = offset.bytes() as usize;
let ptr_size = tcx.data_layout.pointer_size;
let bytes = &alloc.bytes[offset..offset + ptr_size.bytes() as usize];
let bytes = &alloc.inspect_with_undef_and_ptr_outside_interpreter(offset..offset + ptr_size.bytes() as usize);
read_target_uint(endianness, bytes).unwrap()
};