Merge tag 5.2.0

Author: mshinwell

.depend

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 parsing/parser.cmo : \
     parsing/syntaxerr.cmi \
     parsing/parsetree.cmi \
@@ -9,7 +10,24 @@ parsing/parser.cmo : \
     parsing/builtin_attributes.cmi \
     parsing/asttypes.cmi \
     parsing/ast_helper.cmi \
+||||||| 121bedcfd2
+parsing/parser.cmo : parsing/syntaxerr.cmi parsing/parsetree.cmi \
+    parsing/longident.cmi parsing/location.cmi parsing/docstrings.cmi \
+    utils/clflags.cmi parsing/asttypes.cmi parsing/ast_helper.cmi \
+=======
+parsing/parser.cmo : \
+    parsing/syntaxerr.cmi \
+    parsing/parsetree.cmi \
+    parsing/longident.cmi \
+    parsing/location.cmi \
+    parsing/docstrings.cmi \
+    utils/clflags.cmi \
+    parsing/builtin_attributes.cmi \
+    parsing/asttypes.cmi \
+    parsing/ast_helper.cmi \
+>>>>>>> 5.2.0
     parsing/parser.cmi
+<<<<<<< HEAD
 parsing/parser.cmx : \
     parsing/syntaxerr.cmx \
     parsing/parsetree.cmi \
@@ -21,10 +39,32 @@ parsing/parser.cmx : \
     parsing/builtin_attributes.cmx \
     parsing/asttypes.cmi \
     parsing/ast_helper.cmx \
+||||||| 121bedcfd2
+parsing/parser.cmx : parsing/syntaxerr.cmx parsing/parsetree.cmi \
+    parsing/longident.cmx parsing/location.cmx parsing/docstrings.cmx \
+    utils/clflags.cmx parsing/asttypes.cmi parsing/ast_helper.cmx \
+=======
+parsing/parser.cmx : \
+    parsing/syntaxerr.cmx \
+    parsing/parsetree.cmi \
+    parsing/longident.cmx \
+    parsing/location.cmx \
+    parsing/docstrings.cmx \
+    utils/clflags.cmx \
+    parsing/builtin_attributes.cmx \
+    parsing/asttypes.cmi \
+    parsing/ast_helper.cmx \
+>>>>>>> 5.2.0
     parsing/parser.cmi
 parsing/parser.cmi : \
     parsing/parsetree.cmi \
     parsing/longident.cmi \
     parsing/location.cmi \
     parsing/docstrings.cmi
+<<<<<<< HEAD
 parsing/parser.ml parsing/parser.mli: parsing/ast_helper.cmi parsing/asttypes.cmi parsing/builtin_attributes.cmi utils/clflags.cmi parsing/docstrings.cmi parsing/jane_syntax.cmi parsing/location.cmi parsing/longident.cmi parsing/parsetree.cmi parsing/syntaxerr.cmi
+||||||| 121bedcfd2
+parsing/parser.ml parsing/parser.mli: parsing/ast_helper.cmi parsing/asttypes.cmi utils/clflags.cmi parsing/docstrings.cmi parsing/location.cmi parsing/longident.cmi parsing/parsetree.cmi parsing/syntaxerr.cmi
+=======
+parsing/parser.ml parsing/parser.mli: parsing/ast_helper.cmi parsing/asttypes.cmi parsing/builtin_attributes.cmi utils/clflags.cmi parsing/docstrings.cmi parsing/location.cmi parsing/longident.cmi parsing/parsetree.cmi parsing/syntaxerr.cmi
+>>>>>>> 5.2.0

.depend.menhir

@@ -22,7 +22,6 @@
 # Binary files
 /boot/ocamlc binary
 /boot/ocamllex binary
-/boot/ocamldep binary
 *.gif binary
 *.png binary
 *.tfm binary
@@ -63,10 +62,8 @@ META.in                  typo.missing-header
 /CONTRIBUTING.md         typo.non-ascii=may
 /README.adoc             typo.non-ascii=may
 /README.win32.adoc       typo.non-ascii=may
-/.merlin                 typo.missing-header
 /Changes                 typo.utf8 typo.missing-header
 /release-info/News       typo.utf8 typo.missing-header
-/INSTALL                 typo.missing-header
 /LICENSE                 typo.very-long-line typo.missing-header
 # tools/ci/appveyor/appveyor_build.cmd only has missing-header because
 # dra27 too lazy to update check-typo to interpret Cmd-style comments!
@@ -97,11 +94,6 @@ configure                typo.prune
 
 ocaml-variants.opam      typo.prune
 
