Add GHC 9 support #84

AriFordsham · 2021-08-01T22:36:26Z

I've modified ghc-source-gen so it builds and passes tests on GHC 9.0.1. I hope you find this useful for #77.

It's not production-ready; I just 'brute-forced' it - I definitely broke GHC 8.10, and I just stubbed out any new features etc. with whatever seemed to make sense to allow building.

I had to comment out two tests to get it to build; all other tests are passing.

Main issues:

HsTyVarBndr now has a Specificity flag
linear arrows in `infixCon``
Various pass-dependent things have been lifted to type-level and now have less fields. Especially troublesome are the ConPat constructor(s)

google-cla · 2021-08-01T22:36:38Z

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.

What to do if you already signed the CLA

Individual signers

It's possible we don't have your GitHub username or you're using a different email address on your commit. Check your existing CLA data and verify that your email is set on your git commits.

Corporate signers

Your company has a Point of Contact who decides which employees are authorized to participate. Ask your POC to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the Google project maintainer to go/cla#troubleshoot (Public version).
The email used to register you as an authorized contributor must be the email used for the Git commit. Check your existing CLA data and verify that your email is set on your git commits.
The email used to register you as an authorized contributor must also be attached to your GitHub account.

ℹ️ Googlers: Go here for more info.

AriFordsham · 2021-08-01T22:37:48Z

@googlebot I signed it!

AriFordsham · 2021-08-01T23:20:45Z

Please note I added a GHC 9 CI job and deleted the others.

blackgnezdo · 2021-08-02T01:15:52Z

Please note I added a GHC 9 CI job and deleted the others.

Is supporting at least ghc 8.10 too much trouble? I'm worried about single-target releases.

blackgnezdo · 2021-08-02T01:19:12Z

Please note I added a GHC 9 CI job and deleted the others.

Is supporting at least ghc 8.10 too much trouble? I'm worried about single-target releases.

I think I understand now, this PR shows what it takes to get ghc 9 compatibility. Somebody needs to finish the change so that multiple versions can coexist.

This makes sense, thanks for the PR!

AriFordsham · 2021-08-02T08:10:46Z

Please note I added a GHC 9 CI job and deleted the others.

Is supporting at least ghc 8.10 too much trouble? I'm worried about single-target releases.

I think I understand now, this PR shows what it takes to get ghc 9 compatibility. Somebody needs to finish the change so that multiple versions can coexist.

This makes sense, thanks for the PR!

I don't even know if new functionality is correct. I just know it builds.

AriFordsham · 2021-08-02T15:08:40Z

I think GHC 9 support #77 can be considered working experimentally at this stage: There's no new GHC 9 features, and I can't garantee I haven't broken anything making the neccesary GHC 9 changes. GHC 8 should be working unchanged.

blackgnezdo

Looks like we had a pre-existing lie:
https://www.stackage.org/lts-15.13 is for ghc-8.8.3 and so when I run your change in with ghc 8.10 I hit:

ghc-source-gen      >         
ghc-source-gen      > /home/greg/s/ghc-source-gen/src/GHC/SourceGen/Decl.hs:174:25: error:
ghc-source-gen      >     Data constructor not in scope: NoLayoutInfo :: NoExtField
ghc-source-gen      >     |   
ghc-source-gen      > 174 |             , tcdCExt = NoLayoutInfo 
ghc-source-gen      >     |                         ^^^^^^^^^^^^
ghc-source-gen      >

I'll update the CI to be less broken.

blackgnezdo · 2021-08-03T04:39:21Z

Could you rebase on top of #85 and make the tests pass?

AriFordsham · 2021-08-03T11:39:42Z

I'll look at it sometime. I also remember that I left two test cases commented out - I should try to fix those, or at least document if I've broken the API.

Reinstated CI GHC 8 should be as was No new GHC 9 functionality; can't be sure I haven't broken anything on GHC 9

Attempt GHC 9 CI fix by clearing cache

google-cla · 2021-08-03T11:55:02Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

AriFordsham · 2021-08-03T11:56:06Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

@blackgnezdo

google-cla · 2021-08-03T11:56:21Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

…ce-gen into ari-f-ghc-9

google-cla · 2021-08-03T12:06:36Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

google-cla · 2021-08-03T12:12:51Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

google-cla · 2021-08-03T12:42:09Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

google-cla · 2021-08-03T13:17:49Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

AriFordsham

I've marked all meaningful changes.

AriFordsham · 2021-08-03T13:21:30Z

src/GHC/SourceGen/Pat/Internal.hs

@@ -24,9 +31,15 @@ needsPar (NPat _ l _ _) = overLitNeedsParen $ unLoc l
 needsPar (LitPat l) = litNeedsParen l
 needsPar (NPat l _ _ _) = overLitNeedsParen $ unLoc l
 #endif
+#if MIN_VERSION_ghc(9,0,1)
+-- Think this is correct; can't be sure - AF


Please confirm this is correct.

AriFordsham · 2021-08-03T13:35:32Z

src/GHC/SourceGen/Decl.hs

+        name
+            $ PrefixCon
+#if MIN_VERSION_ghc(9,0,1)
+                $ map (HsScaled (HsUnrestrictedArrow NormalSyntax) . renderField)


HsConDetails of HsConDeclDetails now yas HsScaled wrapped around its first field. I've stubbed this with (HsScaled (HsUnrestrictedArrow NormalSyntax)

AriFordsham · 2021-08-03T13:36:47Z

src/GHC/SourceGen/Decl.hs

+        )
+        (
+#if MIN_VERSION_ghc(9,0,1)
+            HsScaled (HsUnrestrictedArrow NormalSyntax) $ 


As https://github.com/google/ghc-source-gen/pull/84/files#diff-263c7e2dfeb2bc2ce2c281b616df4b4b6b2332a1258f6cf5a05e3822bd61db05R334

AriFordsham · 2021-08-03T13:37:29Z

src/GHC/SourceGen/Overloaded.hs

-instance BVar HsTyVarBndr' where
+#if MIN_VERSION_ghc(9,0,1)
+instance BVar HsTyVarBndrSpec' where
+    bvar = noExt UserTyVar SpecifiedSpec . typeRdrName . UnqualStr


No idea whether this is correct

AriFordsham · 2021-08-03T13:37:58Z

src/GHC/SourceGen/Pretty.hs

+            h
+            neverQualify
+#if MIN_VERSION_ghc(9,0,1)
+                AllTheWay


Don't know whether this is correct

AriFordsham · 2021-08-03T13:38:30Z

src/GHC/SourceGen/Type.hs

+a --> b =
+    noExt HsFunTy
+#if MIN_VERSION_ghc(9,0,1)
+        (HsUnrestrictedArrow NormalSyntax)


Again, stubbed out linear arrow type

AriFordsham · 2021-08-03T13:39:01Z

src/GHC/SourceGen/Decl.hs

-#if MIN_VERSION_ghc(8,10,0)
-            , tcdCExt = NoExtField
+#if MIN_VERSION_ghc(9,0,1)
+            , tcdCExt = NoLayoutInfo


Don't know if this is right

AriFordsham · 2021-08-03T13:39:31Z

src/GHC/SourceGen/Module.hs

@@ -49,6 +56,9 @@ module'
    -> HsModule'
 module' name exports imports decls = HsModule
    { hsmodName = fmap (builtLoc . unModuleNameStr) name
+#if MIN_VERSION_ghc(9,0,1)


ditto https://github.com/google/ghc-source-gen/pull/84/files#diff-263c7e2dfeb2bc2ce2c281b616df4b4b6b2332a1258f6cf5a05e3822bd61db05R174

blackgnezdo · 2021-08-04T04:36:44Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

Googlers: Go here for more info.

Could you rebase on top of HEAD and force-push this to clear the complaint?

google-cla · 2021-08-04T04:37:02Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

blackgnezdo · 2021-08-04T04:37:45Z

@judah it would be great if you could look at the code as @AriFordsham has some semantic questions that will take me a while to get up to speed with.

Reinstated CI GHC 8 should be as was No new GHC 9 functionality; can't be sure I haven't broken anything on GHC 9

Attempt GHC 9 CI fix by clearing cache

AriFordsham · 2021-08-05T12:20:51Z

I think #86 is unequivocally better than this.

blackgnezdo added the help wanted Extra attention is needed label Aug 2, 2021

AriFordsham changed the title ~~Get it to build with GHC 9~~ Add GHC 9 support Aug 2, 2021

AriFordsham mentioned this pull request Aug 2, 2021

Support for GHC-9.0 haskell/haskell-language-server#297

Closed

35 tasks

blackgnezdo reviewed Aug 3, 2021

View reviewed changes

AriFordsham added 11 commits August 3, 2021 12:51

Get it to build with GHC 9

cbdc5ee

Add CI for GHC 9

431d401

Fixed CI

eef89b5

Fixed CI

e618924

Fixed CI

bf3a112

Fixed GHC 8

36573d6

Reinstated CI GHC 8 should be as was No new GHC 9 functionality; can't be sure I haven't broken anything on GHC 9

Tweak CI

397e675

Fixed test suites

2775576

Fixed GHC 8.6-8.8

8cc1b68

Attempt GHC 9 CI fix by clearing cache

Fix GHC 9 CI

a094e5e

Reenable cache

65b1f62

Merge branch 'ari-f-ghc-9' of https://github.com/AriFordsham/ghc-sour…

e9d48c2

…ce-gen into ari-f-ghc-9

AriFordsham commented Aug 3, 2021

View reviewed changes

blackgnezdo assigned judah Aug 4, 2021

blackgnezdo mentioned this pull request Aug 4, 2021

GHC 9 support #86

Closed

AriFordsham added 12 commits August 5, 2021 12:57

Get it to build with GHC 9

684aacf

Fixed CI

4ffcc02

Fixed CI

7df05e4

Fixed GHC 8

e71dad9

Reinstated CI GHC 8 should be as was No new GHC 9 functionality; can't be sure I haven't broken anything on GHC 9

Fixed test suites

254999d

Fixed GHC 8.6-8.8

a0b3f7a

Attempt GHC 9 CI fix by clearing cache

Reenable cache

9530599

Fix 8.10 CI

bf6a0c1

Fix CI typo

94fe33d

Fixed broken tests

268d4ef

Added GHC upper bound

fd0842e

Remove allow-newer

dea5e95

AriFordsham force-pushed the ari-f-ghc-9 branch from b2e8b27 to dea5e95 Compare August 5, 2021 12:01

Fix broken imports

8f0b5ce

AriFordsham closed this Aug 5, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add GHC 9 support #84

Add GHC 9 support #84

AriFordsham commented Aug 1, 2021

google-cla bot commented Aug 1, 2021

AriFordsham commented Aug 1, 2021

AriFordsham commented Aug 1, 2021

blackgnezdo commented Aug 2, 2021

blackgnezdo commented Aug 2, 2021

AriFordsham commented Aug 2, 2021

AriFordsham commented Aug 2, 2021

blackgnezdo left a comment

blackgnezdo commented Aug 3, 2021

AriFordsham commented Aug 3, 2021 •

edited

Loading

google-cla bot commented Aug 3, 2021

AriFordsham commented Aug 3, 2021

google-cla bot commented Aug 3, 2021

google-cla bot commented Aug 3, 2021

google-cla bot commented Aug 3, 2021

google-cla bot commented Aug 3, 2021

google-cla bot commented Aug 3, 2021

AriFordsham left a comment

AriFordsham Aug 3, 2021

AriFordsham Aug 3, 2021

AriFordsham Aug 3, 2021

AriFordsham Aug 3, 2021

AriFordsham Aug 3, 2021

AriFordsham Aug 3, 2021

AriFordsham Aug 3, 2021

AriFordsham Aug 3, 2021

blackgnezdo commented Aug 4, 2021

google-cla bot commented Aug 4, 2021

blackgnezdo commented Aug 4, 2021

AriFordsham commented Aug 5, 2021

Add GHC 9 support #84

Add GHC 9 support #84

Conversation

AriFordsham commented Aug 1, 2021

google-cla bot commented Aug 1, 2021

What to do if you already signed the CLA

Individual signers

Corporate signers

AriFordsham commented Aug 1, 2021

AriFordsham commented Aug 1, 2021

blackgnezdo commented Aug 2, 2021

blackgnezdo commented Aug 2, 2021

AriFordsham commented Aug 2, 2021

AriFordsham commented Aug 2, 2021

blackgnezdo left a comment

Choose a reason for hiding this comment

blackgnezdo commented Aug 3, 2021

AriFordsham commented Aug 3, 2021 • edited Loading

google-cla bot commented Aug 3, 2021

AriFordsham commented Aug 3, 2021

google-cla bot commented Aug 3, 2021

google-cla bot commented Aug 3, 2021

google-cla bot commented Aug 3, 2021

google-cla bot commented Aug 3, 2021

google-cla bot commented Aug 3, 2021

AriFordsham left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blackgnezdo commented Aug 4, 2021

google-cla bot commented Aug 4, 2021

blackgnezdo commented Aug 4, 2021

AriFordsham commented Aug 5, 2021

AriFordsham commented Aug 3, 2021 •

edited

Loading