ocaml-flambda
diff --git a/‎.depend
+309-128 b/‎.depend
+309-128
diff --git a/‎.depend.menhir
+3-3 b/‎.depend.menhir
+3-3
diff --git a/‎.gitignore
-4 b/‎.gitignore
-4
diff --git a/‎HACKING.jst.adoc
+20-1 b/‎HACKING.jst.adoc
+20-1
diff --git a/‎Makefile.common-jst
+61-9 b/‎Makefile.common-jst
+61-9
diff --git a/‎asmcomp/amd64/emit.mlp
+1-1 b/‎asmcomp/amd64/emit.mlp
+1-1
@@ -3,7 +3,7 @@ parsing/parser.cmo : \
     parsing/parsetree.cmi \
     parsing/longident.cmi \
     parsing/location.cmi \
-    parsing/extensions.cmi \
+    parsing/jane_syntax.cmi \
     parsing/docstrings.cmi \
     utils/clflags.cmi \
     parsing/builtin_attributes.cmi \
@@ -15,7 +15,7 @@ parsing/parser.cmx : \
     parsing/parsetree.cmi \
     parsing/longident.cmx \
     parsing/location.cmx \
-    parsing/extensions.cmx \
+    parsing/jane_syntax.cmx \
     parsing/docstrings.cmx \
     utils/clflags.cmx \
     parsing/builtin_attributes.cmx \
@@ -27,4 +27,4 @@ parsing/parser.cmi : \
     parsing/longident.cmi \
     parsing/location.cmi \
     parsing/docstrings.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/extensions.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/jane_syntax.cmi parsing/location.cmi parsing/longident.cmi parsing/parsetree.cmi parsing/syntaxerr.cmi
@@ -291,7 +291,3 @@ _build
 /yacc/.gdb_history
 
 /otherlibs/dynlink/natdynlinkops
-
-# Jane Street Merlin support
-/.local-merlin-binaries
-/.local-ocaml-lib
@@ -54,6 +54,25 @@ where the test file or test dir are specified with respect to the
     $ make -f Makefile.jst test-one TEST=typing-local/local.ml
     $ make -f Makefile.jst test-one DIR=typing-local
 
+Likewise, you can use `promote-one` to accept the diff from a failed
+test:
+
+    $ make -f Makefile.jst promote-one TEST=typing-local/local.ml
+    $ make -f Makefile.jst promote-one DIR=typing-local
+
+If you've run some series of tests and would like to accept the diff
+from all failed tests in that run, use `promote-failed`:
+
+    $ make -f Makefile.jst promote-failed
+
+To run just one test without running a full dune build, you can use
+`*-no-rebuild` versions of `test-one` and `promote-one`. Note that these
+targets won't pick up changes you've made to compiler code, though they will
+faithfully pick up changes you've made to test files.
+
+    $ make -f Makefile.jst test-one-no-rebuild TEST=typing-local/local.ml
+    $ make -f Makefile.jst promote-one-no-rebuild DIR=typing-local
+
 ## Debugging
 
 We make several custom printers available so that we can print more values in
@@ -97,7 +116,7 @@ Remember to check that the newly installed switch is being used:
         4.14.1     ocaml-base-compiler.4.14.1                       4.14.1
     ->  4.14.1-fp  ocaml-option-fp.1,ocaml-variants.4.14.1+options  4.14.1-fp
 
-Then build the compiler - the following command will build the compiler using the opam switch, then use the newly-built compiler to build itself.
+Then build the compiler &mdash; the following command will build the compiler using the opam switch, then use the newly-built compiler to build itself.
 
     $ make -f Makefile.jst compiler
 
 
@@ -20,7 +20,10 @@ define dune_boot_context
 (context (default
   (name default)
   ; CR sdolan: profile dev might be faster, but the compiler currently fails to build in dev.
-  (profile boot)))
+  (profile boot)
+  (env (_
+    (flags (:standard -warn-error +A))
+    (env-vars ("OCAMLPARAM" ""))))))
 endef
 
 define dune_runtime_stdlib_context
@@ -31,8 +34,9 @@ define dune_runtime_stdlib_context
   (paths
     (PATH ("$(CURDIR)/_build/_bootinstall/bin" :standard))
     (OCAMLLIB ("$(CURDIR)/_build/_bootinstall/lib/ocaml")))
-  (env (_ (env-vars
-    ("OCAMLPARAM" "$(BUILD_OCAMLPARAM)"))))))
+  (env (_
+    (flags (:standard -warn-error +A))
+    (env-vars ("OCAMLPARAM" "$(BUILD_OCAMLPARAM)"))))))
 endef
 
 define dune_main_context
@@ -43,8 +47,9 @@ define dune_main_context
   (paths
     (PATH ("$(CURDIR)/_build/_bootinstall/bin" :standard))
     (OCAMLLIB ("$(CURDIR)/_build/install/runtime_stdlib/lib/ocaml_runtime_stdlib")))
-  (env (_ (env-vars
-    ("OCAMLPARAM" "$(BUILD_OCAMLPARAM)"))))))
+  (env (_
+    (flags (:standard -warn-error +A))
+    (env-vars ("OCAMLPARAM" "$(BUILD_OCAMLPARAM)"))))))
 endef
 
 
