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.

Sign up for GitHub

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

Jump to bottom

Resolve conflicts in asmcomp/*cmm* and middle_end/ #172

Merged
merged 9 commits into from
Oct 23, 2023
Merged

Resolve conflicts in asmcomp/*cmm* and middle_end/ #172

merged 9 commits into from
Oct 23, 2023

Conversation

mshinwell
Copy link
Contributor

Still to do (at least):

  • check compilation
  • check other places we might need to change in Cmm_helpers e.g. to use get_field_codepointer or mk_load_mut
  • fix Compilenv around the place the new check for packing was added, this isn't correct yet

Includes #171

ncik-roberts added a commit that referenced this pull request Oct 19, 2023
@ncik-roberts
Add mlis from #172
6bec979
@ncik-roberts ncik-roberts mentioned this pull request Oct 19, 2023
Merged
@ncik-roberts
Copy link
Contributor

Let's rebase this after #172 is merged. That's just the mli pieces.

goldfirere pushed a commit that referenced this pull request Oct 19, 2023
@ncik-roberts
Add mlis from #172 (#186)
65ab0e5
xclerc pushed a commit that referenced this pull request Oct 19, 2023
@ncik-roberts @xclerc
Add mlis from #172 (#186)
c8c6014
Ekdohibs
Ekdohibs reviewed Oct 20, 2023
View reviewed changes
Copy link
Contributor

@Ekdohibs Ekdohibs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly good, see comments.

asmcomp/cmm_helpers.ml Outdated Show resolved Hide resolved
asmcomp/cmm_helpers.ml Outdated Show resolved Hide resolved
middle_end/closure/closure.ml Outdated Show resolved Hide resolved
middle_end/convert_primitives.ml Outdated Show resolved Hide resolved
middle_end/printclambda_primitives.ml Outdated Show resolved Hide resolved
@mshinwell mshinwell force-pushed the ocaml5-resolve-conflicts-cmm-and-middle-end branch from c7e1e72 to 50a5c35 Compare October 20, 2023 11:59
@mshinwell
Copy link
Contributor Author

This is now done and ready for final review. cc @lukemaurer for Compilenv changes

@mshinwell mshinwell force-pushed the ocaml5-resolve-conflicts-cmm-and-middle-end branch from 7a7ab5d to 07cbb43 Compare October 20, 2023 12:39
Ekdohibs
Ekdohibs reviewed Oct 20, 2023
View reviewed changes
asmcomp/cmmgen.ml Outdated Show resolved Hide resolved
@mshinwell mshinwell force-pushed the ocaml5-resolve-conflicts-cmm-and-middle-end branch from 7a9adea to 1f48860 Compare October 20, 2023 15:31
@mshinwell mshinwell force-pushed the ocaml5-resolve-conflicts-cmm-and-middle-end branch from 1f48860 to c00f002 Compare October 23, 2023 09:13
@mshinwell mshinwell merged commit b936c16 into ocaml-flambda:main Oct 23, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ekdohibs Ekdohibs Ekdohibs approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mshinwell @ncik-roberts @Ekdohibs