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

Use new primops names for converting numbers to and from the native size #305

Merged

Conversation

Ericson2314
Copy link
Contributor

This is a companion to https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4492.

I'm not sure why the second-to-top commit isn't already merged, as ghc HEAD relies on it.

CC @bgamari

@phadej
Copy link
Contributor

phadej commented Dec 1, 2020

I'm not sure why the second-to-top commit isn't already merged

The [CmmSized] adjust? I don't remember seeing PR for that. Ping @angerman?


Please don't add merge commits.

src/Data/Text/Array.hs Outdated Show resolved Hide resolved
@angerman
Copy link
Contributor

angerman commented Dec 1, 2020

I'm not sure why the second-to-top commit isn't already merged

The [CmmSized] adjust? I don't remember seeing PR for that. Ping @angerman?

@bgamari took over and said he'd do the submodule bumps, as I was unsure what exactly needed doing.

@bgamari
Copy link
Contributor

bgamari commented Dec 1, 2020

Sigh, indeed, mea culpa. It looks like the linter failed to catch this as the sized commit was reachable via a "permanent" ref on gitlab.haskell.org. @phadej, I'm afraid that either we will need to accept a merge commit here or push a tag to ensure that the existing commit remains reachable to ensure that GHC's history doesn't break.

Submodules are just awful.

@Ericson2314
Copy link
Contributor Author

@phadej, I'm afraid that either we will need to accept a merge commit here or push a tag to ensure that the existing commit remains reachable to ensure that GHC's history doesn't break.

Submodules are just awful.

Yeah I think if we just dispense with any hope of linear history and try to reconcile ghc-head branches with upstream master on an asynchronous basis, it will be the least bad.

@phadej
Copy link
Contributor

phadej commented Dec 1, 2020

The existing commit can be tagged with oops-keep-me.

@Ericson2314 Ericson2314 changed the title Wip/no extend narrow primop names Use new primops names for converting numbers to and from the native size Dec 3, 2020
@Ericson2314 Ericson2314 force-pushed the wip/no-extend-narrow-primop-names branch from d6a34c4 to 454cb82 Compare December 12, 2020 19:35
@phadej phadej marked this pull request as draft February 15, 2021 19:57
@phadej
Copy link
Contributor

phadej commented Feb 15, 2021

I converted this to draft. Please mark is as ready when it really is.

(Side comment, the history looks awful, please cleanup it before marking as ready fore review).

@Ericson2314 Ericson2314 force-pushed the wip/no-extend-narrow-primop-names branch from 7dcd547 to 2db29ea Compare February 17, 2021 16:13
@Ericson2314
Copy link
Contributor Author

In https://mail.haskell.org/pipermail/libraries/2021-February/031186.html I begin discussing this PR on the libraries list.

@phadej phadej marked this pull request as ready for review February 17, 2021 18:14
@phadej
Copy link
Contributor

phadej commented Feb 17, 2021

Fine. I'll merge this.

@phadej phadej merged commit c3be2ad into haskell:master Feb 17, 2021
@Ericson2314 Ericson2314 deleted the wip/no-extend-narrow-primop-names branch February 17, 2021 18:27
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

5 participants