-emacs/*.el               typo.long-line=may
-emacs/caml.el            typo.long-line=may typo.missing-header
-emacs/COPYING            typo.prune
-emacs/ocamltags.in       typo.non-printing
-
 ocamldoc/**              typo.long-line=may
 ocamldoc/Changes.txt     typo.missing-header
 ocamldoc/ocamldoc.sty    typo.missing-header
@@ -116,7 +108,7 @@ runtime/sak.c            typo.non-ascii
 stdlib/hashbang     typo.white-at-eol typo.missing-lf
 
 testsuite/tests/**                                      typo.missing-header typo.long-line=may
-testsuite/tests/lib-bigarray-2/bigarrf.f                typo.tab
+testsuite/tests/lib-bigarray-2/bigarrf.f                typo.tab linguist-language=Fortran
 testsuite/tests/lib-unix/win-stat/fakeclock.c           typo.missing-header=false
 testsuite/tests/misc-unsafe/almabench.ml                typo.long-line
 testsuite/tests/tool-toplevel/strings.ml                typo.utf8
@@ -125,8 +117,8 @@ testsuite/tests/asmgen/immediates.cmm                   typo.very-long-line
 testsuite/tests/generated-parse-errors/errors.*         typo.very-long-line
 testsuite/tools/*.S                                     typo.missing-header
 testsuite/tools/*.asm                                   typo.missing-header
-testsuite/typing                                        typo.missing-header
 testsuite/tests/messages/highlight_tabs.ml              typo.tab
+testsuite/tests/tool-toplevel/multi_phrase_line.ml      typo.very-long-line
 
 # prune testsuite reference files
 testsuite/tests/**/*.reference               typo.prune
