Merge branch 'instance-typing' into instantiate

lukemaurer · Oct 23, 2024 · c3a14cf · c3a14cf
2 parents 6017723 + 511d76d
commit c3a14cf
Show file tree

Hide file tree

Showing 5,750 changed files with 6,324 additions and 364,929 deletions.
diff --git a/ocaml/.depend → .depend b/ocaml/.depend → .depend
diff --git a/ocaml/.depend.menhir → .depend.menhir b/ocaml/.depend.menhir → .depend.menhir
diff --git a/ocaml/.gitattributes → .gitattributes b/ocaml/.gitattributes → .gitattributes
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -72,7 +72,7 @@ jobs:
             os: ubuntu-latest
             build_ocamlparam: ''
             ocamlparam: '_,Oclassic=1'
-            disable_testcases: 'ocaml/testsuite/tests/typing-local/regression_cmm_unboxing.ml ocaml/testsuite/tests/int64-unboxing/test.ml'
+            disable_testcases: 'testsuite/tests/typing-local/regression_cmm_unboxing.ml testsuite/tests/int64-unboxing/test.ml'
 
           # CR ccasinghino: We encountered build errors (missing autoconf, and
           # then other errors) when `macos-latest` started referring to version
@@ -110,6 +110,13 @@ jobs:
             ocamlparam: '_,w=-46,regalloc=gi,regalloc-param=SPLIT_LIVE_RANGES:on,regalloc-param=GI_PRIORITY_HEURISTICS:interval-length,regalloc-param=GI_SELECTION_HEURISTICS:first-available,regalloc-param=GI_SPILLING_HEURISTICS:flat-uses,regalloc-validate=1,cfg-cse-optimize=1'
             check_arch: true
 
+          - name: cfg-selection
+            config: --enable-middle-end=flambda2
+            os: ubuntu-latest
+            build_ocamlparam: '_,w=-46,regalloc=cfg,cfg-cse-optimize=1,cfg-selection=1,cfg-zero-alloc-checker=1'
+            ocamlparam: '_,w=-46,regalloc=cfg,cfg-cse-optimize=1,cfg-selection=1,cfg-zero-alloc-checker=1'
+            check_arch: true
+
     env:
       J: "3"
       # On macOS, the testsuite is slow, so run only on push to main (#507)

diff --git a/.github/workflows/document-syntax.yml b/.github/workflows/document-syntax.yml
@@ -4,7 +4,7 @@ on:
   pull_request_target:
     types: [opened, synchronize, reopened]
     paths:
-      - 'ocaml/parsing/parser.mly'
+      - 'parsing/parser.mly'
 
 jobs:
   remind:

diff --git a/ocaml/.github/workflows/jane_ocaml5.yml → .github/workflows/jane_ocaml5.yml b/ocaml/.github/workflows/jane_ocaml5.yml → .github/workflows/jane_ocaml5.yml
@@ -73,6 +73,7 @@ jobs:
       - name: Configure
         working-directory: ocaml-jst
         run: |
+          autoconf
           ./configure --prefix=$GITHUB_WORKSPACE/ocaml-5/_install --with-dune=$GITHUB_WORKSPACE/ocaml-414/_install/bin/dune
 
       - name: Check that resolved files build