From 6ead8503d184da2e6136e97bad283505cc89dc5c Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Thu, 7 Nov 2024 12:04:08 +0000
Subject: [PATCH] Update to Cranelift 0.114

---
 Cargo.lock | 91 +++++++++++++++++++++++++++++-------------------------
 Cargo.toml | 12 +++----
 src/lib.rs | 10 ++++++
 3 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e4f77472..b1d5ad22 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -46,24 +46,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5e7afe85cadb55c4c1176268a2ac046fdff8dfaeca39e18581b9dc319ca9e"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-bitset"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ab25ef3be935a80680e393183e1f94ef507e93a24a8369494d2c6818aedb3e3"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900a19b84545924f1851cbfe386962edfc4ecbc3366a254825cf1ecbcda8ba08"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 dependencies = [
  "bumpalo",
  "cranelift-bforest",
@@ -78,48 +75,44 @@ dependencies = [
  "log",
  "regalloc2",
  "rustc-hash",
+ "serde",
  "smallvec",
  "target-lexicon",
 ]
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c73b2395ffe9e7b4fdf7e2ebc052e7e27af13f68a964985346be4da477a5fc"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d9ed0854e96a4ff0879bff39d078de8dea7f002721c9494c1fdb4e1baa86ccc"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 
 [[package]]
 name = "cranelift-control"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4aca921dd422e781409de0129c255768fec5dec1dae83239b497fb9138abb89"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 dependencies = [
  "arbitrary",
 ]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d770e6605eccee15b49decdd82cd26f2b6404767802471459ea49c57379a98"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 dependencies = [
  "cranelift-bitset",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29268711cb889cb39215b10faf88b9087d4c9e1d2633581e4f722a2bf4bb4ef9"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -129,15 +122,13 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc65156f010aed1985767ad1bff0eb8d186743b7b03e23d0c17604a253e3f356"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 
 [[package]]
 name = "cranelift-jit"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ba6b46367a4f466cfb1abe32793fa1a0f96d862251491b01a44726b8ed9445"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -155,9 +146,8 @@ dependencies = [
 
 [[package]]
 name = "cranelift-module"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "007607022a4883ebdffc46c0925e2e10babf2a565ae78518034ade722aa825d2"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -166,9 +156,8 @@ dependencies = [
 
 [[package]]
 name = "cranelift-native"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bf9b361eaf5a7627647270fabf1dc910d993edbeaf272a652c107861ebe9c2"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -177,9 +166,8 @@ dependencies = [
 
 [[package]]
 name = "cranelift-object"
-version = "0.113.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ca5c38fa00c0cd943035391bdcc84ed00748f17c66c682e410f5a62f234d44"
+version = "0.114.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -363,6 +351,26 @@ dependencies = [
  "target-lexicon",
 ]
 
+[[package]]
+name = "serde"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "slice-group-by"
 version = "0.3.1"
@@ -412,9 +420,8 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "wasmtime-jit-icache-coherence"
-version = "26.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e458e6a1a010a53f86ac8d75837c0c6b2ce3e54b7503b2f1dc5629a4a541f5a"
+version = "27.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-27.0.0#46b744df84992f61f91a8416e2d1ad2fd74f7e6f"
 dependencies = [
  "anyhow",
  "cfg-if",
diff --git a/Cargo.toml b/Cargo.toml
index f352ef72..13d786d2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,12 +8,12 @@ crate-type = ["dylib"]
 
 [dependencies]
 # These have to be in sync with each other
-cranelift-codegen = { version = "0.113.0", default-features = false, features = ["std", "unwind", "all-native-arch"] }
-cranelift-frontend = { version = "0.113.0" }
-cranelift-module = { version = "0.113.0" }
-cranelift-native = { version = "0.113.0" }
-cranelift-jit = { version = "0.113.0", optional = true }
-cranelift-object = { version = "0.113.0" }
+cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-27.0.0", version = "0.114.0", default-features = false, features = ["std", "unwind", "all-native-arch"] }
+cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-27.0.0", version = "0.114.0" }
+cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-27.0.0", version = "0.114.0" }
+cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-27.0.0", version = "0.114.0" }
+cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-27.0.0", version = "0.114.0", optional = true }
+cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-27.0.0", version = "0.114.0" }
 target-lexicon = "0.12.0"
 gimli = { version = "0.31", default-features = false, features = ["write"] }
 object = { version = "0.36", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
diff --git a/src/lib.rs b/src/lib.rs
index aba0c28f..9c43ce14 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -311,6 +311,16 @@ fn build_isa(sess: &Session, backend_config: &BackendConfig) -> Arc<dyn TargetIs
         }
     }
 
+    if let target_lexicon::OperatingSystem::Windows = target_triple.operating_system {
+        // FIXME remove dependency on this from the Rust ABI. cc bytecodealliance/wasmtime#9510
+        flags_builder.enable("enable_multi_ret_implicit_sret").unwrap();
+    }
+
+    if let target_lexicon::Architecture::S390x = target_triple.architecture {
+        // FIXME remove dependency on this from the Rust ABI. cc bytecodealliance/wasmtime#9510
+        flags_builder.enable("enable_multi_ret_implicit_sret").unwrap();
+    }
+
     if let target_lexicon::Architecture::Aarch64(_)
     | target_lexicon::Architecture::Riscv64(_)
     | target_lexicon::Architecture::X86_64 = target_triple.architecture