@@ -102,7 +107,8 @@ dune_config_targets = \
   duneconf/main.ws \
   $(ocamldir)/duneconf/dirs-to-ignore.inc \
   $(ocamldir)/duneconf/jst-extra.inc \
-  dune-project
+  dune-project \
+  $(ocamldir)/stdlib/ocaml_compiler_internal_params
 
 _build/_bootinstall: Makefile.config $(dune_config_targets)
 	echo -n '$(NATDYNLINKOPTS)' > $(ocamldir)/otherlibs/dynlink/natdynlinkops
@@ -172,6 +178,12 @@ _install: compiler
 install: _install
 	mkdir -p '$(prefix)'
 	rsync --chmod=u+rw,go+r -rl _install/ '$(prefix)'
+	rm -f '$(prefix)/lib/ocaml/ocaml_compiler_internal_params'
+        # rm `ocaml_compiler_internal_params`, which is used to compile the
+        # stdlib `Float_u` module with `-extension layouts_alpha`, because we
+        # don't want user programs that happened to be named
+        # `ocaml/stdlib/float_u.ml` to get the flag automatically.
+
 
 # Same as above, but relies on a successfull earlier _install
 install_for_opam:
@@ -198,6 +210,9 @@ install_for_test: _install
 	 # replace backend-specific testsuite/tests/asmgen with their new versions
 	rm _runtest/testsuite/tests/asmgen/*
 	cp -a testsuite/tests/asmgen/* _runtest/testsuite/tests/asmgen/
+	 # replace backend-specific testsuite/tests/unboxed-primitive-args with their new versions
+	rm _runtest/testsuite/tests/unboxed-primitive-args/*
+	cp -a testsuite/tests/unboxed-primitive-args/* _runtest/testsuite/tests/unboxed-primitive-args/
 
 	cp $(ocamldir)/Makefile.* _runtest/
 
@@ -211,7 +226,7 @@ install_for_test: _install
 	 done; \
 	 ln -s _install/lib/ocaml stdlib; \
 	 mkdir runtime; \
-	 for f in ocamlrun* stdlib/caml stdlib/stublibs/*; do \
+	 for f in ocamlrun* stdlib/caml stdlib/stublibs/* runtime/caml/threads.h; do \
 	   ln -s ../$$f runtime/`basename $$f`; \
 	 done; \
 	 ln -s . lex; ln -s . yacc; \
@@ -308,22 +323,59 @@ promote-failed:
 runtest-upstream: test
 
 test-one: install_for_test
+	$(MAKE) test-one-no-rebuild
+
+# If the TEST argument is passed as `ocaml/testsuite/tests/foo` (as is invited by
+# tab completion) then look for it in `tests/foo`. Otherwise, if it's passed as
+# just `foo`, then look for it in `tests/foo` for backward compatibility.
+locate_test = \
+  $(shell \
+    test=$(shell echo "$1" | sed 's|^ocaml/testsuite/tests/||g'); \
+    echo "tests/$${test}"; \
+  )
+
+test-one-no-rebuild:
 	(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 one $(if $(TEST),TEST="tests/$(TEST)") $(if $(DIR),DIR="tests/$(DIR)"))
+	 cd _runtest/testsuite && make one $(if $(TEST),TEST=$(call locate_test,$(TEST))) $(if $(DIR),DIR=$(call locate_test,$(DIR))))
 
 promote-one: install_for_test
+	$(MAKE) promote-one-no-rebuild
+
+promote-one-no-rebuild:
 	(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 $(if $(TEST),TEST="tests/$(TEST)") $(if $(DIR),DIR="tests/$(DIR)"))
+	 cd _runtest/testsuite && make promote $(if $(TEST),TEST=$(call locate_test,$(TEST))) $(if $(DIR),DIR=$(call locate_test,$(DIR))))
 
 # This target is like a polling version of upstream "make ocamlopt"
 .PHONY: hacking
 hacking: _build/_bootinstall
 	$(dune) build $(ws_boot) -w $(boot_targets)
+
+# The `hacking-emacs-poller` and `hacking-emacs-builder` targets make it
+# possible to run the polling build with Emacs's `M-x compile`.  You should run
+# `make hacking-emacs-poller` in your terminal from the root directory of the
+# repo, and set Emacs's `compile-command` to `make hacking-emacs-builder` (from
+# the appropriate directory).
+
+.PHONY: hacking-emacs-poller
+hacking-emacs-poller: _build/_bootinstall
+	$(dune) build $(ws_boot) --passive-watch-mode
+
+.PHONY: hacking-emacs-builder
+hacking-emacs-builder: _build/_bootinstall
+	$(dune) rpc build $(ws_boot) -w $(boot_targets)
+	$(dune) diagnostics
+
+.PHONY: debug-printers
+debug-printers: runtime-stdlib # required for $(ws_main) to work
+	$(dune) build $(ws_main) $(ocamldir)/tools/debug_printers
+	@echo
+	@echo To load into ocamldebug, use:
+	@echo source \"$$(realpath _build/main/$(ocamldir)/tools/debug_printers)\"
@@ -1210,7 +1210,7 @@ let probe_env p =
   env.stack_offset <- p.probe_stack_offset;
   (* Account for the return address that is now pushed on the stack. *)
   env.stack_offset <- env.stack_offset + 8;
-  env  
+  env
 
 let emit_probe_handler_wrapper p =
   let wrap_label = probe_handler_wrapper_name p.probe_label in