From 58e94f014dadbcccf437091c9e6e1cdba32b3f43 Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Mon, 13 Mar 2023 07:31:26 -0700 Subject: [PATCH] Fix wasm dynamic library extension crash This is an amendment to #17374 We have a C++ toolchain config that's being developed to support standalone wasm. We discovered that #17374 wasn't complete. Our example was poorly written and didn't actually create a wasm dynamic library. These changes allow us to successfully create a standalone wasm dynamic library. Sorry for the botched attempt previously. I would like to add tests, but I'm unsure how to approach such a tests considering the automatic toolchain doesn't support wasm AFAICT. Closes #17698. PiperOrigin-RevId: 516204125 Change-Id: Iced5cc80a3151ffde7116b6264c89eaf40466ff5 --- .../google/devtools/build/lib/rules/cpp/CppFileTypes.java | 3 ++- src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl | 8 +++++--- .../build/lib/rules/cpp/StarlarkCcCommonTest.java | 7 +++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java index c4b502e8c8d089..d525d0be65d8e5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java @@ -206,7 +206,8 @@ public ImmutableList getExtensions() { // TODO(bazel-team): File types should not be read from this hard-coded list but should come from // the toolchain instead. See https://github.com/bazelbuild/bazel/issues/17117 - public static final FileType SHARED_LIBRARY = FileType.of(".so", ".dylib", ".dll", ".pyd"); + public static final FileType SHARED_LIBRARY = + FileType.of(".so", ".dylib", ".dll", ".pyd", ".wasm"); // Unix shared libraries can be passed to linker, but not .dll on Windows public static final FileType UNIX_SHARED_LIBRARY = FileType.of(".so", ".dylib"); public static final FileType INTERFACE_SHARED_LIBRARY = diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl index c3c80d47d2a09f..33937eba163cac 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl @@ -350,7 +350,8 @@ ARCHIVE = [".a", ".lib"] PIC_ARCHIVE = [".pic.a"] ALWAYSLINK_LIBRARY = [".lo"] ALWAYSLINK_PIC_LIBRARY = [".pic.lo"] -SHARED_LIBRARY = [".so", ".dylib", ".dll"] +SHARED_LIBRARY = [".so", ".dylib", ".dll", ".wasm"] +INTERFACE_SHARED_LIBRARY = [".ifso", ".tbd", ".lib", ".dll.a"] OBJECT_FILE = [".o", ".obj"] PIC_OBJECT_FILE = [".pic.o"] @@ -539,12 +540,13 @@ def _is_versioned_shared_library_extension_valid(shared_library_name): def _is_valid_shared_library_name(shared_library_name): if (shared_library_name.endswith(".so") or shared_library_name.endswith(".dll") or - shared_library_name.endswith(".dylib")): + shared_library_name.endswith(".dylib") or + shared_library_name.endswith(".wasm")): return True return _is_versioned_shared_library_extension_valid(shared_library_name) -_SHARED_LIBRARY_EXTENSIONS = ["so", "dll", "dylib"] +_SHARED_LIBRARY_EXTENSIONS = ["so", "dll", "dylib", "wasm"] def _is_valid_shared_library_artifact(shared_library): if (shared_library.extension in _SHARED_LIBRARY_EXTENSIONS): diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java index 06e72753981c75..d0228c1f680785 100755 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java @@ -5296,10 +5296,13 @@ public void testWrongExtensionThrowsError() throws Exception { "'a.pic.o' does not have any of the allowed extensions .a, .lib, .pic.a or .rlib"); assertThat(e) .hasMessageThat() - .contains("'a.ifso' does not have any of the allowed extensions .so, .dylib, .dll or .pyd"); + .contains( + "'a.ifso' does not have any of the allowed extensions .so, .dylib, .dll, .pyd or" + + " .wasm"); assertThat(e) .hasMessageThat() - .contains("'a.lib' does not have any of the allowed extensions .so, .dylib, .dll or .pyd"); + .contains( + "'a.lib' does not have any of the allowed extensions .so, .dylib, .dll, .pyd or .wasm"); assertThat(e) .hasMessageThat() .contains(