Merge branch 'main' into deptup

Author: rossberg

.github/workflows/ci-spec.yml

@@ -3,16 +3,25 @@ name: CI for specs
 on:
   push:
     branches: [ main, wasm-3.0 ]
-    paths: [ .github/**, document/**, spectec/** ]
+    paths: [ .github/**, document/**, spectec/**, specification/** ]
 
   pull_request:
     branches: [ main, wasm-3.0 ]
-    paths: [ .github/**, document/**, spectec/** ]
+    paths: [ .github/**, document/**, spectec/**, specification/** ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
+  ensure-wasm-latest:
+    if: ${{ github.repository == 'WebAssembly/spec' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Diff wasm-latest
+        run: bash .github/workflows/diff-wasm-latest.sh
+
   build-core-spec:
     runs-on: ubuntu-latest
     steps:
@@ -145,6 +154,7 @@ jobs:
   publish-spec:
     runs-on: ubuntu-latest
     needs:
+      - ensure-wasm-latest
       - build-core-spec
       - build-js-api-spec
       - build-web-api-spec

.github/workflows/w3c-publish.yml

@@ -4,9 +4,9 @@ on:
   push:
     # Disable on forks!
     branches: [ main ]
-    paths: [ .github/**, document/** ]
+    paths: [ .github/**, document/**, specification/** ]
   pull_request:
-    paths: [ .github/**, document/** ]
+    paths: [ .github/**, document/**, specification/** ]
 
   # Allows you to run this workflow manually from the Actions tab, gh CLI tool,
   # or REST API. THe w3c-status options correspond to the valid options for

document/core/Makefile

@@ -8,7 +8,7 @@ SPHINXBUILD   = sphinx-build
 PAPER         = a4
 ROOTDIR       = $(shell dirname `ls -d ../core 2>/dev/null || ls -d ../../core`)/..
 SPECTECDIR    = $(ROOTDIR)/spectec
-SPECTECSPEC   = $(ROOTDIR)/specification/wasm-3.0
+SPECTECSPEC   = $(ROOTDIR)/specification/wasm-latest
 SPECTECEXT    = spectec
 SPECTEC       = $(SPECTECDIR)/spectec
 SPLICEDIR     = _spectec
@@ -134,6 +134,7 @@ clean:
 	rm -rf $(SPLICEDIR)
 	rm -rf $(BUILDDIR)
 	rm -rf $(STATICDIR)
+	rm -rf $(SPLICEDIR)
 	rm -f $(GENERATED)
 
 .PHONY: html html-nested

document/core/appendix/index-instructions.py

@@ -378,7 +378,7 @@ def Instruction(version, name, opcode, type=None, validation=None, execution=Non
     Instruction(2.0, r'\TABLEGROW~x', r'\hex{FC}~\hex{0F}', r'[t~\X{at}] \to [\X{at}]', r'valid-table.grow', r'exec-table.grow'),
     Instruction(2.0, r'\TABLESIZE~x', r'\hex{FC}~\hex{10}', r'[] \to [\X{at}]', r'valid-table.size', r'exec-table.size'),
     Instruction(2.0, r'\TABLEFILL~x', r'\hex{FC}~\hex{11}', r'[\X{at}~t~\X{at}] \to []', r'valid-table.fill', r'exec-table.fill'),
-    Instruction(0.0, None, r'\hex{FC}~\hex{1E} \dots'),
+    Instruction(0.0, None, r'\hex{FC}~\hex{12} \dots'),
     Instruction(2.0, r'\V128.\VLOAD~x~\memarg', r'\hex{FD}~~\hex{00}', r'[\X{at}] \to [\V128]', r'valid-vload-val', r'exec-vload-val'),
     Instruction(2.0, r'\V128.\VLOAD\K{8x8\_s}~x~\memarg', r'\hex{FD}~~\hex{01}', r'[\X{at}] \to [\V128]', r'valid-vload-pack', r'exec-vload-pack'),
     Instruction(2.0, r'\V128.\VLOAD\K{8x8\_u}~x~\memarg', r'\hex{FD}~~\hex{02}', r'[\X{at}] \to [\V128]', r'valid-vload-pack', r'exec-vload-pack'),

document/core/syntax/instructions.rst

@@ -254,7 +254,7 @@ The former merely returns the result of the test,
 while the latter performs a downcast and :ref:`traps <trap>` if the operand's type does not match.
 
 .. note::
-   The ${:BR_ON_NULL} and ${:BR_ON_NON_NULL} instructions provide versions of ${:REF.AS_NULL} that branch depending on the success of failure of a null test instead of trapping.
+   The ${:BR_ON_NULL} and ${:BR_ON_NON_NULL} instructions provide versions of ${:REF.AS_NON_NULL} that branch depending on the success or failure of a null test instead of trapping.
    Similarly, the ${:BR_ON_CAST} and ${:BR_ON_CAST_FAIL} instructions provides versions of ${:REF.CAST} that branch depending on the success of the downcast instead of trapping.
 
    An additional instruction operating on function references is the :ref:`control instruction <syntax-instr-control>` ${:CALL_REF}.
@@ -407,7 +407,8 @@ Instructions prefixed with ${:V128} do not involve a specific interpretation, an
 
 $${syntax:
   vvunop vvbinop vvternop vvtestop
-  vunop_ vbinop_ vternop_ vtestop_ vrelop_ vswizzlop_ vshiftop_ vextunop__ vextbinop__ vextternop__ vcvtop__
+  vunop_ vbinop_ vternop_ vtestop_ vrelop_ vswizzlop_ vshiftop_
+  vextunop__ vextbinop__ vextternop__ vcvtop__
 }
 
 Vector instructions can be grouped into several subcategories:

document/core/text/modules.rst

@@ -266,10 +266,6 @@ The data is written as a :ref:`string <text-string>`, which may be split up into
 
 $${grammar: Tdata_ Tdatastring {Tmemuse_/plain Toffset_/plain}}
 
-.. note::
-   In the current version of WebAssembly, the only valid memory index is 0
-   or a symbolic :ref:`memory identifier <text-id>` resolving to the same value.
-
 
 Abbreviations
 .............

document/js-api/index.bs

@@ -1683,7 +1683,7 @@ dictionary ExceptionOptions {
 [LegacyNamespace=WebAssembly, Exposed=(Window,Worker,Worklet)]
 interface Exception {
   constructor(Tag exceptionTag, sequence<any> payload, optional ExceptionOptions options = {});
-  any getArg([EnforceRange] unsigned long index);
+  any getArg(Tag exceptionTag, [EnforceRange] unsigned long index);
   boolean is(Tag exceptionTag);
   readonly attribute (DOMString or undefined) stack;
 };
@@ -1751,9 +1751,11 @@ constructor steps are:
 
 <div algorithm>
 
-The <dfn method for="Exception">getArg(|index|)</dfn> method steps are:
+The <dfn method for="Exception">getArg(|exceptionTag|, |index|)</dfn> method steps are:
 
 1. Let |store| be the [=surrounding agent=]'s [=associated store=].
+1. If **this**.\[[Type]] is not equal to |exceptionTag|.\[[Address]],
+    1. Throw a {{TypeError}}.
 1. Let |tagaddr| be [=exn_tag=](|store|, **this**.\[[Address]]).
 1. Let |payload| be [=exn_read=](|store|, **this**.\[[Address]]).
 1. Assert: |tagaddr| is equal to **this**.\[[Type]].
@@ -1948,7 +1950,7 @@ The <dfn abstract-op lt="CharCodeAt">CharCodeAt(|string|, |index|)</dfn> abstrac
 
 <h4 id="js-string-cast">cast</h4>
 
-The |funcType| of this builtin is `(rec (type (func (param externref) (result externref)))).0`.
+The |funcType| of this builtin is `(rec (type (func (param externref) (result (ref extern))))).0`.
 
 <div algorithm="js-string-cast">
 
@@ -1976,7 +1978,7 @@ When this builtin is invoked with parameter |v|, the following steps must be run
 
 Let |arrayType| be `(rec (type (array (mut i16)))).0`.
 
-The |funcType| of this builtin is `(rec (type (func (param (ref null arrayType) i32 i32) (result externref)))).0`.
+The |funcType| of this builtin is `(rec (type (func (param (ref null arrayType) i32 i32) (result (ref extern))))).0`.
 
 <div algorithm="js-string-fromCharCodeArray">
 
@@ -2027,7 +2029,7 @@ When this builtin is invoked with parameters |string|, |array|, and |start|, the
 
 <h4 id="js-string-fromCharCode">fromCharCode</h4>
 
-The |funcType| of this builtin is `(rec (type (func (param i32) (result externref)))).0`.
+The |funcType| of this builtin is `(rec (type (func (param i32) (result (ref extern))))).0`.
 
 <div algorithm="js-string-fromCharCode">
 
@@ -2098,7 +2100,7 @@ When this builtin is invoked with parameter |v|, the following steps must be run
 
 <h4 id="js-string-concat">concat</h4>
 
-The |funcType| of this builtin is `(rec (type (func (param externref externref) (result externref)))).0`.
+The |funcType| of this builtin is `(rec (type (func (param externref externref) (result (ref extern))))).0`.
 
 <div algorithm="js-string-concat">
 
@@ -2112,7 +2114,7 @@ When this builtin is invoked with parameters |first| and |second|, the following
 
 <h4 id="js-string-substring">substring</h4>
 
-The |funcType| of this builtin is `(rec (type (func (param externref i32 i32) (result externref)))).0`.
+The |funcType| of this builtin is `(rec (type (func (param externref i32 i32) (result (ref extern))))).0`.
 
 <div algorithm="js-string-substring">
 

specification/Makefile

@@ -11,7 +11,7 @@ ci: check-all spec-clean spec test-clean test
 
 # Checking
 
-check: check-3.0
+check: check-latest
 
 check-1.0: $(EXE)
 	$(EXE) wasm-1.0/*
@@ -28,26 +28,31 @@ check-3.0: $(EXE)
 	@echo Wasm 3.0 spec checked OK.
 	@echo =========================
 
-check-all: check-1.0 check-2.0 check-3.0
+check-latest: $(EXE)
+	$(EXE) wasm-latest/*
+	@echo Wasm latest spec checked OK.
+	@echo ============================
+
+check-all: check-1.0 check-2.0 check-3.0 check-latest
 	@echo All Wasm specs checked OK.
 
 
 # Build
 
 spec:
 	(cd ../document/core && make main)
-	@echo Wasm 3.0 specs all built OK.
-	@echo ============================
+	@echo Wasm latest specs all built OK.
+	@echo ===============================
 
 spec-pdf:
 	(cd ../document/core && make pdf)
-	@echo Wasm 3.0 PDF spec built OK.
-	@echo ===========================
+	@echo Wasm latest PDF spec built OK.
+	@echo ==============================
 
 spec-html:
 	(cd ../document/core && make html)
-	@echo Wasm 3.0 HTML spec built OK.
-	@echo ============================
+	@echo Wasm latest HTML spec built OK.
+	@echo ===============================
 
 spec-clean:
 	(cd ../document/core && make clean)
@@ -57,8 +62,8 @@ spec-clean:
 
 test:
 	@((cd ../spectec/src && make test) || @echo Backend tests failed. Perhaps run `make testpromote` to update test output.)
-	@echo Wasm 3.0 backend tests ran OK.
-	@echo ==============================
+	@echo Wasm latest backend tests ran OK.
+	@echo =================================
 
 test-clean:
 	@(cd ../spectec/src && make clean)

specification/diff-wasm-latest.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Identify the highest versioned directory
+HIGHEST_VER=$(ls -d specification/wasm-[0-9]* 2>/dev/null | sort -V | tail -n 1)
+
+if [ -z "$HIGHEST_VER" ]; then
+    echo "❌ Error: No wasm-X.Y versioned directories found in specification/"
+    exit 1
+fi
+
+LATEST="specification/wasm-latest"
+
+# Check that wasm-latest exists
+if [ ! -d "$LATEST" ]; then
+    echo "❌ Error: $LATEST does not exist."
+    exit 1
+fi
+
+# Diff the highest version with wasm-latest and check that the diff is empty
+echo "Checking for differences between $HIGHEST_VER and $LATEST..."
+
+if diff -qr "$HIGHEST_VER" "$LATEST" > /dev/null; then
+    echo "✅ Success: Contents match. No changes needed."
+else
+    echo "🔍 Differences detected:"
+    echo "--------------------------------"
+    diff -r "$HIGHEST_VER" "$LATEST"
+    echo "--------------------------------"
+    exit 1
+fi

specification/wasm-3.0/1.3-syntax.instructions.spectec

@@ -102,7 +102,8 @@ syntax vvtestop hint(macro "%" "V%") = ANY_TRUE
 syntax vunop_(shape) hint(macro "%" "V%")
 syntax vunop_(Jnn X M) = ABS | NEG
   | POPCNT -- if $lsizenn(Jnn) = `8
-syntax vunop_(Fnn X M) = ABS | NEG | SQRT | CEIL | FLOOR | TRUNC | NEAREST
+syntax vunop_(Fnn X M) = ABS | NEG | SQRT
+  | CEIL | FLOOR | TRUNC | NEAREST
 
 syntax vbinop_(shape) hint(macro "%" "V%")
 syntax vbinop_(Jnn X M) =
@@ -116,7 +117,8 @@ syntax vbinop_(Jnn X M) =
   | RELAXED_Q15MULR S hint(show RELAXED_Q15MULR#_#%) -- if $lsizenn(Jnn) = `16
   | MIN sx hint(show MIN#_#%)                -- if $lsizenn(Jnn) <= `32
   | MAX sx hint(show MAX#_#%)                -- if $lsizenn(Jnn) <= `32
-syntax vbinop_(Fnn X M) = ADD | SUB | MUL | DIV | MIN | MAX | PMIN | PMAX
+syntax vbinop_(Fnn X M) = ADD | SUB | MUL | DIV
+  | MIN | MAX | PMIN | PMAX
   | RELAXED_MIN | RELAXED_MAX
 
 syntax vternop_(shape) hint(macro "%" "V%")