From a713043360551c53b903c37831999de14a9ae123 Mon Sep 17 00:00:00 2001 From: Brandon Fish Date: Wed, 22 May 2019 23:46:38 -0500 Subject: [PATCH] Update translate_operator op argument --- Cargo.lock | 14 +++++++------- lib/clif-backend/src/code.rs | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 09bb0d4cb..a69746302 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -309,7 +309,7 @@ dependencies = [ [[package]] name = "cranelift-bforest" version = "0.30.0" -source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#f291d01c3a23282e1432c955beb6ef0ab34db7ea" +source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#50eaeb72cfd02e508d9416b599f0882767ced69f" dependencies = [ "cranelift-entity 0.30.0 (git+https://github.com/wasmerio/cranelift.git?branch=wasmer)", ] @@ -317,7 +317,7 @@ dependencies = [ [[package]] name = "cranelift-codegen" version = "0.30.0" -source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#f291d01c3a23282e1432c955beb6ef0ab34db7ea" +source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#50eaeb72cfd02e508d9416b599f0882767ced69f" dependencies = [ "cranelift-bforest 0.30.0 (git+https://github.com/wasmerio/cranelift.git?branch=wasmer)", "cranelift-codegen-meta 0.30.0 (git+https://github.com/wasmerio/cranelift.git?branch=wasmer)", @@ -331,7 +331,7 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" version = "0.30.0" -source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#f291d01c3a23282e1432c955beb6ef0ab34db7ea" +source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#50eaeb72cfd02e508d9416b599f0882767ced69f" dependencies = [ "cranelift-entity 0.30.0 (git+https://github.com/wasmerio/cranelift.git?branch=wasmer)", ] @@ -339,12 +339,12 @@ dependencies = [ [[package]] name = "cranelift-entity" version = "0.30.0" -source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#f291d01c3a23282e1432c955beb6ef0ab34db7ea" +source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#50eaeb72cfd02e508d9416b599f0882767ced69f" [[package]] name = "cranelift-frontend" version = "0.30.0" -source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#f291d01c3a23282e1432c955beb6ef0ab34db7ea" +source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#50eaeb72cfd02e508d9416b599f0882767ced69f" dependencies = [ "cranelift-codegen 0.30.0 (git+https://github.com/wasmerio/cranelift.git?branch=wasmer)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -354,7 +354,7 @@ dependencies = [ [[package]] name = "cranelift-native" version = "0.30.0" -source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#f291d01c3a23282e1432c955beb6ef0ab34db7ea" +source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#50eaeb72cfd02e508d9416b599f0882767ced69f" dependencies = [ "cranelift-codegen 0.30.0 (git+https://github.com/wasmerio/cranelift.git?branch=wasmer)", "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -364,7 +364,7 @@ dependencies = [ [[package]] name = "cranelift-wasm" version = "0.30.0" -source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#f291d01c3a23282e1432c955beb6ef0ab34db7ea" +source = "git+https://github.com/wasmerio/cranelift.git?branch=wasmer#50eaeb72cfd02e508d9416b599f0882767ced69f" dependencies = [ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-codegen 0.30.0 (git+https://github.com/wasmerio/cranelift.git?branch=wasmer)", diff --git a/lib/clif-backend/src/code.rs b/lib/clif-backend/src/code.rs index d18f53dc0..7f526d5a8 100644 --- a/lib/clif-backend/src/code.rs +++ b/lib/clif-backend/src/code.rs @@ -1113,9 +1113,8 @@ impl FunctionCodeGenerator for CraneliftFunctionCodeGenerator { target_config: self.target_config.clone(), clif_signatures: self.clif_signatures.clone(), }; - let opp = Operator::Unreachable; // Placeholder translate_operator( - opp, + op, builder, &mut self.func_translator.state, &mut function_environment,