@@ -147,8 +139,6 @@ tools/eventlog_metadata.in        typo.missing-header
 # TODO we should fix the long-line errors in yacc/*.c
 /yacc/*.[ch]         typo.very-long-line=may
 
-menhir-bench.bash typo.missing-header typo.utf8
-
 # bootstrap files produced by Menhir
 /boot/menhir/** typo.long-line=may typo.very-long-line=may
 /boot/menhir/** typo.missing-header=may
@@ -159,49 +149,73 @@ menhir-bench.bash typo.missing-header typo.utf8
 *.sh text eol=lf
 *.sh.in text eol=lf
 *.awk text eol=lf
-*.m4 text eol=lf
+*.m4 text eol=lf linguist-language=M4Sugar
 
 # ocamltest hooks which are used in the testsuite
 *.check-program-output text eol=lf
 *.run text eol=lf
 
 /tools/ci/appveyor/appveyor_build.cmd text eol=crlf
 
-aclocal.m4 typo.tab
+Makefile* linguist-language=Makefile
+*.c linguist-language=C
+*.h linguist-language=C
+*.h.in linguist-language=C
+*.hva linguist-language=TeX
+*.ml linguist-language=OCaml
+*.ml? linguist-language=OCaml
+*.mld linguist-documentation
+*.ml*.in linguist-language=OCaml
+*.tbl linguist-language=C
+
+aclocal.m4 typo.tab -linguist-vendored linguist-language=M4Sugar
 configure.ac text eol=lf
-build-aux/compile text eol=lf
-build-aux/config.guess text eol=lf
-build-aux/config.sub text eol=lf
-build-aux/install text eol=lf
-build-aux/missing text eol=lf
-ocamldoc/remove_DEBUG text eol=lf
-ocamltest/getocamloptdefaultflags text eol=lf
-ocamltest/ocamltest.org typo.long-line=may typo.missing-header
+# These scripts are all parts of autoconf and are tagged linguist-generated
+# to suppress inclusion in PR diffs.
+build-aux/compile linguist-generated text eol=lf
+build-aux/config.guess linguist-generated text eol=lf
+build-aux/config.sub linguist-generated text eol=lf
+build-aux/install-sh linguist-generated text eol=lf
+build-aux/ltmain.sh linguist-generated text eol=lf
+build-aux/missing linguist-generated text eol=lf
+build-aux/*.m4 linguist-vendored
+build-aux/ocaml_version.m4 -linguist-vendored linguist-language=M4Sugar
+ocamltest/OCAMLTEST.org typo.long-line=may typo.missing-header
 stdlib/Compflags text eol=lf
-stdlib/sharpbang text eol=lf
+stdlib/hashbang -text
 tools/autogen text eol=lf
-tools/ci/inria/remove-sinh-primitive.patch text eol=lf
+tools/bump-magic-numbers eol=lf typo.long-line
+tools/ci/inria/bootstrap/remove-sinh-primitive.patch -text
+tools/ci/inria/bootstrap/script text eol=lf
+tools/ci/inria/dune-build/script text eol=lf
+tools/ci/inria/launch text eol=lf
+tools/ci/inria/light text eol=lf
+tools/ci/inria/main text eol=lf
+tools/ci/inria/other-configs/script text eol=lf
+tools/ci/inria/sanitizers/script text eol=lf
+tools/ci/inria/step-by-step-build/script text eol=lf
 tools/check-typo text eol=lf
 tools/check-symbol-names text eol=lf
-tools/ci-build text eol=lf
 tools/msvs-promote-path text eol=lf
-tools/gdb-macros text eol=lf
+tools/gdb-macros text eol=lf linguist-language=GDB
 tools/magic text eol=lf
-tools/make-opcodes text eol=lf
-tools/make-package-macosx text eol=lf
-tools/ocaml-objcopy-macosx text eol=lf
 tools/ocamlsize text eol=lf
 tools/pre-commit-githook text eol=lf
+<<<<<<< HEAD
+tools/markdown-add-pr-links.sh text eol=lf
+runtime/caml/sizeclasses.h typo.missing-header
+||||||| 121bedcfd2
 tools/markdown-add-pr-links.sh text eol=lf
+runtime/caml/sizeclasses.h typo.missing-header typo.white-at-eol
+=======
 runtime/caml/sizeclasses.h typo.missing-header
+>>>>>>> 5.2.0
 
 # Tests which include references spanning multiple lines fail with \r\n
 # endings, so use \n endings only, even on Windows.
-testsuite/tests/backtrace/names.ml text eol=lf
 testsuite/tests/basic-modules/anonymous.ml text eol=lf
 testsuite/tests/formatting/test_locations.ml text eol=lf
 testsuite/tests/functors/functors.ml text eol=lf
-testsuite/tests/lib-dynlink-initializers/test10_main.ml text eol=lf
 testsuite/tests/parsing/attributes.ml text eol=lf
 testsuite/tests/parsing/extensions.ml text eol=lf
 testsuite/tests/parsing/hash_ambiguity.ml text eol=lf

.gitattributes

@@ -95,7 +95,7 @@ jobs:
          '${{ github.event.repository.full_name }}'
       - name: Configure tree
         run: |
-          MAKE_ARG=-j XARCH=x64 CONFIG_ARG='--enable-flambda --enable-cmm-invariants --enable-dependency-generation --enable-native-toplevel' OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh configure
+          MAKE_ARG=-j CONFIG_ARG='--enable-flambda --enable-cmm-invariants --enable-dependency-generation --enable-native-toplevel' OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh configure
       - name: Build
         run: |
           MAKE_ARG=-j bash -xe tools/ci/actions/runner.sh build
@@ -109,10 +109,30 @@ jobs:
           retention-days: 1
 
 # Full testsuite run, and other sanity checks
+# "extra" testsuite runs, reusing the previously built compiler tree.
+# debug: running the full testsuite with the
+#        debug runtime and minor heap verification.
+# debug-s4096: select testsuite run with the debug runtime and a small
+#              minor heap.
   normal:
+    name: ${{ matrix.name }}
     needs: build
     runs-on: ubuntu-latest
+<<<<<<< HEAD
 >>>>>>> ocaml/5.1
+||||||| 121bedcfd2
+=======
+    strategy:
+      matrix:
+        include:
+          - id: normal
+            name: normal
+            dependencies: texlive-latex-extra texlive-fonts-recommended hevea sass
+          - id: debug
+            name: extra (debug)
+          - id: debug-s4096
+            name: extra (debug-s4096)
+>>>>>>> 5.2.0
     steps:
 <<<<<<< HEAD
     - name: Install GNU parallel
@@ -279,22 +299,43 @@ jobs:
           tar --zstd -xf sources.tar.zstd
           rm -f sources.tar.zstd
       - name: Packages
+        if: matrix.dependencies != ''
         run: |
-          sudo apt-get update -y && sudo apt-get install -y texlive-latex-extra texlive-fonts-recommended hevea sass
+          sudo apt-get update -y && sudo apt-get install -y ${{ matrix.dependencies }}
       - name: Run the testsuite
+        if: matrix.id == 'normal'
         run: |
           MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh test
+      - name: Run the testsuite (debug runtime)
+        if: matrix.id == 'debug'
+        env:
+          OCAMLRUNPARAM: v=0,V=1
+          USE_RUNTIME: d
+        run: |
+          bash -cxe "SHOW_TIMINGS=1 tools/ci/actions/runner.sh test"
+      - name: Run the testsuite (s=4096, debug runtime)
+        if: matrix.id == 'debug-s4096'
+        env:
+          OCAMLRUNPARAM: s=4096,v=0
+          USE_RUNTIME: d
+        run: |
+          for dir in $PARALLEL_TESTS; do \
+            bash -cxe "SHOW_TIMINGS=1 tools/ci/actions/runner.sh test_prefix $dir"; \
+          done
       - name: Build API Documentation
+        if: matrix.id == 'normal'
         run: |
           MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh api-docs
       - name: Install
+        if: matrix.id == 'normal'
         run: |
          MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh install
       - name: Build the manual
+        if: matrix.id == 'normal' && needs.build.outputs.manual_changed == 'true'
         run: |
           MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh manual
-        if: needs.build.outputs.manual_changed == 'true'
       - name: Other checks
+        if: matrix.id == 'normal'
         run: |
           MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh other-checks
 
@@ -320,7 +361,7 @@ jobs:
         run: brew install parallel
       - name: configure tree
         run: |
-          CONFIG_ARG=${{ matrix.config_arg }} MAKE_ARG=-j XARCH=x64 bash -xe tools/ci/actions/runner.sh configure
+          CONFIG_ARG='${{ matrix.config_arg }}' MAKE_ARG=-j bash -xe tools/ci/actions/runner.sh configure
       - name: Build
         run: |
           MAKE_ARG=-j bash -xe tools/ci/actions/runner.sh build
@@ -341,7 +382,7 @@ jobs:
   i386:
     runs-on: ubuntu-latest
     container:
-      image: i386/ubuntu:18.04
+      image: debian:12
       options: --platform linux/i386 --user root
     steps:
       - name: OS Dependencies
@@ -353,13 +394,14 @@ jobs:
         uses: actions/checkout@v1
       - name: configure tree
         run: |
-          MAKE_ARG=-j XARCH=i386 bash -xe tools/ci/actions/runner.sh configure
+          MAKE_ARG=-j bash -xe tools/ci/actions/runner.sh configure
       - name: Build
         run: |
           MAKE_ARG=-j bash -xe tools/ci/actions/runner.sh build
       - name: Run the testsuite
         run: |
           bash -xe tools/ci/actions/runner.sh test
+<<<<<<< HEAD
 
 # "extra" testsuite runs, reusing the previously built compiler tree.
 # debug: running the full testsuite with the
@@ -400,3 +442,45 @@ jobs:
             bash -cxe "SHOW_TIMINGS=1 tools/ci/actions/runner.sh test_prefix $dir"; \
           done
 >>>>>>> ocaml/5.1
+||||||| 121bedcfd2
+
+# "extra" testsuite runs, reusing the previously built compiler tree.
+# debug: running the full testsuite with the
+#        debug runtime and minor heap verification.
+# debug-s4086: select testsuite run with the debug runtime and a small
+#              minor heap.
+  extra:
+    needs: build
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        id:
+          - debug
+          - debug-s4096
+    steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: compiler
+      - name: Unpack Artifact
+        run: |
+          tar --zstd -xf sources.tar.zstd
+          rm -f sources.tar.zstd
+      - name: Run the testsuite (debug runtime)
+        if: ${{ matrix.id == 'debug' }}
+        env:
+          OCAMLRUNPARAM: v=0,V=1
+          USE_RUNTIME: d
+        run: |
+          bash -cxe "SHOW_TIMINGS=1 tools/ci/actions/runner.sh test"
+      - name: Run the testsuite (s=4096, debug runtime)
+        if: ${{ matrix.id == 'debug-s4096' }}
+        env:
+          OCAMLRUNPARAM: s=4096,v=0
+          USE_RUNTIME: d
+        run: |
+          for dir in $PARALLEL_TESTS; do \
+            bash -cxe "SHOW_TIMINGS=1 tools/ci/actions/runner.sh test_prefix $dir"; \
+          done
+=======
+>>>>>>> 5.2.0

.github/workflows/build.yml

@@ -9,9 +9,10 @@ jobs:
     permissions:
       issues: write
     steps:
-    - uses: actions/stale@v3
+    - uses: actions/stale@v8
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue has been open one year with no activity.  Consequently, it is being marked with the "stale" label.  What this means is that the issue will be automatically closed in 30 days unless more comments are added or the "stale" label is removed.  Comments that provide new information on the issue are especially welcome: is it still reproducible? did it appear in other contexts? how critical is it? etc.'
         days-before-stale: 366
         days-before-close: 30
+        exempt-issue-labels: 'bug'