Skip to content

Conversation

@whitequark
Copy link
Member

@gasche
Copy link
Member

gasche commented May 6, 2014

The patch is fine, but 4.02 is now in feature freeze, so I'll wait for the next trunk branch (in about a week) before merging.

@whitequark
Copy link
Member Author

@gasche So, http://caml.inria.fr/mantis/view.php?id=6399 will have to wait for 4.03 too? That's annoying :/

@kit-ty-kate
Copy link
Member

That would be a shame :(

@lpw25
Copy link
Contributor

lpw25 commented May 6, 2014

So, http://caml.inria.fr/mantis/view.php?id=6399 will have to wait for 4.03 too? That's annoying

That one might get in as a bug fix, since it is a bit of an oversight for extension points.

@whitequark
Copy link
Member Author

@jpdeplaix I think I'll then add a workaround to utop so that #ppx will work there.

@kit-ty-kate
Copy link
Member

But it removes all the scripting possibilities with ppx (without utop) :/

@whitequark
Copy link
Member Author

@jpdeplaix you can still provide them in command line: #!ocaml -ppx ppx_foo

@whitequark
Copy link
Member Author

@gasche 4.02 has been branched out, can you revisit?

@alainfrisch
Copy link
Contributor

This can be seen as an extra step to address Mantis' #5904. I've committed the unobtrusive and non-risky patch to 4.02.

bactrian pushed a commit that referenced this pull request May 13, 2014
@whitequark
Copy link
Member Author

Thanks!

@whitequark whitequark closed this May 13, 2014
@whitequark whitequark deleted the pr6398 branch May 13, 2014 14:40
@whitequark
Copy link
Member Author

@alainfrisch I've just noticed that this PR is currently merged only to 4.02 branch, but not to trunk. Could you fix this?

@mshinwell
Copy link
Contributor

I've merged this patch to trunk (rev. 14928).

bactrian pushed a commit that referenced this pull request May 30, 2014
bactrian pushed a commit that referenced this pull request Apr 18, 2015
anmolsahoo25 pushed a commit to anmolsahoo25/ocaml that referenced this pull request Aug 25, 2020
check for stw_leader before we take the locks
poechsel pushed a commit to poechsel/ocaml that referenced this pull request Jul 2, 2021
* Update script for cherry-picking from upstream to flambda-backend

* Rename cherry-pick-to-ocaml.sh to cherry-pick.sh

The script cherry-picks to other subdirectories, not only to ocaml.
Et7f3 added a commit to Et7f3/ocaml that referenced this pull request Sep 30, 2021
stedolan added a commit to stedolan/ocaml that referenced this pull request Nov 30, 2021
stedolan added a commit to stedolan/ocaml that referenced this pull request May 24, 2022
173842c Merge flambda-backend changes
ed7eba2 Remove leading space from LINE. (oxcaml/oxcaml#484)
bd61170 Bump magic numbers (ocaml#5)
c50c47d Add CI builds with local allocations enabled
1412792 Move local allocations support behind '-extension local'
6d8e42a Better tail call behaviour in caml_applyN
c7dac3d Typemod: toplevel bindings escape even if no variables are bound
82d6c3e Several fixes for partial application and currying
d05c70c Pprintast support for new local syntax
e0e62fc Typecheck x |> f y as (f y x), not ((f y) x)
d7e34ce Remove autogeneration of @ocaml.curry
b9a0593 Port oxcaml/oxcaml#493
0a872d9 Code review fixes from oxcaml/oxcaml#491
6c168bb Remove local allocation counting
3c6e7f0 Code review fixes from oxcaml/oxcaml#478
bb97207 Rename Lambda.apply_position
a7cb650 Quieten Makefile when runtime dep files are not present
c656dc9 Merge flambda-backend changes
11b5424 Avoid printing double spaces in function argument lists
7751faa Restore locations to Typedtree.{pat,let}_bound_idents_full
e450b6c add build_ocaml_compiler.sexp
0403bb3 Revert PR 9895 to continue installing VERSION
b3447db Ensure new local attributes are namespaced properly
7f213fc Allow empty functions again
8f22ad8 Bugfix: ensure local domain state is initialised
80f54dd Bugfix for Selectgen with regions
e8133a1 Fix external-external signature inclusion
9840051 Bootstrap
d879f23 Merge remote-tracking branch 'jane/local-reviewed' into local-merge
94454f5 Use Local_store for the local allocations ref
54a164c Create fewer regions, according to typechecking (ocaml#59)
1c2479b Merge flambda-backend changes
ce34678 Fix printing of modes in return types
91f2281 Hook mode variable solving into Btype.snapshot/backtrack
54e4b09 Move Alloc_mode and Value_mode to Btype
ff4611e Merge flambda-backend changes
ce62e45 Ensure allocations are initialised, even dead ones
6b6ec5a Fix the alloc.ml test on 32-bit builds
81e9879 Merge flambda-backend changes
40a7f89 Update repo URL for ocaml-jst, and rename script.
0454ee7 Add some new locally-allocating primitives (ocaml#57)
8acdda1 Reset the local stack pointer in exception handlers (ocaml#56)
8dafa98 Improve typing for (||) and (&&) (ocaml#55)
8c64754 Fix make_check_all_arches (ocaml#54)
b50cd45 Allow arguments to primitives to be local even in tail position (ocaml#53)
cad125d Fix modes from or-patterns (ocaml#50)
4efdb72 Fix tailcalls tests with inlining (ocaml#52)
4a795cb Flambda support (ocaml#49)
74722cb Add [@ocaml.principal] and [@ocaml.noprincipal] attributes, and use in oo.mli
6d7d3b8 Ensure that functions are evaluated after their arguments (flambda-backend ocaml#353)
89bda6b Keep Sys.opaque_identity in Cmm and Mach (port upstream PR 9412)
a39126a Fix tailcalls within regions (ocaml#48)
4ac4cfd Fix stdlib manpages build
3a95f5e Merge flambda-backend changes
efe80c9 Add jane/pull-flambda-patches script
fca94c4 Register allocations for Omitted parameter closures (ocaml#47)
103b139 Remove various FIXMEs (ocaml#46)
62ba2c1 Bootstrap
a0062ad Allow local allocations for various primitives (ocaml#43)
7a2165e Allow primitives to be poly-moded (ocaml#43)
2af3f55 Fix a flaky test by refactoring TypePairs (ocaml#10638)
58dd807 Bootstrap
ee3be10 Fix modes in build_apply for partial applications
fe73656 Tweak for evaluation order of labelled partial applications (ocaml#10653)
0527570 Fix caml_modify on local allocations (ocaml#40)
e657e99 Relax modes for `as` patterns (ocaml#42)
f815bf2 Add special mode handling for tuples in matches and let bindings (ocaml#38)
39f1211 Only take the upper bounds of modes associated with allocations (ocaml#37)
aec6fde Interpret arrow types in "local positions" differently
c4f3319 Bootstrap
ff6fdad Add some missing regions
40d586d Bootstrap
66d8110 Switch to a system with 3 modes for values
f2c5a85 Bugfix for Comballoc with local allocations. (ocaml#41)
83bcd09 Fix bug with root scanning during compaction (ocaml#39)
1b5ec83 Track modes in Lambda.lfunction and onwards (ocaml#33)
f1e2e97 Port ocaml#10728
56703cd Port ocaml#10081
eb66785 Support local allocations in i386 and fix amd64 bug (ocaml#31)
c936b19 Disallow local recursive non-functions (ocaml#30)
c7a193a GC support for local allocations (ocaml#29)
8dd7270 Nonlocal fields (ocaml#28)
e19a2f0 Bootstrap
694b9ac Add syntax to the parser for local allocations (ocaml#26)
f183008 Lower initial stack size
918226f Allow local closure allocations (ocaml#27)
2552e7d Introduce mode variables (ocaml#25)
bc41c99 Minor fixes for local allocations (ocaml#24)
a2a4e60 Runtime and compiler support for more local allocations (ocaml#23)
d030554 Typechecking for local allocations (ocaml#21)
9ee2332 Bugfix missing from ocaml#20
02c4cef Retain block-structured local regions until Mach.
86dbe1c amd64: Move stack realloc calls out-of-line
324d218 More typing modes and locking of environments
a4080b8 Initial version of local allocation (unsafe)

git-subtree-dir: ocaml
git-subtree-split: 173842c
phated pushed a commit to phated/ocaml that referenced this pull request Jul 8, 2022
Chore: Use upstream flexdll since all PR are merged. (ocaml#54)

Fix: quote prefix so that it may contain spaces on Windows (ocaml#53)

Sh hardening (ocaml#57) (ocaml#58)

* chore: pass all flag to configure as it handle overwrite of arguments.

* perf: Use exec for explicit tail-call and . to avoid launching new shell.

* cmd: shellcheck -s sh esy-build esy-configure

In esy-build line 9:
set -o pipefail
       ^------^ SC3040: In POSIX sh, set option pipefail is undefined.

In esy-configure line 21:
set -o pipefail
       ^------^ SC3040: In POSIX sh, set option pipefail is undefined.

https://www.shellcheck.net/wiki/SC3040 -- In POSIX sh, set option pipefail ...

* misc: use uniform shebang

* cmd: shellcheck -s sh clone-flexdll

* misc: Remove useless invocation of `make flexdll`.

Co-authored-by: Et7f3 <[email protected]>
EmileTrotignon pushed a commit to EmileTrotignon/ocaml that referenced this pull request Jan 12, 2024
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.

6 participants