diff --git a/Cargo.lock b/Cargo.lock
index 28b6411febff..c8615405d0e6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -89,29 +89,29 @@ dependencies = [
 
 [[package]]
 name = "cranelift"
-version = "0.21.1"
-source = "git+https://github.com/CraneStation/cranelift.git#dcd54af61885eb5ba93da724120c101d55e3e9f9"
+version = "0.22.0"
+source = "git+https://github.com/CraneStation/cranelift.git#940e2545fd041a766a48316fab0fb079d139da23"
 dependencies = [
- "cranelift-codegen 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-frontend 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-frontend 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
 ]
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.21.1"
-source = "git+https://github.com/CraneStation/cranelift.git#dcd54af61885eb5ba93da724120c101d55e3e9f9"
+version = "0.22.0"
+source = "git+https://github.com/CraneStation/cranelift.git#940e2545fd041a766a48316fab0fb079d139da23"
 dependencies = [
- "cranelift-entity 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-entity 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.21.1"
-source = "git+https://github.com/CraneStation/cranelift.git#dcd54af61885eb5ba93da724120c101d55e3e9f9"
+version = "0.22.0"
+source = "git+https://github.com/CraneStation/cranelift.git#940e2545fd041a766a48316fab0fb079d139da23"
 dependencies = [
- "cranelift-bforest 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-codegen-meta 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-entity 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
+ "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)",
+ "cranelift-entity 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
  "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -120,21 +120,21 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.21.1"
-source = "git+https://github.com/CraneStation/cranelift.git#dcd54af61885eb5ba93da724120c101d55e3e9f9"
+version = "0.22.0"
+source = "git+https://github.com/CraneStation/cranelift.git#940e2545fd041a766a48316fab0fb079d139da23"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.21.1"
-source = "git+https://github.com/CraneStation/cranelift.git#dcd54af61885eb5ba93da724120c101d55e3e9f9"
+version = "0.22.0"
+source = "git+https://github.com/CraneStation/cranelift.git#940e2545fd041a766a48316fab0fb079d139da23"
 
 [[package]]
 name = "cranelift-faerie"
-version = "0.21.1"
-source = "git+https://github.com/CraneStation/cranelift.git#dcd54af61885eb5ba93da724120c101d55e3e9f9"
+version = "0.22.0"
+source = "git+https://github.com/CraneStation/cranelift.git#940e2545fd041a766a48316fab0fb079d139da23"
 dependencies = [
- "cranelift-codegen 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-module 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-module 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
  "faerie 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "goblin 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -143,41 +143,41 @@ dependencies = [
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.21.1"
-source = "git+https://github.com/CraneStation/cranelift.git#dcd54af61885eb5ba93da724120c101d55e3e9f9"
+version = "0.22.0"
+source = "git+https://github.com/CraneStation/cranelift.git#940e2545fd041a766a48316fab0fb079d139da23"
 dependencies = [
- "cranelift-codegen 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
 ]
 
 [[package]]
 name = "cranelift-module"
-version = "0.21.1"
-source = "git+https://github.com/CraneStation/cranelift.git#dcd54af61885eb5ba93da724120c101d55e3e9f9"
+version = "0.22.0"
+source = "git+https://github.com/CraneStation/cranelift.git#940e2545fd041a766a48316fab0fb079d139da23"
 dependencies = [
- "cranelift-codegen 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-entity 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-entity 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
  "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "cranelift-native"
-version = "0.21.1"
-source = "git+https://github.com/CraneStation/cranelift.git#dcd54af61885eb5ba93da724120c101d55e3e9f9"
+version = "0.22.0"
+source = "git+https://github.com/CraneStation/cranelift.git#940e2545fd041a766a48316fab0fb079d139da23"
 dependencies = [
- "cranelift-codegen 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
+ "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)",
  "target-lexicon 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "cranelift-simplejit"
-version = "0.21.1"
-source = "git+https://github.com/CraneStation/cranelift.git#dcd54af61885eb5ba93da724120c101d55e3e9f9"
+version = "0.22.0"
+source = "git+https://github.com/CraneStation/cranelift.git#940e2545fd041a766a48316fab0fb079d139da23"
 dependencies = [
- "cranelift-codegen 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-module 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-native 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-module 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-native 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
  "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
  "region 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -419,10 +419,10 @@ dependencies = [
  "ar 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "cranelift 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-faerie 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-module 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-simplejit 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-faerie 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-module 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-simplejit 0.22.0 (git+https://github.com/CraneStation/cranelift.git)",
  "faerie 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "target-lexicon 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -661,16 +661,16 @@ dependencies = [
 "checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
 "checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
 "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
-"checksum cranelift 0.21.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-bforest 0.21.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-codegen 0.21.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-codegen-meta 0.21.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-entity 0.21.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-faerie 0.21.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-frontend 0.21.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-module 0.21.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-native 0.21.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-simplejit 0.21.1 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
+"checksum cranelift 0.22.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
+"checksum cranelift-bforest 0.22.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
+"checksum cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
+"checksum cranelift-codegen-meta 0.22.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
+"checksum cranelift-entity 0.22.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
+"checksum cranelift-faerie 0.22.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
+"checksum cranelift-frontend 0.22.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
+"checksum cranelift-module 0.22.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
+"checksum cranelift-native 0.22.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
+"checksum cranelift-simplejit 0.22.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
 "checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
 "checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e"
 "checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067"