Skip to content

Differentiate is_int primitive between generic and variant-only versions #749

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Jul 29, 2022
Merged

Differentiate is_int primitive between generic and variant-only versions #749

merged 3 commits into from
Jul 29, 2022

Conversation

lthls
Copy link
Contributor

@lthls lthls commented Jul 27, 2022

This is a proper version of #747.
The Pisint lambda primitive and Is_int flambda2 primitive are augmented with a boolean distinguishing the generic version, exposed as Obj.is_int, and the version used for compiling pattern-matching on variants.
This allows Flambda 2 to still precisely handle variants without being incorrect on the Obj.is_int version.

@lthls
Copy link
Contributor Author

lthls commented Jul 27, 2022

About the ocamlformat failure: I do have run make fmt on my side, with ocamlformat at version 0.19.0. And what I get is what I've committed. I'm wondering if someone silently updated the ocamlformat opam package to a slightly different version, otherwise I can't explain what's going on.

@xclerc
Copy link
Contributor

xclerc commented Jul 28, 2022

I was not able to get to the bottom of the fmt issue but
I suspect the semantics of ** is at play. Could you try to
manually expand the ** in the various ocamlformat files
and see whether that makes a difference? (it has, for me,
on another PR)

@lthls
Copy link
Contributor Author

lthls commented Jul 28, 2022 •
edited
Loading

Could you try to
manually expand the ** in the various ocamlformat files
and see whether that makes a difference? (it has, for me,
on another PR)

It seems to work: after expanding the ** in middle_end/.ocamlformat-enable, my local make fmt produces the same result as the CI.
The manual expansion doesn't look great though, so I'm not sure I should commit it.

@xclerc
Copy link
Contributor

xclerc commented Jul 28, 2022

I am not necessarily saying the expansion should be
committed, but it looks like either a bug in ocamlformat
or a misinterpretation of the intended semantics on our
part. In both cases, something we would like to discuss
with the ocamlformat developers; thanks for checking.

@xclerc
Copy link
Contributor

xclerc commented Jul 28, 2022

@gpetiot has figured the cause: ocaml-re 1.9.0 does
not work as expected, while 1.10.x does.

@lthls
Copy link
Contributor Author

lthls commented Jul 28, 2022

Thanks, I had re.1.9.0 installed indeed. I've upgraded now, so hopefully I shouldn't see these errors anymore.

