Skip to content

make short-paths work on more polymorphic variants#881

Merged
gasche merged 2 commits intoocaml:trunkfrom
v-gb:short-path-variants
Jan 2, 2017
Merged

make short-paths work on more polymorphic variants#881
gasche merged 2 commits intoocaml:trunkfrom
v-gb:short-path-variants

Conversation

@v-gb
Copy link
Contributor

@v-gb v-gb commented Oct 28, 2016

Compare without and with this change:

 $ ocaml -short-paths
        OCaml version 4.03.0+dev11-2015-10-19

 # module B = struct type perms = [ `A | `B ] end;;
 module B : sig type perms = [ `A | `B ] end
 # open B;;
 # let x = lazy (assert false : [< B.perms ]);;
-val x : [< B.perms ] lazy_t = <lazy>
+val x : [< perms ] lazy_t = <lazy>
 #

@gasche
Copy link
Member

gasche commented Nov 12, 2016

The proposed change seems correct to me (using args here corresponds to replacing tree_of_typlist sch tyl by tree_of_typlist sch (apply_subst s tyl)), but I don't understand the code very well. @garrigue, this is code you added in 00e7279 , do you agree that the substitution should happen here as well?

@lpw25
Copy link
Contributor

lpw25 commented Nov 12, 2016

I think the change needs to be guarded by an is_nth check.

@v-gb v-gb force-pushed the short-path-variants branch from 16a9393 to 533ec98 Compare November 15, 2016 03:24
@v-gb
Copy link
Contributor Author

v-gb commented Nov 15, 2016

Ah, it looks like the path returned by best_type_path is garbage when the param_subst is Nth. I undid the change when that happens. Ideally I would put List.hd args into the AST instead, but I don't know how to do that, and it seems very unlikely to show up in practice.

@v-gb v-gb force-pushed the short-path-variants branch 2 times, most recently from b00eb0e to 8cff729 Compare December 5, 2016 04:54
@v-gb
Copy link
Contributor Author

v-gb commented Dec 5, 2016

After looking at PR#6836, I changed the outcome tree as Garrigue described.

It's now pretty clear this change is correct: this branch is only about choosing to omit the brackets (ie simplifying [ | M.t ] into M.t), and the then case was already using the short-path'ed type contructor, so the else branch should too.

@mshinwell
Copy link
Contributor

mshinwell commented Dec 28, 2016

@lpw25 Can you confirm this is correct now?

@lpw25
Copy link
Contributor

lpw25 commented Jan 2, 2017

It now looks correct to me.

@gasche
Copy link
Member

gasche commented Jan 2, 2017

According to Travis, this patchset (1) lacks a Changes entry and (2) breaks the Camlp4 build because, if I understand correctly, of the change to the outcometree type:

File "camlp4/Camlp4Top/Rprint.ml", line 176, characters 10-19:
Error: This variant pattern is expected to have type Outcometree.out_variant
       The constructor Ovar_name does not belong to type Outcometree.out_variant

It would be nice to patch camlp4's master branch to fix this, so that we can merge both at once and not break the Travis CI for everyone -- while maintaining that camlp4 checking that I think is useful.

@v-gb v-gb force-pushed the short-path-variants branch from 826c488 to da564da Compare January 2, 2017 19:54
@v-gb
Copy link
Contributor Author

v-gb commented Jan 2, 2017

I added a Changes entry and fixed the camlp4 build in camlp4/camlp4#118.

@gasche gasche merged commit fae3ed0 into ocaml:trunk Jan 2, 2017
@gasche
Copy link
Member

gasche commented Jan 2, 2017

