bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge commit '03f01bbe90' into update_cg_clif-2020-11-01

Browse source
This commit is contained in:
bjorn3 2020-11-03 11:00:04 +01:00
commit 216c4ae463
53 changed files with 609 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_codegen_cranelift/src/debuginfo/emit.rs
View file

@ -195,9 +195,7 @@ impl Writer for WriterRelocate {
});
self.write_udata(0, size)
}
_ => {
return Err(gimli::write::Error::UnsupportedPointerEncoding(eh_pe));
}
_ => Err(gimli::write::Error::UnsupportedPointerEncoding(eh_pe)),
},
}
}

4
compiler/rustc_codegen_cranelift/src/debuginfo/line_info.rs
View file

@ -49,7 +49,7 @@ fn osstr_as_utf8_bytes(path: &OsStr) -> &[u8] {
pub(crate) const MD5_LEN: usize = 16;
pub fn make_file_info(hash: SourceFileHash) -> Option<FileInfo> {
pub(crate) fn make_file_info(hash: SourceFileHash) -> Option<FileInfo> {
if hash.kind == SourceFileHashAlgorithm::Md5 {
let mut buf = [0u8; MD5_LEN];
buf.copy_from_slice(hash.hash_bytes());
@ -190,7 +190,7 @@ impl<'tcx> DebugContext<'tcx> {
if current_file_changed {
let file_id = line_program_add_file(line_program, line_strings, &file);
line_program.row().file = file_id;
last_file = Some(file.clone());
last_file = Some(file);
}
line_program.row().line = line;

1
compiler/rustc_codegen_cranelift/src/debuginfo/unwind.rs
View file

@ -55,6 +55,7 @@ impl<'tcx> UnwindContext<'tcx> {
UnwindInfo::WindowsX64(_) => {
// FIXME implement this
}
unwind_info => unimplemented!("{:?}", unwind_info),
}
}