mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove cfg-if dependency

Browse Source
This commit is contained in:
bjorn3 2020-09-16 16:57:52 +02:00
parent 55d4afd2ba
commit b8bbbe38d1
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -317,7 +317,6 @@ name = "rustc_codegen_cranelift"
version = "0.1.0"
dependencies = [
"ar",
"cfg-if",
"cranelift-codegen",
"cranelift-frontend",
"cranelift-module",

1
Cargo.toml
View File

@ -20,7 +20,6 @@ object = { version = "0.21.1", default-features = false, features = ["read", "st
ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "do_not_remove_cg_clif_ranlib" }
indexmap = "1.0.2"
cfg-if = "0.1.10"
libloading = { version = "0.6.0", optional = true }
# Uncomment to use local checkout of cranelift

45
src/debuginfo/unwind.rs
View File

@ -94,33 +94,34 @@ impl<'tcx> UnwindContext<'tcx> {
// =======================================================================
// Everything after this line up to the end of the file is loosly based on
// https://github.com/bytecodealliance/wasmtime/blob/4471a82b0c540ff48960eca6757ccce5b1b5c3e4/crates/jit/src/unwind/systemv.rs
cfg_if::cfg_if! {
if #[cfg(target_os = "macos")] {
// On macOS, `__register_frame` takes a pointer to a single FDE
let start = eh_frame.as_ptr();
let end = start.add(eh_frame.len());
let mut current = start;
#[cfg(target_os = "macos")]
{
// On macOS, `__register_frame` takes a pointer to a single FDE
let start = eh_frame.as_ptr();
let end = start.add(eh_frame.len());
let mut current = start;
// Walk all of the entries in the frame table and register them
while current < end {
let len = std::ptr::read::<u32>(current as *const u32) as usize;
// Walk all of the entries in the frame table and register them
while current < end {
let len = std::ptr::read::<u32>(current as *const u32) as usize;
// Skip over the CIE
if current != start {
__register_frame(current);
registrations.push(current as usize);
}
// Move to the next table entry (+4 because the length itself is not inclusive)
current = current.add(len + 4);
// Skip over the CIE
if current != start {
__register_frame(current);
registrations.push(current as usize);
}
} else {
// On other platforms, `__register_frame` will walk the FDEs until an entry of length 0
let ptr = eh_frame.as_ptr();
__register_frame(ptr);
registrations.push(ptr as usize);
// Move to the next table entry (+4 because the length itself is not inclusive)
current = current.add(len + 4);
}
}
#[cfg(not(target_os = "macos"))]
{
// On other platforms, `__register_frame` will walk the FDEs until an entry of length 0
let ptr = eh_frame.as_ptr();
__register_frame(ptr);
registrations.push(ptr as usize);
}
Some(UnwindRegistry {
_frame_table: eh_frame,