Thanks! (I don't really deserve a "review" mention on this one that I was largely clueless about.)

@gasche
Copy link
Member

gasche commented Jan 2, 2017 •
edited
Loading

Thinking more about this, I think we should mention that this changes the Outcometree definition, in case other consumers (than Camlp4) are relying on it. (Thinking more about this, I'm starting to get mildly worried that this may affect too many people; I would consider reverting if it turned out to be the case, so please complain here if it breaks your code.)

P.S.: I'll write to @roglo that Camlp5 should probably be updated.

gasche added a commit that referenced this pull request Jan 2, 2017
@gasche
PR #881: explicit the Outcometree change that may affect compiler-lib…
239c054 
…s users
@gasche
Copy link
Member

gasche commented Jan 2, 2017

I made the Outcometree change more explicit in the Changelog: 239c054

@roglo
Copy link
Contributor

roglo commented Jan 4, 2017

Current git of Camlp5 updated for current trunk.

@v-gb v-gb deleted the short-path-variants branch September 17, 2017 13:36
camlspotter pushed a commit to camlspotter/ocaml that referenced this pull request Oct 17, 2017
@gasche
Merge pull request ocaml#881 from sliquister/short-path-variants
d1bc977 
make short-paths work on more polymorphic variants
camlspotter pushed a commit to camlspotter/ocaml that referenced this pull request Oct 17, 2017
@gasche
PR ocaml#881: explicit the Outcometree change that may affect compile…
e786c1b 
…r-libs users
@gasche gasche mentioned this pull request Jul 24, 2019
Closed
stedolan pushed a commit to stedolan/ocaml that referenced this pull request Oct 25, 2022
@Keryan-dev @lthls
Re-enable some tests for Flambda2 (ocaml#881)
7003cc0 
Co-authored-by: Vincent Laviron <[email protected]>
sadiqj pushed a commit to sadiqj/ocaml that referenced this pull request Feb 21, 2023
@Keryan-dev @lthls
flambda-backend: Re-enable some tests for Flambda2 (ocaml#881)
c2f742f 
Co-authored-by: Vincent Laviron <[email protected]>
stedolan pushed a commit to stedolan/ocaml that referenced this pull request Mar 21, 2023
@mshinwell
Squashed 'ocaml/' changes from 5bf2820..b11eea1
f97a773 
b11eea1 flambda-backend: Introduce Import_info (ocaml#1036)
bc5b135 flambda-backend: Fix `ocamlobjinfo` on flambda2 .cmx files (ocaml#1029)
c8babbd flambda-backend: Compilation_unit optimisations (ocaml#1035)
e8d3e22 flambda-backend: Use 4.14.0 opam switch for building (includes upgrading ocamlformat to 0.24.1) (ocaml#1030)
eb14a86 flambda-backend: Port PR81 from ocaml-jst (ocaml#1024)
131bc12 flambda-backend: Merge ocaml-jst 2022-12-13 (ocaml#1022)
06c189a flambda-backend: Make stack allocation the default (ocaml#1013)
98debd5 flambda-backend: Initial support for value slots not of value kind (ocaml#946)
deb1714 flambda-backend: Add is_last flag to closinfo words (ocaml#938)
d07fce1 flambda-backend: Disable poll insertion in Configure (ocaml#967)
0f1ce0e flambda-backend: Regenerate ocaml/configure autoconf 2.69 (instead of 2.71) (ocaml#1012)
27132d8 flambda-backend: Fix for spurious typing error related to expanding through functor arguments (ocaml#997)
724fb68 flambda-backend: Use `Compilation_unit.t` instead of `Ident.t` for globals (ocaml#871)
396d5b8 flambda-backend: Add a test for frametable setup in natdynlinked libraries (ocaml#983)
b73ab12 flambda-backend: Fix invocation of `caml_shared_startup` in native dynlink (ocaml#980)
7c7d75a flambda-backend: Fix split_default_wrapper which did not trigger anymore with flambda2 (ocaml#970)
8fb75bd flambda-backend: Port ocaml#11727 and ocaml#11732 (ocaml#965)
fdb7987 flambda-backend: Fix include functor issue after 4.14 merge. (ocaml#948)
9745cdb flambda-backend: Print -dprofile/-dtimings output to stdout like 4.12 (ocaml#943)
5f51f21 flambda-backend: Merge pull request ocaml#932 from mshinwell/4.14-upgrade
841687d flambda-backend: Run make alldepend in ocaml/ (ocaml#936)
72a7658 flambda-backend: Remove reformatting changes only in dynlink/dune (preserving PR889 and adjusting to minimise diff)
6d758cd flambda-backend: Revert whitespace changes in dune files, to match upstream
c86bf6e flambda-backend: Remove duplicate tests for polling
971dbeb flambda-backend: Testsuite fixes
32f8356 flambda-backend: Topeval fix for symbols patch
befea01 flambda-backend: Compilation fixes / rectify merge faults
a84543f flambda-backend: Merge ocaml-jst
8e65056 flambda-backend: Merge ocaml-jst
4d70045 flambda-backend: Remove filename from system frametable (amd64) (ocaml#920)
5e57b7d flambda-backend: Bugfix for runtime frame_descr logic for C frames (ocaml#918)
6423d5e flambda-backend: Merge pull request ocaml#914 from mshinwell/merge-ocaml-jst-2022-10-24
ead605c flambda-backend: Add a missing Extract_exception (ocaml#916)
c8f1481 flambda-backend: Resolve conflicts and add specialise/specialised attributes to Builtin_attributes
cf4d0d3 flambda-backend: Merge fixes (ocaml#21)
c2f742f flambda-backend: Re-enable some tests for Flambda2 (ocaml#881)
3d38d13 flambda-backend: Long frames in frametable (ocaml#797)
85aec7b flambda-backend: Add loop attribute to Builtin_attributes
c0f16e3 flambda-backend: Compilation fixes
90dea23 flambda-backend: Merge flambda-backend/main
5acc6ea flambda-backend: Fixes after merge
e501946 flambda-backend: Merge ocaml-jst
115083b flambda-backend: Merge ocaml-jst
9943b2e flambda-backend: Revert "Revert "Transform tail-recursive functions into recursive continuations (ocaml#893)"" (ocaml#909)
ce339f1 flambda-backend: Fix alloc modes and call kinds for overapplications (ocaml#902)
e6a317c flambda-backend: Revert "Transform tail-recursive functions into recursive continuations (ocaml#893)"
853c488 flambda-backend: Transform tail-recursive functions into recursive continuations (ocaml#893)
5a977e4 flambda-backend: Fix missing End_region primitives on switch arms (ocaml#898)
7fa7f9d flambda-backend: Add missing dependencies to Dune files (ocaml#889)
3cd36f0 flambda-backend: Have Lambda `Pgetglobal` and `Psetglobal` take `Compilation_unit.t` (ocaml#896)
7565915 flambda-backend: [@poll error] attribute (ocaml#745)
9eb9448 flambda-backend: Backport the main safepoints PRs (ocaml#740)
689bdda flambda-backend: Add strict mode for ocamldep (ocaml#892)

git-subtree-dir: ocaml
git-subtree-split: b11eea1
EmileTrotignon pushed a commit to EmileTrotignon/ocaml that referenced this pull request Jan 12, 2024
@cuihtlauac
Ood: Use Result.map (ocaml#881)
ad616ce 
* Decode: result instead of exception

---------

Co-authored-by: Cuihtlauac ALVARADO <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@v-gb @gasche @lpw25 @mshinwell @roglo