Squashed 'ocaml/' changes from bcae5ff..ea89813

ea89813 Merge pull request #154 from ocaml-flambda/merge-flambda-backend
23cf5a5 Merge flambda-backend changes
b3af0c4 Unboxed types version 3 tests (#82)
1282d16 Functions with no clauses aren't local-returning (#149)
15d38c0 `make install` puts ocamlc at workspace root (#152)
b4928ee Remove -absname to improve build errors (#151)
f5b5e49 Remove `type_unpacks` (#150)
50d54db Remove arity-interrupting elaboration of module patterns (#146)
4382869 Remove the need to manually update the `tools/debug_printers` file (#148)
06a1d91 Add `promote-failed` targets to the Makefiles (#144)
d04eb58 Cleanup of comprehensions and immutable arrays (#127)
a45df79 Add a Module_strengthening extension (#142)
163c4b9 Add support for extensions in module types (#141)
74aa974 Some small patch-ups around matching on extensions (#140)
07127fe Remove raw_body from modular extensions setup (#137)
3f9bd64 Don't copy when resolving aliases in try_modtypes (#143)
aba6294 Immediacy rework (#122)
cf4eeef Add no-stack-allocation variant of some tests that print lambda (#133)
8f22438 Fully switch over Jane Street Merlin support to `.local-*` (#136)
5482a8d Remove `Lev_module_definition` from lambda (#135)
261e016 Change modular extensions to produce `AST_desc` types (#132)
0760c82 Disable module patterns in comprehensions (#131)
6acac80 Add Ctype global state debug printers (#130)
bc32037 Enable support for Jane Street's internal Merlin configuration (#64)
d1a8d03 Split out `Clflags.Extension` into a new file, `Language_extension` (#125)
435de6d Fix bootstrap and add legacy CI (#126)
7e5a626 Improve the API of language extensions to better support upstream compatibility (and also tooling) (#13)
c4e17b0 Replace var with local for faster mode checking (#53)
6d477d8 Merge pull request #124 from riaqn/merge-backend
d737533 minor fixes after merge
f1710d6 Merge flambda-backend changes
cc18534 Just run make boostrap (#123)

git-subtree-dir: ocaml
git-subtree-split: ea89813

Author: ccasin

.depend

@@ -22,7 +22,7 @@ jobs:
             ocamlrunparam: "v=0,V=1"
 
           - name: i386
-            config: CC='cc32' AS='as --32' ASPP='gcc -m32 -c' -host i386-linux PARTIALLD='ld -r -melf_i386'
+            config: --enable-stack-allocation=no CC='cc32' AS='as --32' ASPP='gcc -m32 -c' -host i386-linux PARTIALLD='ld -r -melf_i386'
             os: ubuntu-20.04
             ocamlparam: ''
             boot_config: CC='cc32' AS='as --32' ASPP='gcc -m32 -c' -host i386-linux PARTIALLD='ld -r -melf_i386'

.github/workflows/build.yml

@@ -0,0 +1,49 @@
+name: build-legacy
+
+on: [push, pull_request]
+
+jobs:
+  full-flambda:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Packages
+      run: |
+        sudo apt-get update -y && sudo apt-get install -y texlive-latex-extra texlive-fonts-recommended
+  # Ensure that make distclean can be run from an empty tree
+    - name: distclean
+      run: |
+        MAKE_ARG=-j make distclean
+    - name: configure tree
+      run: |
+        MAKE_ARG=-j XARCH=x64 CONFIG_ARG='--enable-flambda --enable-dependency-generation' OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh configure
+    - name: Build
+      run: |
+        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh build
+    - name: Run the testsuite
+      run: |
+        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh test
+  full-flambda-local:
+    runs-on: ubuntu-latest
+    env:
+      OCAMLPARAM: "_,extension=local"
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Packages
+      run: |
+        sudo apt-get update -y && sudo apt-get install -y texlive-latex-extra texlive-fonts-recommended
+  # Ensure that make distclean can be run from an empty tree
+    - name: distclean
+      run: |
+        MAKE_ARG=-j make distclean
+    - name: configure tree
+      run: |
+        MAKE_ARG=-j XARCH=x64 CONFIG_ARG='--enable-flambda --enable-dependency-generation' OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh configure
+    - name: Build
+      run: |
+        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh build
+    - name: Run the testsuite
+      run: |
+        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh test

.github/workflows/legacy-build.yml

@@ -273,6 +273,7 @@ _build
 /tools/make_opcodes.ml
 /tools/caml-tex
 /tools/eventlog_metadata
+/tools/debug_printers
 
 /toplevel/byte/topeval.mli
 /toplevel/byte/trace.mli
@@ -291,3 +292,6 @@ _build
 
 /otherlibs/dynlink/natdynlinkops
 
+# Jane Street Merlin support
+/.local-merlin-binaries
+/.local-ocaml-lib

.gitignore

@@ -56,17 +56,29 @@ where the test file or test dir are specified with respect to the
 
 ## Debugging
 
-OCaml 4.14 makes `type_expr` abstract, and thus normal debug printing
-of types no longer works. However, there is now an installable printer
-for types, which we can use to see the types. Here are the instructions:
+We make several custom printers available so that we can print more values in
+`ocamldebug`. Notable examples:
+
+  * OCaml 4.14 makes `type_expr` abstract, and thus normal debug printing
+of types no longer works without a custom printer.
+  * The debug printer for `Ctypes.global_state` lets you see the global mutable state maintained within the `Ctypes` module.
+
+Here's how to install the custom printers for a run of `ocamldebug`:
 
 1. Use the old `Makefile`, not the new `Makefile.jst`. This is an infelicity
 we hope to fix.
 
-2. In the `tools` directory, run `make debug_printers.cmo`.
+2. In the `tools` directory, run `make debug_printers`.
 
 3. In the debugger, execute some instructions, with e.g. `run` or `step`. This forces
 the debugger to load the compiler code, required for the next
 step.
 
-4. Execute `source tools/debug_printers` to install the printers.
+4. From your debugging session, run `source tools/debug_printers` to install the printers.
+
+To add a new printer, simply add a line of the form
+
+    let name = Some.Compiler.printer
+
+to `tools/debug_printers.ml`, and then run `make debug_printers` in the `tools`
+directory to regenerate the printing script.

HACKING.jst.adoc

@@ -2,6 +2,9 @@
 # Build rules common to ocaml-jst and flambda-backend
 #
 
+# Get Merlin along with any Dune command
+dune := '$(CURDIR)/jane-street-merlin-setup.sh' ; '$(dune)'
+
 ws_boot   = --root=. --workspace=duneconf/boot.ws
 ws_runstd = --root=. --workspace=duneconf/runtime_stdlib.ws
 ws_main   = --root=. --workspace=duneconf/main.ws
@@ -163,10 +166,16 @@ _install: compiler
           -or -name "flambda2*.cmti" -or -name "flambda2*.cmt" \) \
           -exec cp -f {} _install/lib/ocaml/compiler-libs \;
 
-# Copy _install to the final install directory (no-op if they are the same)
+# Copy _install to the final install directory (no-op if they are the same).
+# Also generate ocamlc at the root of the repo, as this is convenient to use
+# with ocamldebug: ocamldebug inherits the pwd of the file passed as argument,
+# so breakpoints bring you to the less-convenient _build source file if you use
+# the ocamlc.byte in $prefix/bin.
 install: _install
 	mkdir -p '$(prefix)'
 	rsync --chmod=u+rw,go+r -rl _install/ '$(prefix)'
+	rm -f ocamlc
+	ln -s '$(prefix)'/bin/ocamlc.byte ocamlc
 
 # Same as above, but relies on a successfull earlier _install
 install_for_opam:
@@ -292,6 +301,14 @@ test: install_for_test
                fi \
              fi)
 
+promote-failed:
+	(export OCAMLSRCDIR=$$(pwd)/_runtest; \
+	 export CAML_LD_LIBRARY_PATH=$$(pwd)/_runtest/lib/ocaml/stublibs; \
+	 if $$(which gfortran > /dev/null 2>&1); then \
+	   export LIBRARY_PATH=$$(dirname $$(gfortran -print-file-name=libgfortran.a)); \
+	 fi; \
+	 cd _runtest/testsuite && make promote-failed)
+
 runtest-upstream: test
 
 test-one: install_for_test

Makefile.common-jst

@@ -556,9 +556,9 @@ module Generic_array = struct
 end
 
 let ppat_iarray loc elts =
-  (Extensions.Immutable_arrays.pat_of
-     ~loc:(make_loc loc)
-     (Iapat_immutable_array elts)).ppat_desc
+  Extensions.Immutable_arrays.pat_of
+    ~loc:(make_loc loc)
+    (Iapat_immutable_array elts)
 
 let expecting loc nonterm =
     raise Syntaxerr.(Error(Expecting(make_loc loc, nonterm)))
@@ -42309,9 +42309,9 @@ module Tables = struct
       ( Generic_array.expression
           "[:" ":]"
           (fun elts ->
-            (Extensions.Immutable_arrays.expr_of
+             Extensions.Immutable_arrays.expr_of
                ~loc:(make_loc _sloc)
-               (Iaexp_immutable_array elts)).pexp_desc)
+               (Iaexp_immutable_array elts))
           _1 )
 # 42317 "parsing/parser.ml"
 
@@ -42397,9 +42397,9 @@ module Tables = struct
       ( Generic_array.expression
           "[:" ":]"
           (fun elts ->
-            (Extensions.Immutable_arrays.expr_of
+             Extensions.Immutable_arrays.expr_of
                ~loc:(make_loc _sloc)
-               (Iaexp_immutable_array elts)).pexp_desc)
+               (Iaexp_immutable_array elts))
           _1 )
 # 42405 "parsing/parser.ml"
 
@@ -42469,9 +42469,9 @@ module Tables = struct
       ( Generic_array.expression
           "[:" ":]"
           (fun elts ->
-            (Extensions.Immutable_arrays.expr_of
+             Extensions.Immutable_arrays.expr_of
                ~loc:(make_loc _sloc)
-               (Iaexp_immutable_array elts)).pexp_desc)
+               (Iaexp_immutable_array elts))
           _1 )
 # 42477 "parsing/parser.ml"
 
@@ -42583,9 +42583,9 @@ module Tables = struct
       ( Generic_array.expression
           "[:" ":]"
           (fun elts ->
-            (Extensions.Immutable_arrays.expr_of
+             Extensions.Immutable_arrays.expr_of
                ~loc:(make_loc _sloc)
-               (Iaexp_immutable_array elts)).pexp_desc)
+               (Iaexp_immutable_array elts))
           _1 )
 # 42591 "parsing/parser.ml"
 
@@ -42686,9 +42686,9 @@ module Tables = struct
       ( Generic_array.expression
           "[:" ":]"
           (fun elts ->
-            (Extensions.Immutable_arrays.expr_of
+             Extensions.Immutable_arrays.expr_of
                ~loc:(make_loc _sloc)
-               (Iaexp_immutable_array elts)).pexp_desc)
+               (Iaexp_immutable_array elts))
           _1 )
 # 42694 "parsing/parser.ml"
 
@@ -42781,9 +42781,9 @@ module Tables = struct
       ( Generic_array.expression
           "[:" ":]"
           (fun elts ->
-            (Extensions.Immutable_arrays.expr_of
+             Extensions.Immutable_arrays.expr_of
                ~loc:(make_loc _sloc)
-               (Iaexp_immutable_array elts)).pexp_desc)
+               (Iaexp_immutable_array elts))
           _1 )
 # 42789 "parsing/parser.ml"
 
@@ -43006,7 +43006,7 @@ module Tables = struct
               let _sloc = (_symbolstartpos, _endpos) in
 
 # 2603 "parsing/parser.mly"
-    ( (Extensions.Comprehensions.expr_of ~loc:(make_loc _sloc) _1).pexp_desc )
+    ( Extensions.Comprehensions.expr_of ~loc:(make_loc _sloc) _1 )
 # 43011 "parsing/parser.ml"
 
             in
@@ -43107,7 +43107,7 @@ module Tables = struct
               let _sloc = (_symbolstartpos, _endpos) in
 
 # 2603 "parsing/parser.mly"
-    ( (Extensions.Comprehensions.expr_of ~loc:(make_loc _sloc) _1).pexp_desc )
+    ( Extensions.Comprehensions.expr_of ~loc:(make_loc _sloc) _1 )
 # 43112 "parsing/parser.ml"
 
             in
@@ -43208,7 +43208,7 @@ module Tables = struct
               let _sloc = (_symbolstartpos, _endpos) in
 
 # 2603 "parsing/parser.mly"
-    ( (Extensions.Comprehensions.expr_of ~loc:(make_loc _sloc) _1).pexp_desc )
+    ( Extensions.Comprehensions.expr_of ~loc:(make_loc _sloc) _1 )
 # 43213 "parsing/parser.ml"
 
             in
@@ -43324,7 +43324,7 @@ module Tables = struct
               let _sloc = (_symbolstartpos, _endpos) in
 
 # 2603 "parsing/parser.mly"
-    ( (Extensions.Comprehensions.expr_of ~loc:(make_loc _sloc) _1).pexp_desc )
+    ( Extensions.Comprehensions.expr_of ~loc:(make_loc _sloc) _1 )
 # 43329 "parsing/parser.ml"
 
             in
@@ -43462,7 +43462,7 @@ module Tables = struct
               let _sloc = (_symbolstartpos, _endpos) in
 
 # 2603 "parsing/parser.mly"
-    ( (Extensions.Comprehensions.expr_of ~loc:(make_loc _sloc) _1).pexp_desc )
+    ( Extensions.Comprehensions.expr_of ~loc:(make_loc _sloc) _1 )
 # 43467 "parsing/parser.ml"
 
             in
@@ -43600,7 +43600,7 @@ module Tables = struct
               let _sloc = (_symbolstartpos, _endpos) in
 
 # 2603 "parsing/parser.mly"
-    ( (Extensions.Comprehensions.expr_of ~loc:(make_loc _sloc) _1).pexp_desc )
+    ( Extensions.Comprehensions.expr_of ~loc:(make_loc _sloc) _1 )
 # 43605 "parsing/parser.ml"
 
             in

boot/menhir/parser.ml

@@ -112,7 +112,9 @@ let preserve_tailcall_for_prim = function
     Popaque _ | Psequor | Psequand
   | Pobj_magic _ ->
       true
-  | Pbytes_to_string | Pbytes_of_string | Pignore
+  | Pbytes_to_string | Pbytes_of_string
+  | Parray_to_iarray | Parray_of_iarray
+  | Pignore
   | Pgetglobal _ | Psetglobal _ | Pgetpredef _
   | Pmakeblock _ | Pmakefloatblock _
   | Pfield _ | Pfield_computed _ | Psetfield _
@@ -519,6 +521,8 @@ let comp_primitive p args =
   | Pint_as_pointer -> Kccall("caml_int_as_pointer", 1)
   | Pbytes_to_string -> Kccall("caml_string_of_bytes", 1)
   | Pbytes_of_string -> Kccall("caml_bytes_of_string", 1)
+  | Parray_to_iarray -> Kccall("caml_iarray_of_array", 1)
+  | Parray_of_iarray -> Kccall("caml_array_of_iarray", 1)
   | Pobj_dup -> Kccall("caml_obj_dup", 1)
   (* The cases below are handled in [comp_expr] before the [comp_primitive] call
      (in the order in which they appear below),
@@ -1020,8 +1024,6 @@ let rec comp_expr env exp sz cont =
             let cont1 = add_event ev cont in
             comp_expr env lam sz cont1
           end
-      | Lev_module_definition _ ->
-          comp_expr env lam sz cont
       end
   | Lifused (_, exp) ->
       comp_expr env exp sz cont

boot/ocamlc

@@ -34,6 +34,7 @@ UTILS = \
   utils/local_store.cmo \
   utils/load_path.cmo \
   utils/clflags.cmo \
+  utils/language_extension.cmo \
   utils/profile.cmo \
   utils/terminfo.cmo \
   utils/ccomp.cmo \
@@ -114,8 +115,6 @@ TYPING = \
   typing/parmatch.cmo \
   typing/typedecl_properties.cmo \
   typing/typedecl_variance.cmo \
-  typing/typedecl_unboxed.cmo \
-  typing/typedecl_immediacy.cmo \
   typing/typedecl_separability.cmo \
   lambda/debuginfo.cmo lambda/lambda.cmo \
   typing/typedecl.cmo \

boot/ocamllex

@@ -2037,8 +2037,11 @@ AS_IF([test x"$DEFAULT_STRING" = "xunsafe"],
 
 AS_IF([test x"$enable_stack_allocation" = "xno"],
   [stack_allocation=false],
-  [AC_DEFINE([STACK_ALLOCATION])
-   stack_allocation=true])
+  [AS_IF([$arch64],
+    [AC_DEFINE([STACK_ALLOCATION])
+     stack_allocation=true],
+    [AC_MSG_ERROR([Stack allocation is only supported on 64-bit platforms. \
+Please pass '--enable-stack-allocation=no'.])])])
 
 AS_IF([test x"$enable_poll_insertion" = "xyes"],
   [AC_DEFINE([POLL_INSERTION])

bytecomp/bytegen.ml

@@ -489,9 +489,9 @@ let read_one_param ppf position name v =
   | "dump-into-file" -> Clflags.dump_into_file := true
   | "dump-dir" -> Clflags.dump_dir := Some v
 
-  | "extension" -> Clflags.Extension.enable v
+  | "extension" -> Language_extension.(enable (of_string_exn v))
   | "disable-all-extensions" ->
-    if check_bool ppf name v then Clflags.Extension.disable_all ()
+    if check_bool ppf name v then Language_extension.disallow_extensions ()
 
   | _ ->
     if !warnings_for_discarded_params &&