Skip to content

Commit 10fba0b

Browse files
committed
Update to Cranelift 0.130
1 parent 720aed3 commit 10fba0b

3 files changed

Lines changed: 52 additions & 58 deletions

File tree

Cargo.lock

Lines changed: 38 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@ crate-type = ["dylib"]
88

99
[dependencies]
1010
# These have to be in sync with each other
11-
cranelift-codegen = { version = "0.130.0", default-features = false, features = ["std", "timing", "unwind", "all-native-arch"] }
12-
cranelift-frontend = { version = "0.130.0" }
13-
cranelift-module = { version = "0.130.0" }
14-
cranelift-native = { version = "0.130.0" }
15-
cranelift-jit = { version = "0.130.0", optional = true }
16-
cranelift-object = { version = "0.130.0" }
11+
cranelift-codegen = { version = "0.131.0", default-features = false, features = ["std", "timing", "unwind", "all-native-arch"] }
12+
cranelift-frontend = { version = "0.131.0" }
13+
cranelift-module = { version = "0.131.0" }
14+
cranelift-native = { version = "0.131.0" }
15+
cranelift-jit = { version = "0.131.0", optional = true }
16+
cranelift-object = { version = "0.131.0" }
1717
target-lexicon = "0.13"
1818
gimli = { version = "0.33", default-features = false, features = ["write"] }
19-
object = { version = "0.38.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
19+
object = { version = "0.39.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
2020

2121
indexmap = "2.0.0"
2222
libloading = { version = "0.9.0", optional = true }
2323
smallvec = "1.8.1"
2424

2525
[patch.crates-io]
2626
# Uncomment to use an unreleased version of cranelift
27-
#cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-43.0.0" }
28-
#cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-43.0.0" }
29-
#cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-43.0.0" }
30-
#cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-43.0.0" }
31-
#cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-43.0.0" }
32-
#cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-43.0.0" }
27+
#cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-44.0.0" }
28+
#cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-44.0.0" }
29+
#cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-44.0.0" }
30+
#cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-44.0.0" }
31+
#cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-44.0.0" }
32+
#cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-44.0.0" }
3333

3434
# Uncomment to use local checkout of cranelift
3535
#cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }

src/pretty_clif.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ use std::fmt;
6060
use std::io::Write;
6161

6262
use cranelift_codegen::entity::SecondaryMap;
63-
use cranelift_codegen::ir::Fact;
6463
use cranelift_codegen::ir::entities::AnyEntity;
6564
use cranelift_codegen::write::{FuncWriter, PlainWriter};
6665
use rustc_middle::ty::print::with_no_trimmed_paths;
@@ -182,13 +181,8 @@ impl FuncWriter for &'_ CommentWriter {
182181
_func: &Function,
183182
entity: AnyEntity,
184183
value: &dyn fmt::Display,
185-
maybe_fact: Option<&Fact>,
186184
) -> fmt::Result {
187-
if let Some(fact) = maybe_fact {
188-
write!(w, " {} ! {} = {}", entity, fact, value)?;
189-
} else {
190-
write!(w, " {} = {}", entity, value)?;
191-
}
185+
write!(w, " {} = {}", entity, value)?;
192186

193187
if let Some(comment) = self.entity_comments.get(&entity) {
194188
writeln!(w, " ; {}", comment.replace('\n', "\n; "))

0 commit comments

Comments
 (0)