Skip to content

Merge ocaml-jst 2022-12-13 #1022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 13, 2022

Conversation

mshinwell
Copy link
Collaborator

Done using the script.

06c189a flambda-backend: Make stack allocation the default (ocaml-flambda#1013)
98debd5 flambda-backend: Initial support for value slots not of value kind (ocaml-flambda#946)
deb1714 flambda-backend: Add is_last flag to closinfo words (ocaml-flambda#938)
d07fce1 flambda-backend: Disable poll insertion in Configure (ocaml-flambda#967)
0f1ce0e flambda-backend: Regenerate ocaml/configure autoconf 2.69 (instead of 2.71) (ocaml-flambda#1012)
27132d8 flambda-backend: Fix for spurious typing error related to expanding through functor arguments (ocaml-flambda#997)
724fb68 flambda-backend: Use `Compilation_unit.t` instead of `Ident.t` for globals (ocaml-flambda#871)
396d5b8 flambda-backend: Add a test for frametable setup in natdynlinked libraries (ocaml-flambda#983)
b73ab12 flambda-backend: Fix invocation of `caml_shared_startup` in native dynlink (ocaml-flambda#980)
7c7d75a flambda-backend: Fix split_default_wrapper which did not trigger anymore with flambda2 (ocaml-flambda#970)
8fb75bd flambda-backend: Port ocaml/ocaml#11727 and ocaml/ocaml#11732 (ocaml-flambda#965)
fdb7987 flambda-backend: Fix include functor issue after 4.14 merge. (ocaml-flambda#948)
9745cdb flambda-backend: Print -dprofile/-dtimings output to stdout like 4.12 (ocaml-flambda#943)
5f51f21 flambda-backend: Merge pull request ocaml-flambda#932 from mshinwell/4.14-upgrade
841687d flambda-backend: Run make alldepend in ocaml/ (ocaml-flambda#936)
72a7658 flambda-backend: Remove reformatting changes only in dynlink/dune (preserving PR889 and adjusting to minimise diff)
6d758cd flambda-backend: Revert whitespace changes in dune files, to match upstream
c86bf6e flambda-backend: Remove duplicate tests for polling
971dbeb flambda-backend: Testsuite fixes
32f8356 flambda-backend: Topeval fix for symbols patch
befea01 flambda-backend: Compilation fixes / rectify merge faults
a84543f flambda-backend: Merge ocaml-jst
8e65056 flambda-backend: Merge ocaml-jst
4d70045 flambda-backend: Remove filename from system frametable (amd64) (ocaml-flambda#920)
5e57b7d flambda-backend: Bugfix for runtime frame_descr logic for C frames (ocaml-flambda#918)
6423d5e flambda-backend: Merge pull request ocaml-flambda#914 from mshinwell/merge-ocaml-jst-2022-10-24
ead605c flambda-backend: Add a missing Extract_exception (ocaml-flambda#916)
c8f1481 flambda-backend: Resolve conflicts and add specialise/specialised attributes to Builtin_attributes
cf4d0d3 flambda-backend: Merge fixes (#21)
c2f742f flambda-backend: Re-enable some tests for Flambda2 (ocaml-flambda#881)
3d38d13 flambda-backend: Long frames in frametable (ocaml-flambda#797)
85aec7b flambda-backend: Add loop attribute to Builtin_attributes
c0f16e3 flambda-backend: Compilation fixes
90dea23 flambda-backend: Merge flambda-backend/main
5acc6ea flambda-backend: Fixes after merge
e501946 flambda-backend: Merge ocaml-jst
115083b flambda-backend: Merge ocaml-jst
9943b2e flambda-backend: Revert "Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"" (ocaml-flambda#909)
ce339f1 flambda-backend: Fix alloc modes and call kinds for overapplications (ocaml-flambda#902)
e6a317c flambda-backend: Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"
853c488 flambda-backend: Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)
5a977e4 flambda-backend: Fix missing End_region primitives on switch arms (ocaml-flambda#898)
7fa7f9d flambda-backend: Add missing dependencies to Dune files (ocaml-flambda#889)
3cd36f0 flambda-backend: Have Lambda `Pgetglobal` and `Psetglobal` take `Compilation_unit.t` (ocaml-flambda#896)
7565915 flambda-backend: [@poll error] attribute (ocaml-flambda#745)
9eb9448 flambda-backend: Backport the main safepoints PRs (ocaml-flambda#740)
689bdda flambda-backend: Add strict mode for ocamldep (ocaml-flambda#892)

git-subtree-dir: ocaml
git-subtree-split: 06c189a
985725b Add dynlink_compilerlibs.mli to .gitignore (ocaml-flambda#79)
2b1fa24 Regenerate parser (ocaml-flambda#80)
1bb6c79 Merge pull request ocaml-flambda#78 from mshinwell/flambda-backend-patches-2022-12-13
9029581 Update otherlibs/dynlink/Makefile
3e4f1b9 Revert toplevel/native/dune to ocaml-jst version
6061e4c Regenerate configure using autoconf 2.71
888d4b1 Back out patch which disables alloc-check in ocaml-jst
a6d5796 Fix dynlink build
3e46daf Update .depend files
a5c547e Bootstrap
a6a9031 Merge flambda-backend changes
0ac7fdd temp fix for linker error (ocaml-flambda#77)
e2d0d9e Enable individual testing with Makefile.jst (ocaml-flambda#76)
2a7e501 Use a more relaxed mode for unification in Ctype.subst (#11771) (ocaml-flambda#73)
cbd791a Allow immediates to cross modes (ocaml-flambda#58)
549d757 Run "misplaced attributes" check when compiling mlis (ocaml-flambda#72)
a6c0e75 Ensure that Ctype.nongen always calls remove_mode_variables (ocaml-flambda#70)
6c50831 array elements are global (ocaml-flambda#67)
8788ff6 Add/move some documentation
9891a36 Propagate location information to `local_` in expressions
988306d Add support for `global_` and `nonlocal_` constructor arguments (ocaml-flambda#50)
e7dd740 Add debug_printers.ml (ocaml-flambda#63)
65f2896 more entries in gitignore (ocaml-flambda#62)
a9a84d0 Move `global_flag` to `Asttypes` (ocaml-flambda#60)
fac5896 Minor attribute fixes from flambda-backend
75f402e Note about make install and Makefile.jst (ocaml-flambda#56)

git-subtree-dir: ocaml
git-subtree-split: 985725b
@mshinwell mshinwell force-pushed the merge-ocaml-jst-2022-12-13 branch from b3d163c to d8ba491 Compare December 13, 2022 18:32
@mshinwell mshinwell merged commit 004de82 into ocaml-flambda:main Dec 13, 2022
mshinwell added a commit to mshinwell/flambda-backend that referenced this pull request Dec 28, 2022
b11eea1 flambda-backend: Introduce Import_info (ocaml-flambda#1036)
bc5b135 flambda-backend: Fix `ocamlobjinfo` on flambda2 .cmx files (ocaml-flambda#1029)
c8babbd flambda-backend: Compilation_unit optimisations (ocaml-flambda#1035)
e8d3e22 flambda-backend: Use 4.14.0 opam switch for building (includes upgrading ocamlformat to 0.24.1) (ocaml-flambda#1030)
eb14a86 flambda-backend: Port PR81 from ocaml-jst (ocaml-flambda#1024)
131bc12 flambda-backend: Merge ocaml-jst 2022-12-13 (ocaml-flambda#1022)
06c189a flambda-backend: Make stack allocation the default (ocaml-flambda#1013)
98debd5 flambda-backend: Initial support for value slots not of value kind (ocaml-flambda#946)
deb1714 flambda-backend: Add is_last flag to closinfo words (ocaml-flambda#938)
d07fce1 flambda-backend: Disable poll insertion in Configure (ocaml-flambda#967)
0f1ce0e flambda-backend: Regenerate ocaml/configure autoconf 2.69 (instead of 2.71) (ocaml-flambda#1012)
27132d8 flambda-backend: Fix for spurious typing error related to expanding through functor arguments (ocaml-flambda#997)
724fb68 flambda-backend: Use `Compilation_unit.t` instead of `Ident.t` for globals (ocaml-flambda#871)
396d5b8 flambda-backend: Add a test for frametable setup in natdynlinked libraries (ocaml-flambda#983)
b73ab12 flambda-backend: Fix invocation of `caml_shared_startup` in native dynlink (ocaml-flambda#980)
7c7d75a flambda-backend: Fix split_default_wrapper which did not trigger anymore with flambda2 (ocaml-flambda#970)
8fb75bd flambda-backend: Port ocaml/ocaml#11727 and ocaml/ocaml#11732 (ocaml-flambda#965)
fdb7987 flambda-backend: Fix include functor issue after 4.14 merge. (ocaml-flambda#948)
9745cdb flambda-backend: Print -dprofile/-dtimings output to stdout like 4.12 (ocaml-flambda#943)
5f51f21 flambda-backend: Merge pull request ocaml-flambda#932 from mshinwell/4.14-upgrade
841687d flambda-backend: Run make alldepend in ocaml/ (ocaml-flambda#936)
72a7658 flambda-backend: Remove reformatting changes only in dynlink/dune (preserving PR889 and adjusting to minimise diff)
6d758cd flambda-backend: Revert whitespace changes in dune files, to match upstream
c86bf6e flambda-backend: Remove duplicate tests for polling
971dbeb flambda-backend: Testsuite fixes
32f8356 flambda-backend: Topeval fix for symbols patch
befea01 flambda-backend: Compilation fixes / rectify merge faults
a84543f flambda-backend: Merge ocaml-jst
8e65056 flambda-backend: Merge ocaml-jst
4d70045 flambda-backend: Remove filename from system frametable (amd64) (ocaml-flambda#920)
5e57b7d flambda-backend: Bugfix for runtime frame_descr logic for C frames (ocaml-flambda#918)
6423d5e flambda-backend: Merge pull request ocaml-flambda#914 from mshinwell/merge-ocaml-jst-2022-10-24
ead605c flambda-backend: Add a missing Extract_exception (ocaml-flambda#916)
c8f1481 flambda-backend: Resolve conflicts and add specialise/specialised attributes to Builtin_attributes
cf4d0d3 flambda-backend: Merge fixes (#21)
c2f742f flambda-backend: Re-enable some tests for Flambda2 (ocaml-flambda#881)
3d38d13 flambda-backend: Long frames in frametable (ocaml-flambda#797)
85aec7b flambda-backend: Add loop attribute to Builtin_attributes
c0f16e3 flambda-backend: Compilation fixes
90dea23 flambda-backend: Merge flambda-backend/main
5acc6ea flambda-backend: Fixes after merge
e501946 flambda-backend: Merge ocaml-jst
115083b flambda-backend: Merge ocaml-jst
9943b2e flambda-backend: Revert "Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"" (ocaml-flambda#909)
ce339f1 flambda-backend: Fix alloc modes and call kinds for overapplications (ocaml-flambda#902)
e6a317c flambda-backend: Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"
853c488 flambda-backend: Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)
5a977e4 flambda-backend: Fix missing End_region primitives on switch arms (ocaml-flambda#898)
7fa7f9d flambda-backend: Add missing dependencies to Dune files (ocaml-flambda#889)
3cd36f0 flambda-backend: Have Lambda `Pgetglobal` and `Psetglobal` take `Compilation_unit.t` (ocaml-flambda#896)
7565915 flambda-backend: [@poll error] attribute (ocaml-flambda#745)
9eb9448 flambda-backend: Backport the main safepoints PRs (ocaml-flambda#740)
689bdda flambda-backend: Add strict mode for ocamldep (ocaml-flambda#892)

git-subtree-dir: ocaml
git-subtree-split: b11eea1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant