Merge pull request #1363 from bjorn3/update_cranelift

Update to Cranelift 0.94
rust-lang · Mar 21, 2023 · 74e8659 · 74e8659
2 parents a040947 + b15fd79
commit 74e8659
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 85 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,15 +15,15 @@ crate-type = ["dylib"]
 
 [dependencies]
 # These have to be in sync with each other
-cranelift-codegen = { version = "0.93", features = ["unwind", "all-arch"] }
-cranelift-frontend = { version = "0.93" }
-cranelift-module = { version = "0.93" }
-cranelift-native = { version = "0.93" }
-cranelift-jit = { version = "0.93", optional = true }
-cranelift-object = { version = "0.93" }
+cranelift-codegen = { version = "0.94", features = ["unwind", "all-arch"] }
+cranelift-frontend = { version = "0.94" }
+cranelift-module = { version = "0.94" }
+cranelift-native = { version = "0.94" }
+cranelift-jit = { version = "0.94", optional = true }
+cranelift-object = { version = "0.94" }
 target-lexicon = "0.12.0"
-gimli = { version = "0.26.0", default-features = false, features = ["write"]}
-object = { version = "0.29.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
+gimli = { version = "0.27.2", default-features = false, features = ["write"]}
+object = { version = "0.30.3", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
 
 indexmap = "1.9.1"
 libloading = { version = "0.7.3", optional = true }

diff --git a/src/base.rs b/src/base.rs
@@ -206,7 +206,7 @@ pub(crate) fn compile_fn(
             &clif_comments,
         );
 
-        if let Some(disasm) = &context.compiled_code().unwrap().disasm {
+        if let Some(disasm) = &context.compiled_code().unwrap().vcode {
             crate::pretty_clif::write_ir_file(
                 &cx.output_filenames,
                 &format!("{}.vcode", codegened_func.symbol_name),