Merge remote-tracking branch 'upstream/main' into merge-upstream

Author: ngzhian

.github/workflows/main.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -78,7 +78,7 @@ jobs:
           name: core-api-rendered
           path: _output/core
       - name: Publish HTML to GitHub Pages
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         uses: peaceiris/actions-gh-pages@v3
         with:
           publish_dir: ./_output

.github/workflows/mirror.yml

@@ -0,0 +1,17 @@
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  mirror_job:
+    runs-on: ubuntu-latest
+    name: Mirror main branch to master branch
+    steps:
+    - name: Mirror action step
+      id: mirror
+      uses: google/mirror-branch-action@v1.0
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        source: 'main'
+        dest: 'master'

Contributing.md

@@ -3,6 +3,6 @@
 Interested in participating? Please follow
 [the same contributing guidelines as the design repository][].
 
-  [the same contributing guidelines as the design repository]: https://github.com/WebAssembly/design/blob/master/Contributing.md
+  [the same contributing guidelines as the design repository]: https://github.com/WebAssembly/design/blob/main/Contributing.md
 
 Also, please be sure to read [the README.md](README.md) for this repository.

document/core/appendix/algorithm.rst

@@ -75,15 +75,13 @@ However, these variables are not manipulated directly by the main checking funct
 
    func pop_val(expect : val_type | Unknown) : val_type | Unknown =
      let actual = pop_val()
-     if (actual = Unknown) return expect
-     if (expect = Unknown) return actual
-     error_if(actual =/= expect)
+     error_if(actual =/= expect && actual =/= Unknown && expect =/= Unknown)
      return actual
 
    func push_vals(types : list(val_type)) = foreach (t in types) push_val(t)
    func pop_vals(types : list(val_type)) : list(val_type) =
      var popped := []
-     foreach (t in reverse(types)) popped.append(pop_val(t))
+     foreach (t in reverse(types)) popped.prepend(pop_val(t))
      return popped
 
 Pushing an operand value simply pushes the respective type to the value stack.
@@ -109,24 +107,24 @@ The control stack is likewise manipulated through auxiliary functions:
 .. code-block:: pseudo
 
    func push_ctrl(opcode : opcode, in : list(val_type), out : list(val_type)) =
-     let frame = ctrl_frame(opcode, in, out, vals.size(), false)
-     ctrls.push(frame)
+     let frame = ctrl_frame(opcode, in, out, vals.size(), false)
+     ctrls.push(frame)
      push_vals(in)
 
    func pop_ctrl() : ctrl_frame =
-     error_if(ctrls.is_empty())
-     let frame = ctrls[0]
-     pop_vals(frame.end_types)
-     error_if(vals.size() =/= frame.height)
+     error_if(ctrls.is_empty())
+     let frame = ctrls[0]
+     pop_vals(frame.end_types)
+     error_if(vals.size() =/= frame.height)
      ctrls.pop()
-     return frame
+     return frame
 
    func label_types(frame : ctrl_frame) : list(val_types) =
      return (if frame.opcode == loop then frame.start_types else frame.end_types)
 
    func unreachable() =
-     vals.resize(ctrls[0].height)
-     ctrls[0].unreachable := true
+     vals.resize(ctrls[0].height)
+     ctrls[0].unreachable := true
 
 Pushing a control frame takes the types of the label and result values.
 It allocates a new frame record recording them along with the current height of the operand stack and marks the block as reachable.
@@ -184,8 +182,8 @@ Other instructions are checked in a similar manner.
          pop_val(t)
          push_val(t)
 
-       case (unreachable)
-         unreachable()
+       case (unreachable)
+         unreachable()
 
        case (block t1*->t2*)
          pop_vals([t1*])
@@ -210,26 +208,26 @@ Other instructions are checked in a similar manner.
          push_ctrl(else, frame.start_types, frame.end_types)
 
        case (br n)
-         error_if(ctrls.size() < n)
-         pop_vals(label_types(ctrls[n]))
-         unreachable()
+         error_if(ctrls.size() < n)
+         pop_vals(label_types(ctrls[n]))
+         unreachable()
 
        case (br_if n)
-         error_if(ctrls.size() < n)
+         error_if(ctrls.size() < n)
          pop_val(I32)
-         pop_vals(label_types(ctrls[n]))
-         push_vals(label_types(ctrls[n]))
+         pop_vals(label_types(ctrls[n]))
+         push_vals(label_types(ctrls[n]))
 
-       case (br_table n* m)
+       case (br_table n* m)
          pop_val(I32)
-         error_if(ctrls.size() < m)
+         error_if(ctrls.size() < m)
          let arity = label_types(ctrls[m]).size()
