From 52f90c6308fbad7212a461686287a50152d50780 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Thu, 19 Mar 2020 12:09:21 +0100
Subject: [PATCH] Update Cranelift

---
 Cargo.lock     | 47 +++++++++++++++++++++++++++--------------------
 src/linkage.rs |  4 +---
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ebb67ea023cd..d808c05b3b8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,11 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "anyhow"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "013a6e0a2cbe3d20f9c60b65458f7a7f7a5e636c5d0f45a5a6aee5d4b1f01785"
+
 [[package]]
 name = "ar"
 version = "0.8.0"
@@ -38,16 +44,16 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.59.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#e2f6c0805231daa0524d7c770d11ced6dfe961a2"
+version = "0.60.0"
+source = "git+https://github.com/bytecodealliance/wasmtime/#1c55eb1a8bba9e59df604a0df2b6552dd54e76a7"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.59.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#e2f6c0805231daa0524d7c770d11ced6dfe961a2"
+version = "0.60.0"
+source = "git+https://github.com/bytecodealliance/wasmtime/#1c55eb1a8bba9e59df604a0df2b6552dd54e76a7"
 dependencies = [
  "byteorder",
  "cranelift-bforest",
@@ -63,8 +69,8 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.59.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#e2f6c0805231daa0524d7c770d11ced6dfe961a2"
+version = "0.60.0"
+source = "git+https://github.com/bytecodealliance/wasmtime/#1c55eb1a8bba9e59df604a0df2b6552dd54e76a7"
 dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
@@ -72,18 +78,18 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.59.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#e2f6c0805231daa0524d7c770d11ced6dfe961a2"
+version = "0.60.0"
+source = "git+https://github.com/bytecodealliance/wasmtime/#1c55eb1a8bba9e59df604a0df2b6552dd54e76a7"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.59.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#e2f6c0805231daa0524d7c770d11ced6dfe961a2"
+version = "0.60.0"
+source = "git+https://github.com/bytecodealliance/wasmtime/#1c55eb1a8bba9e59df604a0df2b6552dd54e76a7"
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.59.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#e2f6c0805231daa0524d7c770d11ced6dfe961a2"
+version = "0.60.0"
+source = "git+https://github.com/bytecodealliance/wasmtime/#1c55eb1a8bba9e59df604a0df2b6552dd54e76a7"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -93,9 +99,10 @@ dependencies = [
 
 [[package]]
 name = "cranelift-module"
-version = "0.59.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#e2f6c0805231daa0524d7c770d11ced6dfe961a2"
+version = "0.60.0"
+source = "git+https://github.com/bytecodealliance/wasmtime/#1c55eb1a8bba9e59df604a0df2b6552dd54e76a7"
 dependencies = [
+ "anyhow",
  "cranelift-codegen",
  "cranelift-entity",
  "log",
@@ -104,8 +111,8 @@ dependencies = [
 
 [[package]]
 name = "cranelift-native"
-version = "0.59.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#e2f6c0805231daa0524d7c770d11ced6dfe961a2"
+version = "0.60.0"
+source = "git+https://github.com/bytecodealliance/wasmtime/#1c55eb1a8bba9e59df604a0df2b6552dd54e76a7"
 dependencies = [
  "cranelift-codegen",
  "raw-cpuid",
@@ -114,8 +121,8 @@ dependencies = [
 
 [[package]]
 name = "cranelift-object"
-version = "0.59.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#e2f6c0805231daa0524d7c770d11ced6dfe961a2"
+version = "0.60.0"
+source = "git+https://github.com/bytecodealliance/wasmtime/#1c55eb1a8bba9e59df604a0df2b6552dd54e76a7"
 dependencies = [
  "cranelift-codegen",
  "cranelift-module",
@@ -126,8 +133,8 @@ dependencies = [
 
 [[package]]
 name = "cranelift-simplejit"
-version = "0.59.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#e2f6c0805231daa0524d7c770d11ced6dfe961a2"
+version = "0.60.0"
+source = "git+https://github.com/bytecodealliance/wasmtime/#1c55eb1a8bba9e59df604a0df2b6552dd54e76a7"
 dependencies = [
  "cranelift-codegen",
  "cranelift-module",
diff --git a/src/linkage.rs b/src/linkage.rs
index 08604e87c33e..bf5c29562226 100644
--- a/src/linkage.rs
+++ b/src/linkage.rs
@@ -6,9 +6,7 @@ pub fn get_clif_linkage(mono_item: MonoItem, linkage: RLinkage, visibility: Visi
     match (linkage, visibility) {
         (RLinkage::External, Visibility::Default) => Linkage::Export,
         (RLinkage::Internal, Visibility::Default) => Linkage::Local,
-        // FIXME this should get external linkage, but hidden visibility,
-        // not internal linkage and default visibility
-        (RLinkage::External, Visibility::Hidden) => Linkage::Export,
+        (RLinkage::External, Visibility::Hidden) => Linkage::Hidden,
         _ => panic!("{:?} = {:?} {:?}", mono_item, linkage, visibility),
     }
 }