From bbc0cd66b421a6196e90afbf7e386427ebf67fa2 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Mon, 13 Apr 2020 12:52:53 +0200
Subject: [PATCH] Update Cranelift

---
 Cargo.lock           | 20 ++++++++++----------
 src/debuginfo/mod.rs |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9d4099a29373..7766088ee8f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -45,7 +45,7 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 [[package]]
 name = "cranelift-bforest"
 version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+source = "git+https://github.com/bytecodealliance/wasmtime/#63c97e365e716e3dbe07f8cb5a2c1084b188baed"
 dependencies = [
  "cranelift-entity",
 ]
@@ -53,7 +53,7 @@ dependencies = [
 [[package]]
 name = "cranelift-codegen"
 version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+source = "git+https://github.com/bytecodealliance/wasmtime/#63c97e365e716e3dbe07f8cb5a2c1084b188baed"
 dependencies = [
  "byteorder",
  "cranelift-bforest",
@@ -70,7 +70,7 @@ dependencies = [
 [[package]]
 name = "cranelift-codegen-meta"
 version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+source = "git+https://github.com/bytecodealliance/wasmtime/#63c97e365e716e3dbe07f8cb5a2c1084b188baed"
 dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
@@ -79,17 +79,17 @@ dependencies = [
 [[package]]
 name = "cranelift-codegen-shared"
 version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+source = "git+https://github.com/bytecodealliance/wasmtime/#63c97e365e716e3dbe07f8cb5a2c1084b188baed"
 
 [[package]]
 name = "cranelift-entity"
 version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+source = "git+https://github.com/bytecodealliance/wasmtime/#63c97e365e716e3dbe07f8cb5a2c1084b188baed"
 
 [[package]]
 name = "cranelift-frontend"
 version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+source = "git+https://github.com/bytecodealliance/wasmtime/#63c97e365e716e3dbe07f8cb5a2c1084b188baed"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -100,7 +100,7 @@ dependencies = [
 [[package]]
 name = "cranelift-module"
 version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+source = "git+https://github.com/bytecodealliance/wasmtime/#63c97e365e716e3dbe07f8cb5a2c1084b188baed"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -112,7 +112,7 @@ dependencies = [
 [[package]]
 name = "cranelift-native"
 version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+source = "git+https://github.com/bytecodealliance/wasmtime/#63c97e365e716e3dbe07f8cb5a2c1084b188baed"
 dependencies = [
  "cranelift-codegen",
  "raw-cpuid",
@@ -122,7 +122,7 @@ dependencies = [
 [[package]]
 name = "cranelift-object"
 version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+source = "git+https://github.com/bytecodealliance/wasmtime/#63c97e365e716e3dbe07f8cb5a2c1084b188baed"
 dependencies = [
  "cranelift-codegen",
  "cranelift-module",
@@ -133,7 +133,7 @@ dependencies = [
 [[package]]
 name = "cranelift-simplejit"
 version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+source = "git+https://github.com/bytecodealliance/wasmtime/#63c97e365e716e3dbe07f8cb5a2c1084b188baed"
 dependencies = [
  "cranelift-codegen",
  "cranelift-module",
diff --git a/src/debuginfo/mod.rs b/src/debuginfo/mod.rs
index 51da712b55d1..b6eebbf482c2 100644
--- a/src/debuginfo/mod.rs
+++ b/src/debuginfo/mod.rs
@@ -355,9 +355,9 @@ fn place_location<'a, 'tcx>(
 fn translate_loc(isa: &dyn TargetIsa, loc: ValueLoc, stack_slots: &StackSlots) -> Option<Vec<u8>> {
     match loc {
         ValueLoc::Reg(reg) => {
-            let machine_reg = cranelift_codegen::isa::fde::map_reg(isa, reg).unwrap().0 as u8;
+            let machine_reg = isa.map_dwarf_register(reg).unwrap();
             assert!(machine_reg <= 32); // FIXME
-            Some(vec![gimli::constants::DW_OP_reg0.0 + machine_reg])
+            Some(vec![gimli::constants::DW_OP_reg0.0 + machine_reg as u8])
         }
         ValueLoc::Stack(ss) => {
             if let Some(ss_offset) = stack_slots[ss].offset {