@lthls lthls force-pushed the isint-for-variants branch from d6abeae to 0bc72ee Compare July 29, 2022 13:46
@mshinwell mshinwell merged commit c74ca60 into ocaml-flambda:main Jul 29, 2022
@mshinwell mshinwell mentioned this pull request Jul 29, 2022
Closed
ccasin added a commit to ccasin/flambda-backend that referenced this pull request Aug 3, 2022
@ccasin
Squashed 'ocaml/' changes from ac520fe..c7a46bb
30e6f6e 
c7a46bb flambda-backend: Bugfix for Cmmgen.expr_size with locals (ocaml-flambda#756)
b337cb6 flambda-backend: Fix build_upstream for PR749 (ocaml-flambda#750)
8e7e81c flambda-backend: Differentiate is_int primitive between generic and variant-only versions (ocaml-flambda#749)

git-subtree-dir: ocaml
git-subtree-split: c7a46bb
ccasin added a commit to ccasin/flambda-backend that referenced this pull request Aug 31, 2022
@ccasin
Squashed 'ocaml/' changes from 2118848..ccc356d
45a97dd 
ccc356d flambda-backend: Prevent dynamic loading of the same .cmxs twice in private mode, etc. (ocaml-flambda#784)
14eb572 flambda-backend: Make local extension point equivalent to local_ expression (ocaml-flambda#790)
487d11b flambda-backend: Fix tast_iterator and tast_mapper for include functor. (ocaml-flambda#795)
a50a818 flambda-backend: Reduce closure allocation in List (ocaml-flambda#792)
96c9c60 flambda-backend: Merge ocaml-jst
a775b88 flambda-backend: Fix ocaml/otherlibs/unix 32-bit build (ocaml-flambda#767)
f7c2679 flambda-backend: Create object files internally to avoid invoking GAS (ocaml-flambda#757)
c7a46bb flambda-backend: Bugfix for Cmmgen.expr_size with locals (ocaml-flambda#756)
b337cb6 flambda-backend: Fix build_upstream for PR749 (ocaml-flambda#750)
8e7e81c flambda-backend: Differentiate is_int primitive between generic and variant-only versions (ocaml-flambda#749)

git-subtree-dir: ocaml
git-subtree-split: ccc356d
mshinwell added a commit to mshinwell/flambda-backend that referenced this pull request Oct 24, 2022
@mshinwell
Squashed 'ocaml/' changes from 2118848..25188da
db559ae 
25188da flambda-backend: Missed comment from PR802 (ocaml-flambda#887)
9469765 flambda-backend: Improve the semantics of asynchronous exceptions (new simpler version) (ocaml-flambda#802)
d9e4dd0 flambda-backend: Fix `make runtest` on NixOS (ocaml-flambda#874)
4bbde7a flambda-backend: Simpler symbols (ocaml-flambda#753)
ef37262 flambda-backend: Add opaqueness to Obj.magic under Flambda 2 (ocaml-flambda#862)
a9616e9 flambda-backend: Add build system hooks for ocaml-jst (ocaml-flambda#869)
045ef67 flambda-backend: Allow the compiler to build with stock Dune (ocaml-flambda#868)
3cac5be flambda-backend: Simplify Makefile logic for natdynlinkops (ocaml-flambda#866)
c5b12bf flambda-backend: Remove unnecessary install lines (ocaml-flambda#860)
ff12bbe flambda-backend: Fix unused variable warning in st_stubs.c (ocaml-flambda#861)
c84976c flambda-backend: Static check for noalloc: attributes (ocaml-flambda#825)
ca56052 flambda-backend: Build system refactoring for ocaml-jst (ocaml-flambda#857)
39eb7f9 flambda-backend: Remove integer comparison involving nonconstant polymorphic variants (ocaml-flambda#854)
c102688 flambda-backend: Fix soundness bug by using currying information from typing (ocaml-flambda#850)
6a96b61 flambda-backend: Add a primitive to enable/disable the tick thread (ocaml-flambda#852)
f64370b flambda-backend: Make Obj.dup use a new primitive, %obj_dup (ocaml-flambda#843)
9b78eb2 flambda-backend: Add test for ocaml-flambda#820 (include functor soundness bug) (ocaml-flambda#841)
8f24346 flambda-backend: Add `-dtimings-precision` flag (ocaml-flambda#833)
65c2f22 flambda-backend: Add test for ocaml-flambda#829 (ocaml-flambda#831)
7b27a49 flambda-backend: Follow-up PR#829 (comballoc fixes for locals) (ocaml-flambda#830)
ad7ec10 flambda-backend: Use a custom condition variable implementation (ocaml-flambda#787)
3ee650c flambda-backend: Fix soundness bug in include functor (ocaml-flambda#820)
2f57378 flambda-backend: Static check noalloc (ocaml-flambda#778)
aaad625 flambda-backend: Emit begin/end region only when stack allocation is enabled (ocaml-flambda#812)
17c7173 flambda-backend: Fix .cmt for included signatures (ocaml-flambda#803)
e119669 flambda-backend: Increase delays in tests/lib-threads/beat.ml (ocaml-flambda#800)
ccc356d flambda-backend: Prevent dynamic loading of the same .cmxs twice in private mode, etc. (ocaml-flambda#784)
14eb572 flambda-backend: Make local extension point equivalent to local_ expression (ocaml-flambda#790)
487d11b flambda-backend: Fix tast_iterator and tast_mapper for include functor. (ocaml-flambda#795)
a50a818 flambda-backend: Reduce closure allocation in List (ocaml-flambda#792)
96c9c60 flambda-backend: Merge ocaml-jst
a775b88 flambda-backend: Fix ocaml/otherlibs/unix 32-bit build (ocaml-flambda#767)
f7c2679 flambda-backend: Create object files internally to avoid invoking GAS (ocaml-flambda#757)
c7a46bb flambda-backend: Bugfix for Cmmgen.expr_size with locals (ocaml-flambda#756)
b337cb6 flambda-backend: Fix build_upstream for PR749 (ocaml-flambda#750)
8e7e81c flambda-backend: Differentiate is_int primitive between generic and variant-only versions (ocaml-flambda#749)

git-subtree-dir: ocaml
git-subtree-split: 25188da
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mshinwell mshinwell mshinwell approved these changes

@lukemaurer lukemaurer Awaiting requested review from lukemaurer

@chambart chambart Awaiting requested review from chambart

@Gbury Gbury Awaiting requested review from Gbury

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lthls @xclerc @mshinwell