diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2021-03-07 08:03:57 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-03-09 18:53:07 -0500 |
| commit | e9189745cea060c33263226a585f2b838045c813 (patch) | |
| tree | 9c9e1e51ca3bd5234a3a339c6f67a421e0827013 /compiler/GHC/Cmm | |
| parent | 8fe274e27b9bd42c68e931da875d3f8e9c20e53f (diff) | |
| download | haskell-e9189745cea060c33263226a585f2b838045c813.tar.gz | |
Fix some warnings when bootstrapping with GHC 9.0
This fixes two classes of warnings that appear when bootstrapping with GHC 9.0:
* `ghc-boot.cabal` was using `cabal-version: >=1.22`, which `cabal-install-3.4`
now warns about, instead recommending the use of `cabal-version: 1.22`.
* Several pattern matches were producing `Pattern match(es) are non-exhaustive`
because of incorrect CPP. The pattern-match coverage checker _did_ become
smarter in GHC 9.1, however, so I ended up needing to keep the CPP, adjusting
them to use `#if __GLASGOW_HASKELL__ < 901` instead.
Diffstat (limited to 'compiler/GHC/Cmm')
| -rw-r--r-- | compiler/GHC/Cmm/DebugBlock.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/GHC/Cmm/DebugBlock.hs b/compiler/GHC/Cmm/DebugBlock.hs index 3131b83d5a..0de3efe044 100644 --- a/compiler/GHC/Cmm/DebugBlock.hs +++ b/compiler/GHC/Cmm/DebugBlock.hs @@ -118,7 +118,7 @@ cmmDebugGen modLoc decls = map (blocksForScope Nothing) topScopes -- recover by copying ticks below. scp' | SubScope _ scp' <- scp = scp' | CombinedScope scp' _ <- scp = scp' -#if __GLASGOW_HASKELL__ <= 810 +#if __GLASGOW_HASKELL__ < 901 | otherwise = panic "findP impossible" #endif |