Merge branch 'main' of github.com:WebAssembly/spec into wasmfx-merge

dhil · dhil · commit ed4be1738f9c · 2025-02-18T10:46:05.000Z
diff --git a/.github/workflows/w3c-publish.yml b/.github/workflows/w3c-publish.yml
@@ -31,7 +31,7 @@ on:
 
 env:
   YARN_ENABLE_IMMUTABLE_INSTALLS: false
-  W3C_STATUS: ${{ github.event_name == 'workflow_dispatch' && inputs.w3c-status || 'WD' }}
+  W3C_STATUS: ${{ github.event_name == 'workflow_dispatch' && inputs.w3c-status || 'CRD' }}
 
 jobs:
   publish-to-w3c-TR:
@@ -64,9 +64,10 @@ jobs:
           W3C_ECHIDNA_TOKEN_CORE: ${{ secrets.W3C_ECHIDNA_TOKEN_CORE }}
           W3C_ECHIDNA_TOKEN_JSAPI: ${{ secrets.W3C_ECHIDNA_TOKEN_JSAPI }}
           W3C_ECHIDNA_TOKEN_WEBAPI: ${{ secrets.W3C_ECHIDNA_TOKEN_WEBAPI }}
+          # Publish the draft on manual dispatches without dry-run set, or on pushes to the main branch.
           ECHIDNA_DRYRUN: |-
-            ${{ (github.event_name == 'workflow_dispatch' && inputs.dry-run) ||
-                !(github.event_name == 'push' && github.repository == 'WebAssembly/spec' && github.ref == 'refs/heads/main') }}
+            ${{ !((github.event_name == 'workflow_dispatch' && !inputs.dry-run) ||
+                  (github.event_name == 'push' && github.repository == 'WebAssembly/spec' && github.ref == 'refs/heads/main')) }}
       - name: Validate ${{ matrix.spec }} spec with Echidna
         if: env.W3C_USERNAME
         run: cd document && make -e -C ${{ matrix.spec }} WD-echidna
diff --git a/document/core/binary/modules.rst b/document/core/binary/modules.rst
@@ -611,5 +611,5 @@ where for each :math:`t_i^\ast, e_i` in :math:`\X{code}^n`,
    The version of the WebAssembly binary format may increase in the future
    if backward-incompatible changes have to be made to the format.
    However, such changes are expected to occur very infrequently, if ever.
-   The binary format is intended to be forward-compatible,
-   such that future extensions can be made without incrementing its version.
+   The binary format is intended to be extensible,
+   such that future features can be added without incrementing its version.
diff --git a/document/core/exec/numerics.rst b/document/core/exec/numerics.rst
@@ -1717,7 +1717,7 @@ It computes :math:`(z_1 \cdot z_2) + z_3` as if with unbounded range and precisi
 
 * Else if both :math:`z_1` and :math:`z_2` are zeroes, then return :math:`1`.
 
-* Else if :math:`z_1` is smaller than or equal to :math:`z_2`, then return :math:`1`.
+* Else if :math:`z_1` is larger than or equal to :math:`z_2`, then return :math:`1`.
 
 * Else return :math:`0`.
 
diff --git a/document/core/util/bikeshed_fixup.py b/document/core/util/bikeshed_fixup.py
@@ -65,7 +65,7 @@ def Main():
   # get carried over into the resulting bikeshed output and then end up causing
   # the W3C pubrules checker to refuse to autopublish that bikeshed output.
   data = re.sub(r'.+?(<div class="toctree-wrapper compound">.+)',
-                r'<!doctype HTML>\n<meta charset="utf-8">\n<body>\1',
+                r'<!doctype HTML>\n<meta charset="utf-8">\n<body><section id="webassembly-specification">\1',
                 data, flags=re.DOTALL)
 
   # Drop spurious navigation from footer.
diff --git a/document/js-api/index.bs b/document/js-api/index.bs
@@ -1350,7 +1350,7 @@ The algorithm <dfn>ToWebAssemblyValue</dfn>(|v|, |type|) coerces a JavaScript va
         1. Let |n| be an implementation-defined integer such that [=canon=]<sub>32</sub> &leq; |n| &lt; 2<sup>[=signif=](32)</sup>.
         1. Let |f32| be [=nan=](n).
     1. Otherwise,
-        1. Let |f32| be |number| rounded to the nearest representable value using IEEE 754-2008 round to nearest, ties to even mode. [[IEEE-754]]
+        1. Let |f32| be |number| rounded to the nearest representable value using IEEE 754-2019 round to nearest, ties to even mode. [[IEEE-754]]
     1. Return [=f32.const=] |f32|.
 1. If |type| is [=f64=],
     1. Let |number| be [=?=] [$ToNumber$](|v|).
diff --git a/test/build.py b/test/build.py
@@ -165,9 +165,10 @@ def build_html_from_js(tests, html_dir, use_sync):
         html_file = os.path.join(html_dir, subdir, html_filename)
         js_harness = "sync_index.js" if use_sync else "async_index.js"
         harness_dir = os.path.join(js_prefix, 'harness')
+
         with open(html_file, 'w+') as f:
             content = HTML_HEADER.replace('{PREFIX}', harness_dir) \
-                                 .replace('{WPT_PREFIX}', harness_dir) \
+                                 .replace('{WPT_PREFIX}', '/resources') \
                                  .replace('{JS_HARNESS}', js_harness)
             content += '        <script src="' + js_filename + '"></script>'
             content += HTML_BOTTOM
diff --git a/test/core/float_exprs.wast b/test/core/float_exprs.wast
@@ -35,7 +35,7 @@
 (assert_return (invoke "f64.no_fma" (f64.const 0x1.7e2c44058a799p+52) (f64.const 0x1.c73b71765b8b2p+685) (f64.const -0x1.16c641df0b108p+690)) (f64.const 0x1.53ccb53de0bd1p+738))
 
 ;; Test that x+0.0 is not folded to x.
-;; See IEEE 754-2008 10.4 "Literal meaning and value-changing optimizations".
+;; See IEEE 754-2019 10.4 "Literal meaning and value-changing optimizations".
 
 (module
   (func (export "f32.no_fold_add_zero") (param $x f32) (result f32)
@@ -94,7 +94,7 @@
 (assert_return (invoke "f64.no_fold_mul_zero" (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
 
 ;; Test that x*1.0 is not folded to x.
-;; See IEEE 754-2008 10.4 "Literal meaning and value-changing optimizations".
+;; See IEEE 754-2019 10.4 "Literal meaning and value-changing optimizations".
 
 (module
   (func (export "f32.no_fold_mul_one") (param $x f32) (result f32)
