Skip to content
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

Translation: resolve conflicts in remaining files (translmod, transclass, translobj, translprim, translattribute, switch) #182

Conversation

ncik-roberts
Copy link
Contributor

@ncik-roberts ncik-roberts commented Oct 19, 2023

Finish off what #179 and #171 started.

Notable resolutions:

  • As explained in Translation: Resolve conflicts in matching.ml and translcore.ml #179, there's a new field on Pfield. An unresolved thread on that PR is also relevant here: Should accessing a module field be Reads_vary like it is upstream? I've asked Mark to weigh in.
  • Lambda.lfunction was made a private type with a smart constructor both internally and upstream, and we have some extra arguments (region, mode). These are trivial to resolve.
  • Two small diffs that we pull in from: Use Compilation_unit.t instead of Ident.t for globals flambda-backend#871
    • explains diff in translmod.ml where we don't need is_compilation_unit
    • explains diff in translprim.ml for add_used_primtive (where a change made upstream is irrelevant for us)
  • Hardcoded checks for misplaced attribute warning go away internally, in preference for the more general framework in Chris's patch
  • Threading through of kinds

Testing

for module in translclass translobj translmod translprim translattribute switch; do
  dune b --workspace=duneconf/boot.ws _build/default/.ocamlcommon.objs/native/$module.cmx
done

@ncik-roberts ncik-roberts changed the base branch from main to ocaml5-resolve-conflicts-translation October 19, 2023 13:11
@ncik-roberts ncik-roberts force-pushed the ocaml5-resolve-conflicts-translation branch from eb67984 to eba4129 Compare October 19, 2023 13:14
@ncik-roberts ncik-roberts force-pushed the ocaml5-resolve-conflicts-translation2 branch from ac04e61 to 4f2ddd3 Compare October 19, 2023 13:15
@ncik-roberts ncik-roberts force-pushed the ocaml5-resolve-conflicts-translation2 branch from 4f2ddd3 to e98fcb2 Compare October 19, 2023 13:16
lambda/translattribute.ml Show resolved Hide resolved
lambda/translattribute.ml Show resolved Hide resolved
@goldfirere goldfirere merged commit e3dd526 into ocaml5-resolve-conflicts-translation Oct 19, 2023
2 checks passed
@goldfirere
Copy link
Contributor

Hmmm.... maybe that was a bad idea because this was targeting a branch.

@ncik-roberts
Copy link
Contributor Author

ncik-roberts commented Oct 19, 2023

I think that's OK. There's only two small unresolved questions on the target that Mark will look at tomorrow, and I don't think this is blocking anything (it's just mls).

@ncik-roberts ncik-roberts deleted the ocaml5-resolve-conflicts-translation2 branch October 19, 2023 14:56
ncik-roberts added a commit that referenced this pull request Oct 23, 2023
…179)

* matching.ml and translcore.ml

* Translation: resolve conflicts in remaining files (`translmod`, `transclass`, `translobj`, `translprim`, `translattribute`, `switch`) (#182)

* Get transclass to build

* Get translobj to build

* Get translmod to build

* Get translprim to build

* Get translattribute.ml to build

* Get switch to build
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.

2 participants