From 53b53c77d9f502e8528c567a9be2338b022b2831 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 27 Sep 2018 05:59:34 +0000 Subject: [PATCH 1/2] Bump cranelift from `8a79275` to `0199e3d` Bumps [cranelift](https://github.com/CraneStation/cranelift) from `8a79275` to `0199e3d`. - [Release notes](https://github.com/CraneStation/cranelift/releases) - [Commits](https://github.com/CraneStation/cranelift/compare/8a79275d8900266a42a97890ecde5264a9caa295...0199e3d82845b5a49769b326d0c520a4c7b62901) Signed-off-by: dependabot[bot] --- Cargo.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b986be61f4c..6d5b3afa336 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,7 +90,7 @@ dependencies = [ [[package]] name = "cranelift" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "cranelift-frontend 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", @@ -99,7 +99,7 @@ dependencies = [ [[package]] name = "cranelift-bforest" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-entity 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", ] @@ -107,7 +107,7 @@ dependencies = [ [[package]] name = "cranelift-codegen" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-bforest 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "cranelift-codegen-meta 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", @@ -121,17 +121,17 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" [[package]] name = "cranelift-entity" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" [[package]] name = "cranelift-faerie" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "cranelift-module 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", @@ -144,7 +144,7 @@ dependencies = [ [[package]] name = "cranelift-frontend" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -154,7 +154,7 @@ dependencies = [ [[package]] name = "cranelift-module" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "cranelift-entity 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", @@ -165,7 +165,7 @@ dependencies = [ [[package]] name = "cranelift-native" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "raw-cpuid 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -175,7 +175,7 @@ dependencies = [ [[package]] name = "cranelift-simplejit" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "cranelift-module 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", From 0c42107ea6f63cc1a4d6fcf86d62579a5713aabf Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Thu, 27 Sep 2018 19:19:16 +0200 Subject: [PATCH 2/2] EntityMap got renamed to SecondaryMap --- src/pretty_clif.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pretty_clif.rs b/src/pretty_clif.rs index 08e685841aa..53e0d5cd1ce 100644 --- a/src/pretty_clif.rs +++ b/src/pretty_clif.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use std::fmt; -use cranelift::codegen::entity::EntityMap; +use cranelift::codegen::entity::SecondaryMap; use cranelift::codegen::write::{FuncWriter, PlainWriter}; use crate::prelude::*; @@ -14,7 +14,7 @@ fn write_instruction( &mut self, w: &mut dyn fmt::Write, func: &Function, - aliases: &EntityMap>, + aliases: &SecondaryMap>, isa: Option<&dyn isa::TargetIsa>, inst: Inst, indent: usize,