Skip to content
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

Fix import of atomic shims for GHC 9.10 #90

Merged
merged 1 commit into from Apr 16, 2024

Conversation

bgamari
Copy link
Contributor

@bgamari bgamari commented Mar 27, 2024

The shims in question are written in Cmm and therefore should be prim imports.

This will require https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12316 as previously State# was not allowed in the result or argument types of a prim imports.

See GHC #24595.

Copy link
Collaborator

@RyanGlScott RyanGlScott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @bgamari! Obviously, we'll want to want until https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12316 has landed before merging this PR, but the shape of the PR looks great. One minor suggestion inline.

atomic-primops/Data/Atomics.hs Outdated Show resolved Hide resolved
The shims in question are written in Cmm and therefore should be `prim`
imports.

See GHC #24595.
@RyanGlScott
Copy link
Collaborator

GHC 9.10.1-alpha3 is now out, which includes the changes from https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12316. As such, I think it's safe to land this PR and release it.

Thanks again, @bgamari!

@RyanGlScott RyanGlScott merged commit 40894b3 into rrnewton:master Apr 16, 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.

None yet

2 participants