wasmtime: update to v39.0.1

Signed-off-by: Matt Leon <mattleon@google.com>

Author: leonm1

.github/workflows/format.yml

@@ -103,6 +103,7 @@ jobs:
       run: |
         bazel run //bazel/cargo/wasmsign:crates_vendor
         bazel run //bazel/cargo/wasmtime:crates_vendor
+        perl -pi -e 's/rust_library/rust_static_library/g' bazel/cargo/wasmtime/remote/BUILD.wasmtime-c-api-impl-*.bazel
         git diff --exit-code
 
   clang_format:

BUILD

@@ -190,7 +190,6 @@ cc_library(
     name = "wasmtime_lib",
     srcs = [
         "src/common/types.h",
-        "src/wasmtime/types.h",
         "src/wasmtime/wasmtime.cc",
     ],
     hdrs = ["include/proxy-wasm/wasmtime.h"],
@@ -201,6 +200,7 @@ cc_library(
         "PROXY_WASM_HAS_RUNTIME_WASMTIME",
         "PROXY_WASM_HOST_ENGINE_WASMTIME",
     ],
+    includes = ["@com_github_bytecodealliance_wasmtime//:wasmtime_lib"],
     # See: https://bytecodealliance.github.io/wasmtime/c-api/
     linkopts = select({
         "@platforms//os:macos": [],
@@ -225,65 +225,6 @@ cc_library(
     ],
 )
 
-genrule(
-    name = "prefixed_wasmtime_sources",
-    srcs = [
-        "src/wasmtime/types.h",
-        "src/wasmtime/wasmtime.cc",
-    ],
-    outs = [
-        "src/wasmtime/prefixed_types.h",
-        "src/wasmtime/prefixed_wasmtime.cc",
-    ],
-    cmd = """
-        for file in $(SRCS); do
-           sed -e 's/wasm_/wasmtime_wasm_/g' \
-               -e 's/include\\/wasm.h/include\\/prefixed_wasm.h/g' \
-               -e 's/wasmtime\\/types.h/wasmtime\\/prefixed_types.h/g' \
-           $$file >$(@D)/$$(dirname $$file)/prefixed_$$(basename $$file)
-        done
-        """,
-)
-
-cc_library(
-    name = "prefixed_wasmtime_lib",
-    srcs = [
-        "src/common/types.h",
-        "src/wasmtime/prefixed_types.h",
-        "src/wasmtime/prefixed_wasmtime.cc",
-    ],
-    hdrs = ["include/proxy-wasm/wasmtime.h"],
-    copts = [
-        "-DWASM_API_EXTERN=",
-    ],
-    defines = [
-        "PROXY_WASM_HAS_RUNTIME_WASMTIME",
-        "PROXY_WASM_HOST_ENGINE_WASMTIME",
-    ],
-    # See: https://bytecodealliance.github.io/wasmtime/c-api/
-    linkopts = select({
-        "@platforms//os:macos": [],
-        "@platforms//os:windows": [
-            "ws2_32.lib",
-            "advapi32.lib",
-            "userenv.lib",
-            "ntdll.lib",
-            "shell32.lib",
-            "ole32.lib",
-            "bcrypt.lib",
-        ],
-        "//conditions:default": [
-            "-ldl",
-            "-lm",
-            "-lpthread",
-        ],
-    }),
-    deps = [
-        ":wasm_vm_headers",
-        "@com_github_bytecodealliance_wasmtime//:prefixed_wasmtime_lib",
-    ],
-)
-
 cc_library(
     name = "lib",
     deps = [
@@ -298,6 +239,5 @@ cc_library(
         [":wasmedge_lib"],
     ) + proxy_wasm_select_engine_wasmtime(
         [":wasmtime_lib"],
-        [":prefixed_wasmtime_lib"],
     ),
 )

bazel/cargo/wasmtime/Cargo.toml

@@ -13,19 +13,17 @@
 # limitations under the License.
 
 [package]
-edition = "2021"
+edition = "2024"
 name = "wasmtime-c-api-bazel"
-version = "24.0.0"
-rust-version = "1.78.0"
+version = "39.0.1"
 
 [lib]
 path = "fake_lib.rs"
 
 [dependencies]
-env_logger = "0.10"
-anyhow = "1.0"
-once_cell = "1.12"
-log = {version = "0.4.8", default-features = false}
-tracing = "0.1.26"
-wasmtime = {version = "24.0.0", default-features = false, features = ['cranelift', 'runtime', 'gc', 'std']}
-wasmtime-c-api-macros = {git = "https://github.com/bytecodealliance/wasmtime", tag = "v24.0.0"}
+# IMPORTANT NOTE: prefixed linking of wasmtime requires changing the generated
+# file to specify `rust_static_library` instead of `rust_library`. The
+# following sed command will do it for you:
+#
+# `sed -i.bak -e 's/rust_library/rust_static_library/g' bazel/cargo/wasmtime/remote/BUILD.wasmtime-c-api-impl-*.bazel`
+wasmtime-c-api-impl = {version = "39.0.1", default-features = false, features = ['cranelift', 'wasi', 'wat', 'gc-drc']}

bazel/external/wasmtime.BUILD

@@ -13,42 +13,25 @@
 # limitations under the License.
 
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("@rules_rust//rust:defs.bzl", "rust_static_library")
 
 licenses(["notice"])  # Apache 2
 
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
     name = "wasmtime_lib",
-    hdrs = [
-        "crates/c-api/include/wasm.h",
-    ],
-    deps = [
-        ":rust_c_api",
-    ],
-)
-
-genrule(
-    name = "prefixed_wasmtime_c_api_headers",
     srcs = [
-        "crates/c-api/include/wasm.h",
-    ],
-    outs = [
-        "crates/c-api/include/prefixed_wasm.h",
+        ":prefixed_wasmtime_c_api_lib",
     ],
-    cmd = """
-        sed -e 's/\\ wasm_/\\ wasmtime_wasm_/g' \
-            -e 's/\\*wasm_/\\*wasmtime_wasm_/g' \
-            -e 's/(wasm_/(wasmtime_wasm_/g'     \
-        $(<) >$@
-        """,
+    hdrs = glob(["crates/c-api/include/**"]) + [":wasmtime_conf.h"],
+    includes = ["crates/c-api/include/"],
+    linkstatic = 1,
 )
 
 genrule(
     name = "prefixed_wasmtime_c_api_lib",
     srcs = [
-        ":rust_c_api",
+        "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:wasmtime-c-api-impl",
     ],
     outs = [
         "prefixed_wasmtime_c_api.a",
@@ -63,31 +46,27 @@ genrule(
     toolchains = ["@bazel_tools//tools/cpp:current_cc_toolchain"],
 )
 
-cc_library(
-    name = "prefixed_wasmtime_lib",
-    srcs = [
-        ":prefixed_wasmtime_c_api_lib",
-    ],
-    hdrs = [
-        ":prefixed_wasmtime_c_api_headers",
-    ],
-    linkstatic = 1,
-)
+# This must match the features defined in `bazel/cargo/wasmtime/Cargo.toml` for
+# the C/C++ API to expose the right set of methods.
+features = [
+    "cranelift",
+    "wat",
+    "wasi",
+    "gc-drc",
+]
 
-rust_static_library(
-    name = "rust_c_api",
-    srcs = glob(["crates/c-api/src/**/*.rs"]),
-    crate_features = ["cranelift"],
-    crate_root = "crates/c-api/src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:wasmtime-c-api-macros",
-    ],
-    deps = [
-        "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:anyhow",
-        "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:env_logger",
-        "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:once_cell",
-        # buildifier: leave-alone
-        "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:wasmtime",
-    ],
+# Wasmtime C-api headers use cmakedefines to generate the config file.
+# This does the same as CMake's configure_file, but using the crate features array above.
+genrule(
+    name = "wasmtime_conf.h",
+    srcs = ["crates/c-api/include/wasmtime/conf.h.in"],
+    outs = ["crates/c-api/include/wasmtime/conf.h"],
+    cmd = """
+      cat < $< > $$TMPDIR/working_file
+      for enabled_feature in $$(echo "{}"); do
+        sed -i "s/#cmakedefine WASMTIME_FEATURE_$$enabled_feature/#define WASMTIME_FEATURE_$$enabled_feature 1/" $$TMPDIR/working_file
+      done
+      sed -i 's/#cmakedefine \\(.*\\)/\\/\\/ \\1 is not defined./' $$TMPDIR/working_file
+      cp $$TMPDIR/working_file $@
+      """.format(" ".join([f.upper() for f in features])),
 )

bazel/repositories.bzl

@@ -336,7 +336,20 @@ def proxy_wasm_cpp_host_repositories():
         http_archive,
         name = "com_github_bytecodealliance_wasmtime",
         build_file = "@proxy_wasm_cpp_host//bazel/external:wasmtime.BUILD",
-        sha256 = "2ccb49bb3bfa4d86907ad4c80d1147aef6156c7b6e3f7f14ed02a39de9761155",
-        strip_prefix = "wasmtime-24.0.0",
-        url = "https://github.com/bytecodealliance/wasmtime/archive/v24.0.0.tar.gz",
+        strip_prefix = "wasmtime-39.0.1",
+        integrity = "sha256-iJSGlux/AIc6k+hM6Ax6hWQeT4U7UJtj//ra22+B4+E=",
+        url = "https://github.com/bytecodealliance/wasmtime/archive/v39.0.1.tar.gz",
+        # Prefix wasm_c_api functions for coexistence with other runtimes.
+        patch_cmds = ["""
+          find ./crates/c-api -type f -exec sed -i.bak   \
+             -e 's/\\ wasm_/\\ wasmtime_wasm_/g'                 \
+             -e 's/\\*wasm_/\\*wasmtime_wasm_/g'                 \
+             -e 's/^wasm_/wasmtime_wasm_/g'                      \
+             -e 's/<wasm_/<wasmtime_wasm_/g'                     \
+             -e 's/\\.wasm_/\\.wasmtime_wasm_/g'                 \
+             -e 's/\\&wasm_/\\&wasmtime_wasm_/g'                 \
+             -e 's/\\[wasm_/\\[wasmtime_wasm_/g'                 \
+             -e 's/wasmtime_config_wasm_/wasmtime_config_wasmtime_wasm_/g' \
+             -e 's/(wasm_/(wasmtime_wasm_/g' {} \\;
+        """],
     )

bazel/select.bzl

@@ -34,10 +34,10 @@ def proxy_wasm_select_engine_wamr(xs):
         "//conditions:default": [],
     })
 
-def proxy_wasm_select_engine_wasmtime(xs, xp):
+def proxy_wasm_select_engine_wasmtime(xs):
     return select({
         "@proxy_wasm_cpp_host//bazel:engine_wasmtime": xs,
-        "@proxy_wasm_cpp_host//bazel:multiengine": xp,
+        "@proxy_wasm_cpp_host//bazel:multiengine": xs,
         "//conditions:default": [],
     })
 

bazel/wasm.bzl

@@ -83,7 +83,7 @@ def wasm_rust_binary(name, tags = [], wasi = False, signing_key = [], **kwargs):
 
     rust_binary(
         name = wasm_name,
-        edition = "2018",
+        edition = "2024",
         crate_type = "cdylib",
         out_binary = True,
         tags = ["manual"],