-         foreach (n in n*)
-           error_if(ctrls.size() < n)
-           error_if(label_types(ctrls[n]).size() =/= arity)
+         foreach (n in n*)
+           error_if(ctrls.size() < n)
+           error_if(label_types(ctrls[n]).size() =/= arity)
            push_vals(pop_vals(label_types(ctrls[n])))
          pop_vals(label_types(ctrls[m]))
-         unreachable()
+         unreachable()
 
 
 .. note::

document/core/valid/instructions.rst

@@ -1414,8 +1414,6 @@ Control Instructions
 
 * The label :math:`C.\CLABELS[l_N]` must be defined in the context.
 
-* Let :math:`[t^\ast]` be the :ref:`result type <syntax-resulttype>` :math:`C.\CLABELS[l_N]`.
-
 * For all :math:`l_i` in :math:`l^\ast`,
   the label :math:`C.\CLABELS[l_i]` must be defined in the context.
 

document/deploy.sh

@@ -177,7 +177,7 @@ incremental_deploy() {
 		0) echo No changes to files in $deploy_directory. Skipping commit.;;
 		1) commit_and_push;;
 		*)
-			echo git diff exited with code $diff. Aborting. Staying on branch $deploy_branch so you can debug. To switch back to master, use: git symbolic-ref HEAD refs/heads/master && git reset --mixed >&2
+			echo git diff exited with code $diff. Aborting. Staying on branch $deploy_branch so you can debug. To switch back to main, use: git symbolic-ref HEAD refs/heads/main && git reset --mixed >&2
 			return $diff
 			;;
 	esac

interpreter/README.md

@@ -163,7 +163,7 @@ WebAssemblyText.decode(binary)
 
 ## S-Expression Syntax
 
-The implementation consumes a WebAssembly AST given in S-expression syntax. Here is an overview of the grammar of types, expressions, functions, and modules, mirroring what's described in the [design doc](https://github.com/WebAssembly/design/blob/master/Semantics.md).
+The implementation consumes a WebAssembly AST given in S-expression syntax. Here is an overview of the grammar of types, expressions, functions, and modules, mirroring what's described in the [design doc](https://github.com/WebAssembly/design/blob/main/Semantics.md).
 
 Note: The grammar is shown here for convenience, the definite source is the [specification of the text format](https://webassembly.github.io/spec/core/text/).
 ```
@@ -509,7 +509,7 @@ Moreover, float values are required to be precise, that is, they may not contain
 
 ## Abstract Syntax
 
-The abstract WebAssembly syntax, as described above and in the [design doc](https://github.com/WebAssembly/design/blob/master/Semantics.md), is defined in [ast.ml](syntax/ast.ml).
+The abstract WebAssembly syntax, as described above and in the [design doc](https://github.com/WebAssembly/design/blob/main/Semantics.md), is defined in [ast.ml](syntax/ast.ml).
 
 However, to simplify the implementation, this AST representation represents some of the inner structure of the operators more explicitly. The mapping from the operators as given in the design doc to their structured form is defined in [operators.ml](syntax/operators.ml).
 

interpreter/binary/decode.ml

@@ -1080,7 +1080,7 @@ let module_ s =
   iterate custom_section s;
   let datas = data_section s in
   iterate custom_section s;
-  require (pos s = len s) s (len s) "junk after last section";
+  require (pos s = len s) s (len s) "unexpected content after last section";
   require (List.length func_types = List.length func_bodies)
     s (len s) "function and code section have inconsistent lengths";
   require (data_count = None || data_count = Some (Lib.List32.length datas))

proposals/multi-value/Overview.md

@@ -14,7 +14,7 @@
   - can easily be lifted by generalising to value* -> value*
 
 * Generalised semantics is well-understood
-  - https://github.com/WebAssembly/spec/tree/master/papers/pldi2017.pdf
+  - https://github.com/WebAssembly/spec/tree/main/papers/pldi2017.pdf
 
 * Semi-complete implementation of multiple results in V8
 

proposals/nontrapping-float-to-int-conversion/Overview.md

@@ -32,7 +32,7 @@ https://github.com/WebAssembly/meetings/pull/3
 
 and
 
-https://github.com/WebAssembly/meetings/blob/master/2017/CG-05.md#non-trapping-float-to-int
+https://github.com/WebAssembly/meetings/blob/main/2017/CG-05.md#non-trapping-float-to-int
 
 which made decisions about which semantics to choose, and which encoding strategy.
 
@@ -43,7 +43,7 @@ https://github.com/WebAssembly/design/pull/1089
 At the CG-07-06 meeting it was decided that a full spec repo fork should be
 created to follow the new process for new features:
 
-https://github.com/WebAssembly/meetings/blob/master/2017/CG-07-06.md#float-to-int-conversion
+https://github.com/WebAssembly/meetings/blob/main/2017/CG-07-06.md#float-to-int-conversion
 
 This led to the creation of the present repo: