Error more clearly on wasm components (#6751)

Component binary format: https://github.com/WebAssembly/component-model/blob/main/design/mvp/Binary.md#component-definitions Context: #6728 (comment)
WebAssembly · Jul 17, 2024 · ddf919b · ddf919b
1 parent 9cee7d0
commit ddf919b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
@@ -2243,7 +2243,15 @@ void WasmBinaryReader::verifyInt64(int64_t x) {
 void WasmBinaryReader::readHeader() {
   BYN_TRACE("== readHeader\n");
   verifyInt32(BinaryConsts::Magic);
-  verifyInt32(BinaryConsts::Version);
+  auto version = getInt32();
+  if (version != BinaryConsts::Version) {
+    if (version == 0x1000d) {
+      throwError("this looks like a wasm component, which Binaryen does not "
+                 "support yet (see "
+                 "https://github.com/WebAssembly/binaryen/issues/6728)");
+    }
+    throwError("invalid version");
+  }
 }
 
 void WasmBinaryReader::readStart() {

diff --git a/test/lit/binary/component-error.test b/test/lit/binary/component-error.test
@@ -0,0 +1,6 @@
+# Verify that we show an error when given a component.
+
+;; RUN: not wasm-opt %s.wasm 2>&1 | filecheck %s
+
+;; CHECK: this looks like a wasm component, which Binaryen does not support yet (see https://github.com/WebAssembly/binaryen/issues/6728)
+
diff --git a/test/lit/binary/component-error.test.wasm b/test/lit/binary/component-error.test.wasm