diff --git a/Cargo.lock b/Cargo.lock index 022c0278e0..05cee74700 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2407,9 +2407,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" +checksum = "abdf64625ea14dd2a89d8076aaa4059a8380163dce34b978ddda25c403afe241" dependencies = [ "fxhash", "log", diff --git a/cranelift/codegen/Cargo.toml b/cranelift/codegen/Cargo.toml index bb42516188..deae0cb782 100644 --- a/cranelift/codegen/Cargo.toml +++ b/cranelift/codegen/Cargo.toml @@ -25,7 +25,7 @@ serde = { version = "1.0.94", features = ["derive"], optional = true } bincode = { version = "1.2.1", optional = true } gimli = { workspace = true, features = ["write"], optional = true } smallvec = { workspace = true } -regalloc2 = { version = "0.5.1", features = ["checker"] } +regalloc2 = { version = "0.6.0", features = ["checker"] } souper-ir = { version = "2.1.0", optional = true } sha2 = { version = "0.10.2", optional = true } # It is a goal of the cranelift-codegen crate to have minimal external dependencies. diff --git a/cranelift/codegen/src/machinst/vcode.rs b/cranelift/codegen/src/machinst/vcode.rs index 1e787ed301..81aaf54862 100644 --- a/cranelift/codegen/src/machinst/vcode.rs +++ b/cranelift/codegen/src/machinst/vcode.rs @@ -27,7 +27,7 @@ use crate::trace; use crate::CodegenError; use crate::ValueLocRange; use regalloc2::{ - Edit, Function as RegallocFunction, InstOrEdit, InstRange, Operand, OperandKind, PReg, PRegSet, + Edit, Function as RegallocFunction, InstOrEdit, InstRange, Operand, OperandKind, PRegSet, RegClass, VReg, }; @@ -1316,10 +1316,6 @@ impl RegallocFunction for VCode { &self.debug_value_labels[..] } - fn is_pinned_vreg(&self, vreg: VReg) -> Option { - pinned_vreg_to_preg(vreg) - } - fn spillslot_size(&self, regclass: RegClass) -> usize { self.abi.get_spillslot_size(regclass) as usize } diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index ff6fff9bdb..4947df6480 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -563,6 +563,12 @@ criteria = "safe-to-deploy" delta = "0.5.0 -> 0.5.1" notes = "The Bytecode Alliance is the author of this crate." +[[audits.regalloc2]] +who = "Trevor Elliott " +criteria = "safe-to-deploy" +delta = "0.5.1 -> 0.6.0" +notes = "The Bytecode Alliance is the author of this crate." + [[audits.rustc-demangle]] who = "Alex Crichton " criteria = "safe-to-deploy" diff --git a/winch/codegen/Cargo.toml b/winch/codegen/Cargo.toml index 91d468c08b..ca9d0d97f0 100644 --- a/winch/codegen/Cargo.toml +++ b/winch/codegen/Cargo.toml @@ -17,7 +17,7 @@ target-lexicon = { workspace = true, features = ["std"] } # In the next iteration we'll factor out the common bits so that they can be consumed # by Cranelift and Winch. cranelift-codegen = { workspace = true } -regalloc2 = "0.5.1" +regalloc2 = "0.6.0" [features] x64 = ["cranelift-codegen/x86"]