Skip to content

Commit 780597e

Browse files
committed
[WIP] Update to Cranelift 0.126
1 parent 53f8a7b commit 780597e

File tree

3 files changed

+73
-80
lines changed

3 files changed

+73
-80
lines changed

Cargo.lock

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

Cargo.toml

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

99
[dependencies]
1010
# These have to be in sync with each other
11-
cranelift-codegen = { version = "0.125.0", default-features = false, features = ["std", "timing", "unwind", "all-native-arch"] }
12-
cranelift-frontend = { version = "0.125.0" }
13-
cranelift-module = { version = "0.125.0" }
14-
cranelift-native = { version = "0.125.0" }
15-
cranelift-jit = { version = "0.125.0", optional = true }
16-
cranelift-object = { version = "0.125.0" }
11+
cranelift-codegen = { version = "0.126.0", default-features = false, features = ["std", "timing", "unwind", "all-native-arch"] }
12+
cranelift-frontend = { version = "0.126.0" }
13+
cranelift-module = { version = "0.126.0" }
14+
cranelift-native = { version = "0.126.0" }
15+
cranelift-jit = { version = "0.126.0", optional = true }
16+
cranelift-object = { version = "0.126.0" }
1717
target-lexicon = "0.13"
1818
gimli = { version = "0.32", default-features = false, features = ["write"] }
1919
object = { version = "0.37.3", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
@@ -24,12 +24,12 @@ 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-38.0.0" }
28-
#cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-38.0.0" }
29-
#cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-38.0.0" }
30-
#cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-38.0.0" }
31-
#cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-38.0.0" }
32-
#cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-38.0.0" }
27+
cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-39.0.0" }
28+
cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-39.0.0" }
29+
cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-39.0.0" }
30+
cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-39.0.0" }
31+
cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-39.0.0" }
32+
cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-39.0.0" }
3333

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

src/common.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ impl<'tcx> FunctionCx<'_, '_, 'tcx> {
388388
size,
389389
// The maximum value of ilog2 is 31 which will always fit in a u8.
390390
align_shift: align.ilog2().try_into().unwrap(),
391+
key: None,
391392
});
392393
Pointer::stack_slot(stack_slot)
393394
} else {
@@ -397,6 +398,7 @@ impl<'tcx> FunctionCx<'_, '_, 'tcx> {
397398
kind: StackSlotKind::ExplicitSlot,
398399
size: size + align,
399400
align_shift: abi_align.ilog2().try_into().unwrap(),
401+
key: None,
400402
});
401403
let base_ptr = self.bcx.ins().stack_addr(self.pointer_type, stack_slot, 0);
402404
let misalign_offset = self.bcx.ins().band_imm(base_ptr, i64::from(align - 1));

0 commit comments

Comments
 (0)