Expose the main entrypoint in compilerlibs#9688
Merged
stedolan merged 4 commits intoocaml:trunkfrom Jul 6, 2020
Merged
Conversation
7395fba to
ef5850c
Compare
nojb
reviewed
Jun 16, 2020
| print_string "Standard library directory: "; | ||
| print_string Config.standard_library; print_newline(); | ||
| exit 0 | ||
| raise (Exit_compiler 0) |
Contributor
There was a problem hiding this comment.
Have you checked that there are no more calls to exit in the compiler code?
Contributor
Author
There was a problem hiding this comment.
Yes, I've changed all the ones I could find that might be reachable from ocamlc or ocamlopt. (There are others used by tools other than the compiler)
gretay-js
reviewed
Jun 16, 2020
utils/clflags.ml
Outdated
| try | ||
| let argv = ref Sys.argv in | ||
| let argv = ref argv in | ||
| let current = ref (!Arg.current) in |
Contributor
There was a problem hiding this comment.
Should [current] be passed as an argument too? It's easy to forget to update Arg.current when calling main from the client of compiler-libs, possibly with a different argument array rather than Sys.argv.
Contributor
Author
There was a problem hiding this comment.
I've changed it to always start from 0. Since we're passing in argv, anyone whose wants to chop off some arguments can do so with Array.sub before here.
Contributor
There was a problem hiding this comment.
Yes, makes sense. I think the code that calls Clflags.parse_arguments in makedepend.ml needs to be adjusted this way, as makedepend advances Arg.current and fiddles with Sys.argv before calling parse_arguments.
Line 646 in 6f3fc91
Contributor
Author
There was a problem hiding this comment.
Nice catch! Thanks
dra27
reviewed
Jun 23, 2020
6f3fc91 to
cf25526
Compare
cf25526 to
34ead63
Compare
Contributor
Author
|
Any other comments? |
Gbury
pushed a commit
to ocaml-flambda/ocaml
that referenced
this pull request
Jul 31, 2020
Expose the main entrypoint in compilerlibs (cherry picked from commit 088fa01)
Gbury
pushed a commit
to ocaml-flambda/ocaml
that referenced
this pull request
Jul 31, 2020
Expose the main entrypoint in compilerlibs (cherry picked from commit 088fa01)
Gbury
pushed a commit
to ocaml-flambda/ocaml
that referenced
this pull request
Aug 20, 2020
Expose the main entrypoint in compilerlibs (cherry picked from commit 088fa01)
mshinwell
pushed a commit
to ocaml-flambda/ocaml
that referenced
this pull request
Aug 21, 2020
* Merge pull request ocaml#9688 from stedolan/main-compiler-libs * Gc.Memprof.start: take a record instead of 5 optional parameters * Try and vendor memtrace * Move memtrace to otherlibs * Add changes to configure * Add a memtrace-enabled ocamlopt as ocamlopt-memtrace * Fix dune build following driver split Co-authored-by: Stephen Dolan <sdolan@janestreet.com> Co-authored-by: Gabriel Scherer <gabriel.scherer@gmail.com>
lthls
pushed a commit
to lthls/ocaml
that referenced
this pull request
Sep 23, 2020
* Merge pull request ocaml#9688 from stedolan/main-compiler-libs * Gc.Memprof.start: take a record instead of 5 optional parameters * Try and vendor memtrace * Move memtrace to otherlibs * Add changes to configure * Add a memtrace-enabled ocamlopt as ocamlopt-memtrace * Fix dune build following driver split Co-authored-by: Stephen Dolan <sdolan@janestreet.com> Co-authored-by: Gabriel Scherer <gabriel.scherer@gmail.com>
lthls
pushed a commit
to lthls/ocaml
that referenced
this pull request
Sep 23, 2020
* Merge pull request ocaml#9688 from stedolan/main-compiler-libs * Gc.Memprof.start: take a record instead of 5 optional parameters * Try and vendor memtrace * Move memtrace to otherlibs * Add changes to configure * Add a memtrace-enabled ocamlopt as ocamlopt-memtrace * Fix dune build following driver split Co-authored-by: Stephen Dolan <sdolan@janestreet.com> Co-authored-by: Gabriel Scherer <gabriel.scherer@gmail.com>
lthls
pushed a commit
to lthls/ocaml
that referenced
this pull request
Sep 24, 2020
* Merge pull request ocaml#9688 from stedolan/main-compiler-libs * Gc.Memprof.start: take a record instead of 5 optional parameters * Try and vendor memtrace * Move memtrace to otherlibs * Add changes to configure * Add a memtrace-enabled ocamlopt as ocamlopt-memtrace * Fix dune build following driver split Co-authored-by: Stephen Dolan <sdolan@janestreet.com> Co-authored-by: Gabriel Scherer <gabriel.scherer@gmail.com>
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
4 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.
It's quite awkward to compile programs using a custom binary with compilerlibs, because there's a lot of logic in
main.mlandoptmain.mlthat needs to be replicated. (I was doing this to trace the compiler with memtrace).This patch exposes optmain and main in compilerlibs, and moves the actual entry point to the new, trivial
optmainentry.mlandmainentry.mlfiles.(Best reviewed commit-by-commit)