-
Notifications
You must be signed in to change notification settings - Fork 94
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
Replace Num with ZArith for Cilint (for OCaml 4.06.0). #41
Open
clegoues
wants to merge
15
commits into
cil-project:develop
Choose a base branch
from
squaresLab:ocaml-4.06
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains 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
… modern equivalents
…le) to use Bytes instead
…rrently build (can't find Z)
…d use ocamlfind with ocamlbuild to find the library
…same behavior with previous versions of OCaml, while fixing compilation failure on 4.06
…vior with previous versions of OCaml, while fixing compilation failure on 4.06
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
OCaml 4.06.0 pulls the Num module out of stdlib into its own separate project. Nominally it's possible to maintain backwards compatibility by simply installing the now-separate Num (opam!) and presumably tweaking package info to pull in the now-external dependency. But as far as I can tell, it's totally impossible to do this on a machine that's ever had any previous version of ocaml installed. It may not be possible to do it on a fresh install, either; I wouldn't know.
tl;dr: ocamlfind couldn't find the new Num. There seems to be a solution involving pinning ocamlfind back to some previous version (see: BinaryAnalysisPlatform/bap#742), but that didn't work for me.
So. The recommendation is to use ZArith instead of Num anyway. Zarith is apparently a better, faster implementation of arbitrary-precision integers/rationals (https://github.com/ocaml/Zarith). Since building CIL with 4.06 involve adding an external dependency (to either Num or Zarith) and Num was giving me nightmares, I thought I'd try my hand at just replacing Num with Zarith and updating Cilint accordingly.
(TBH the rationale for continuing to wrap what-used-to-be-Bigint in Cilint isn't obvious to me, but that was a bigger refactor than I was willing to make without confirmation/blessing from the project owners/maintainers.)
Confirmed to build on 4.06+trunk, on Darwin and some arbitrary Ubuntu flavor (don't remember which one, I can check if you care), passes no fewer tests after than before.
Tricky bits: