jsoo: respect enabled_if when resolving libraries for archive rules - #14904
Merged
Conversation
Reproduce an internal error introduced by the demand-driven jsoo archive rules (ocaml#13611): when two libraries with the same name are distinguished by mutually exclusive enabled_if clauses, the rules are generated for the first stanza by position even when it is disabled, leading to a failed module lookup. Signed-off-by: Jérôme Vouillon <jerome.vouillon@gmail.com>
When generating jsoo library archive rules on demand, resolve the library stanza the same way Ml_sources does: evaluate enabled_if and pick the enabled stanza rather than the first one matching by name. Fixes an internal error (modules_and_obj_dir: failed lookup) when a dune file defines two libraries with the same name distinguished by mutually exclusive enabled_if clauses, as ocaml-re does for ppx_expect_common. Signed-off-by: Jérôme Vouillon <jerome.vouillon@gmail.com>
Collaborator
|
When looking at this issue before, I seem to recall being able to reproduce the error even when jsoo wasn't selected in the mode. It might be wroth checking if this behaviour in ocaml-re is specific to jsoo. I can check again later when I get some spare time. |
Member
Author
|
The issue with ocaml-re disappears if we remove |
Alizter
approved these changes
Jun 3, 2026
Member
|
IIUC, this fixes a regression, but it is missing a changelog entry. |
vouillon
added a commit
to vouillon/dune
that referenced
this pull request
Jul 7, 2026
vouillon
added a commit
to vouillon/dune
that referenced
this pull request
Jul 7, 2026
Signed-off-by: Jérôme Vouillon <jerome.vouillon@gmail.com>
vouillon
added a commit
to vouillon/dune
that referenced
this pull request
Jul 8, 2026
Signed-off-by: Jérôme Vouillon <jerome.vouillon@gmail.com>
shonfeder
added a commit
that referenced
this pull request
Jul 8, 2026
shonfeder
added a commit
that referenced
this pull request
Jul 9, 2026
pull Bot
pushed a commit
to metanivek/dune
that referenced
this pull request
Jul 10, 2026
…caml#14904) When generating jsoo library archive rules on demand, resolve the library stanza the same way Ml_sources does: evaluate enabled_if and pick the enabled stanza rather than the first one matching by name. Fixes an internal error (modules_and_obj_dir: failed lookup) when a dune file defines two libraries with the same name distinguished by mutually exclusive enabled_if clauses, as ocaml-re does for ppx_expect_common. Fixes ocaml#14775. (cherry picked from commit b0313ac) Signed-off-by: Shon Feder <shon.feder@gmail.com>
Alizter
added a commit
that referenced
this pull request
Jul 20, 2026
Replaces #15457 with a branch we can update. Backports #14904 and its changelog from #15441. It retains the existing js/wasm_of_ocaml 6.4 compatibility pin and adds two CI-only compatibility fixes: - cap the 3.24 dev dependency on Melange below 7.0, from #15322; - pin the OxCaml opam job to `wasm_of_ocaml-compiler.6.0.1+ox1`, matching the package set pinned by the release branch rather than advancing its flake and test expectations. These extra changes address CI dependency drift and are not release regressions. No local tests run; CI is the validation for these platform-specific dependency constraints.
avsm
pushed a commit
to ocaml/opam-repository
that referenced
this pull request
Jul 23, 2026
CHANGES: ### Fixed - Fix an internal error (`modules_and_obj_dir: failed lookup`) when generating `js_of_ocaml` archive rules for a dune file that defines two libraries with the same name distinguished by mutually exclusive `enabled_if` clauses, as `ocaml-re` does for `ppx_expect_common` (ocaml/dune#14904, fixes ocaml/dune#14775, @vouillon) - Fix passing environment variables to formatter actions (ocaml/dune#15386, @anmonteiro) - Fix missing source dependency in the sandbox when preprocessing Melange sources (ocaml/dune#15395, @anmonteiro) - Treat OCaml compiler packages version 5.5 or newer as relocatable so their installations do not use the toolchain cache (ocaml/dune#15444, fixes ocaml/dune#15443, @Alizter) - Fix `build_runtime_flags` given in a `js_of_ocaml`/`wasm_of_ocaml` field of an executable being silently ignored in separate compilation mode: such executables were given the workspace-shared standalone runtime, which is built with the default flags. Executables customizing `build_runtime_flags` now get their own standalone runtime again. (ocaml/dune#15455, @hhugo) - Use installed filenames for local package binaries in `%{bin:...}` PATH layouts on Windows (ocaml/dune#15518, fixes ocaml/dune#15512, @Alizter) ### Changed - Revert sandboxing Melange rules by default in the `(library ..)` and `(melange.emit ..)` stanzas. In Melange libraries with many modules, sandbox creation / destruction dominates build time and adds significant overhead to build time (ocaml/dune#15418, @anmonteiro)
pull Bot
pushed a commit
to metanivek/dune
that referenced
this pull request
Jul 24, 2026
(cherry picked from commit d015282) Signed-off-by: Shon Feder <shon.feder@gmail.com>
craff
pushed a commit
to craff/opam-repository
that referenced
this pull request
Jul 25, 2026
CHANGES: ### Fixed - Fix an internal error (`modules_and_obj_dir: failed lookup`) when generating `js_of_ocaml` archive rules for a dune file that defines two libraries with the same name distinguished by mutually exclusive `enabled_if` clauses, as `ocaml-re` does for `ppx_expect_common` (ocaml/dune#14904, fixes ocaml/dune#14775, @vouillon) - Fix passing environment variables to formatter actions (ocaml/dune#15386, @anmonteiro) - Fix missing source dependency in the sandbox when preprocessing Melange sources (ocaml/dune#15395, @anmonteiro) - Treat OCaml compiler packages version 5.5 or newer as relocatable so their installations do not use the toolchain cache (ocaml/dune#15444, fixes ocaml/dune#15443, @Alizter) - Fix `build_runtime_flags` given in a `js_of_ocaml`/`wasm_of_ocaml` field of an executable being silently ignored in separate compilation mode: such executables were given the workspace-shared standalone runtime, which is built with the default flags. Executables customizing `build_runtime_flags` now get their own standalone runtime again. (ocaml/dune#15455, @hhugo) - Use installed filenames for local package binaries in `%{bin:...}` PATH layouts on Windows (ocaml/dune#15518, fixes ocaml/dune#15512, @Alizter) ### Changed - Revert sandboxing Melange rules by default in the `(library ..)` and `(melange.emit ..)` stanzas. In Melange libraries with many modules, sandbox creation / destruction dominates build time and adds significant overhead to build time (ocaml/dune#15418, @anmonteiro)
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
3 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.
When generating jsoo library archive rules on demand, resolve the library stanza the same way Ml_sources does: evaluate enabled_if and pick the enabled stanza rather than the first one matching by name.
Fixes an internal error (modules_and_obj_dir: failed lookup) when a dune file defines two libraries with the same name distinguished by mutually exclusive enabled_if clauses, as ocaml-re does for ppx_expect_common.
Fixes #14775.