Make domain state the same in bytecode and native mode #678
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.
This PR makes
struct domain_state
the same in both bytecode and native code.In the past, there was a
caml/byte_domain_state.tbl
which separated the additional bytecode domain state variables from those needed in native mode. ocaml/ocaml#10595 introduced anextra_params
variable that must be at the end of the structure. In the recent multicore rebase to latest trunk, the merge was done by moving thebyte_domain_state.tbl
insidedomain_state.tbl
and using an#ifndef NATIVE_CODE
guard.This PR attempts to simplify the situation by making the domain state structure identical in bytecode and native code. There is also a nagging concern that differing state tables could somehow be brittle for not a lot of gain.