[WIP] Update to Cranelift 0.137

Author: bjorn3

Cargo.lock

@@ -8,28 +8,28 @@ crate-type = ["dylib"]
 
 [dependencies]
 # These have to be in sync with each other
-cranelift-codegen = { version = "0.135.0", default-features = false, features = ["std", "timing", "unwind", "all-native-arch"] }
-cranelift-frontend = { version = "0.135.0" }
-cranelift-module = { version = "0.135.0" }
-cranelift-native = { version = "0.135.0" }
-cranelift-jit = { version = "0.135.0", optional = true }
-cranelift-object = { version = "0.135.0", default-features = false }
+cranelift-codegen = { version = "0.137.0-rc.1", default-features = false, features = ["std", "timing", "unwind", "all-native-arch"] }
+cranelift-frontend = { version = "0.137.0-rc.1" }
+cranelift-module = { version = "0.137.0-rc.1" }
+cranelift-native = { version = "0.137.0-rc.1" }
+cranelift-jit = { version = "0.137.0-rc.1", optional = true }
+cranelift-object = { version = "0.137.0-rc.1", default-features = false }
 target-lexicon = "0.13"
 gimli = { version = "0.33", default-features = false, features = ["write"] }
-object = { version = "0.39.1", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
+object = { version = "0.40.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
 
 indexmap = "2.0.0"
 libloading = { version = "0.9.0", optional = true }
 smallvec = "1.8.1"
 
 # Uncomment to use an unreleased version of cranelift
 #[patch.crates-io]
-#cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-48.0.0" }
-#cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-48.0.0" }
-#cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-48.0.0" }
-#cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-48.0.0" }
-#cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-48.0.0" }
-#cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-48.0.0" }
+#cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-50.0.0" }
+#cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-50.0.0" }
+#cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-50.0.0" }
+#cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-50.0.0" }
+#cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-50.0.0" }
+#cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-50.0.0" }
 
 # Uncomment to use local checkout of cranelift
 #cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }

Cargo.toml

@@ -168,6 +168,7 @@ impl FunctionDebugContext {
 
         let mcr = context.compiled_code().unwrap();
         for &MachSrcLoc { start, end, loc } in mcr.buffer.get_srclocs_sorted() {
+            let loc = loc.as_abs();
             debug_context.dwarf.unit.line_program.row().address_offset = u64::from(start);
             if !loc.is_default() {
                 let source_loc = self.source_loc_set[loc.bits() as usize];

src/debuginfo/line_info.rs

@@ -1,6 +1,6 @@
 //! Unwind info generation (`.eh_frame`)
 
-use cranelift_codegen::FinalizedMachExceptionHandler;
+use cranelift_codegen::MachExceptionHandler;
 use cranelift_codegen::ir::Endianness;
 use cranelift_codegen::isa::unwind::UnwindInfo;
 use cranelift_module::DataId;
@@ -172,26 +172,19 @@ impl UnwindContext {
                         }
                         for &handler in call_site.exception_handlers {
                             match handler {
-                                FinalizedMachExceptionHandler::Tag(tag, landingpad) => {
-                                    match tag.as_u32() {
-                                        EXCEPTION_HANDLER_CLEANUP => {
-                                            gcc_except_table_data.call_sites.0.push(CallSite {
-                                                start: u64::from(call_site.ret_addr - 1),
-                                                length: 1,
-                                                landing_pad: u64::from(landingpad),
-                                                action_entry: None,
-                                            })
-                                        }
-                                        EXCEPTION_HANDLER_CATCH => {
-                                            gcc_except_table_data.call_sites.0.push(CallSite {
-                                                start: u64::from(call_site.ret_addr - 1),
-                                                length: 1,
-                                                landing_pad: u64::from(landingpad),
-                                                action_entry: Some(catch_action),
-                                            })
-                                        }
+                                MachExceptionHandler::Tag(tag, landingpad) => {
+                                    let landing_pad = u64::from(landingpad.as_offset());
+                                    let action_entry = match tag.as_u32() {
+                                        EXCEPTION_HANDLER_CLEANUP => None,
+                                        EXCEPTION_HANDLER_CATCH => Some(catch_action),
                                         _ => unreachable!(),
-                                    }
+                                    };
+                                    gcc_except_table_data.call_sites.0.push(CallSite {
+                                        start: u64::from(call_site.ret_addr - 1),
+                                        length: 1,
+                                        landing_pad,
+                                        action_entry,
+                                    });
                                 }
                                 _ => unreachable!(),
                             }