[5.4] Merge minus-37#239
Draft
dkalinichenko-js wants to merge 18 commits into
Draft
Conversation
Compiler Merge ChecklistThis PR seems to merge changes from Flambda. Please be sure to follow the below steps:
If this PR is not merging changes from Flambda, feel free to ignore this comment |
dkalinichenko-js
force-pushed
the
merge-5.4-minus37
branch
from
9ad0814 to
9d01f45
Compare
Squash the hard-overlay adaptation series into a single reviewable commit. This keeps the final adapted src/ocaml state for parser, typing, utils, and merlin-specific overlay drift, including the validation and review artifacts under docs/merge-artifacts/merlin-5.4-overlay. The resulting tree matches the pre-merge hard-overlay state before replaying the regular Merlin merge stack.
Resolve the raw conflict markers in upstream/ocaml_flambda/parsing/unit_info.mli by keeping the flambda Compilation_unit-shaped interface, preserving the existing CR comment, and retaining upstream declarations already present in that shape. Validation: strict conflict-marker audit on upstream/ocaml_flambda/parsing/unit_info.mli; src/ocaml diff against backup/merge-5.4-overlay-hard-before-regular-merlin-merge is empty.
Keep the local Menhir --lalr mode for the generated type parser while preserving the upstream release-profile promotion settings that were already present locally. Validation: strict conflict-marker audit on the bead scope; src/ocaml diff against backup/merge-5.4-overlay-hard-before-regular-merlin-merge is empty.
Resolve the granular marshal helper conflicts by adopting the upstream granular implementations, and keep the local CMS-aware indexing path while threading the upstream incremental index state and related-UID reporting through the shared artifact helper. Validation: strict conflict-marker audit on indexing files; src/ocaml diff against backup/merge-5.4-overlay-hard-before-regular-merlin-merge is empty.
Resolve the src/analysis conflict set to the completed overlay side, preserving the OxCaml/JST adaptations against the frozen src/ocaml APIs. The upstream regular merge changes in these hunks were not imported directly because they target the unfrozen upstream compiler API shape; the overlay branch is the source of truth for the already-adapted analysis behavior. Validation: strict conflict-marker audit on src/analysis; src/ocaml diff against backup/merge-5.4-overlay-hard-before-regular-merlin-merge is empty.
Resolve the frontend, command, kernel, and config conflict set to the completed overlay side so protocol glue remains consistent with the frozen src/ocaml and analysis APIs kept in the preceding resolution. Validation: strict conflict-marker audit on the bead scope; src/ocaml diff against backup/merge-5.4-overlay-hard-before-regular-merlin-merge is empty.
Adopt upstream package and flake metadata for the remaining infra conflicts, restore surrounding non-src/ocaml overlay source interfaces needed by the frozen overlay API, and remove upstream-added Merlin_utils Misc/Format_doc shadows that broke frozen src/ocaml compilation. Also resolve Dune metadata parser blockers in tests/dune and tests/test-dirs/locate/dune only so dune build can parse the workspace; test sources and expected-output conflicts remain deferred. Validation: final non-test marker audit is clean; src/ocaml diff against backup/merge-5.4-overlay-hard-before-regular-merlin-merge is empty. Build remains blocked by warning 8 in frozen src/ocaml/typing/out_type.ml, which this workflow forbids editing.
dkalinichenko-js
force-pushed
the
merge-5.4-minus37
branch
from
e072cf2 to
7b1152b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.