Upgrade to GHC 9.4

See also: supermario/elm-tooling-compiler#2

Author: supermario

compiler/src/Data/Name.hs

@@ -253,7 +253,7 @@ fromTypeVariable name@(Utf8.Utf8 ba#) index =
   else
     let
       len# = sizeofByteArray# ba#
-      end# = indexWord8Array# ba# (len# -# 1#)
+      end# = word8ToWord# (indexWord8Array# ba# (len# -# 1#))
     in
     if isTrue# (leWord# 0x30## end#) && isTrue# (leWord# end# 0x39##) then
       runST
@@ -328,11 +328,11 @@ fromManyNames names =
         ST $ \s ->
           case newByteArray# (len# +# 3#) s of
             (# s, mba# #) ->
-              case writeWord8Array# mba# 0# 0x5F## {-_-} s of
+              case writeWord8Array# mba# 0# (wordToWord8# 0x5F##) {-_-} s of
                 s ->
-                  case writeWord8Array# mba# 1# 0x4D## {-M-} s of
+                  case writeWord8Array# mba# 1# (wordToWord8# 0x4D##) {-M-} s of
                     s ->
-                      case writeWord8Array# mba# 2# 0x24## {-$-} s of
+                      case writeWord8Array# mba# 2# (wordToWord8# 0x24##) {-$-} s of
                         s ->
                           case copyByteArray# ba# 0# mba# 3# len# s of
                             s ->

compiler/src/Data/Utf8.hs

@@ -109,10 +109,10 @@ contains (W8# word#) (Utf8 ba#) =
   containsHelp word# ba# 0# (sizeofByteArray# ba#)
 
 
-containsHelp :: Word# -> ByteArray# -> Int# -> Int# -> Bool
+containsHelp :: Word8# -> ByteArray# -> Int# -> Int# -> Bool
 containsHelp word# ba# !offset# len# =
   if isTrue# (offset# <# len#) then
-    if isTrue# (eqWord# word# (indexWord8Array# ba# offset#))
+    if isTrue# (eqWord8# word# (indexWord8Array# ba# offset#))
       then True
       else containsHelp word# ba# (offset# +# 1#) len#
   else
@@ -145,7 +145,7 @@ startsWithChar isGood bytes@(Utf8 ba#) =
     False
   else
     let
-      !w# = indexWord8Array# ba# 0#
+      !w# = word8ToWord# (indexWord8Array# ba# 0#)
       !char
         | isTrue# (ltWord# w# 0xC0##) = C# (chr# (word2Int# w#))
         | isTrue# (ltWord# w# 0xE0##) = chr2 ba# 0# w#
@@ -164,7 +164,7 @@ endsWithWord8 (W8# w#) (Utf8 ba#) =
   let len# = sizeofByteArray# ba# in
   isTrue# (len# ># 0#)
   &&
-  isTrue# (eqWord# w# (indexWord8Array# ba# (len# -# 1#)))
+  isTrue# (eqWord8# w# (indexWord8Array# ba# (len# -# 1#)))
 
 
 
@@ -186,11 +186,11 @@ splitHelp str start offsets =
       unsafeSlice str start offset : splitHelp str (offset + 1) offsets
 
 
-findDividers :: Word# -> ByteArray# -> Int# -> Int# -> [Int] -> [Int]
+findDividers :: Word8# -> ByteArray# -> Int# -> Int# -> [Int] -> [Int]
 findDividers divider# ba# !offset# len# revOffsets =
   if isTrue# (offset# <# len#) then
     findDividers divider# ba# (offset# +# 1#) len# $
-      if isTrue# (eqWord# divider# (indexWord8Array# ba# offset#))
+      if isTrue# (eqWord8# divider# (indexWord8Array# ba# offset#))
       then I# offset# : revOffsets
       else revOffsets
   else
@@ -351,7 +351,7 @@ toCharsHelp ba# offset# len# =
     []
   else
     let
-      !w# = indexWord8Array# ba# offset#
+      !w# = word8ToWord# (indexWord8Array# ba# offset#)
       !(# char, width# #)
         | isTrue# (ltWord# w# 0xC0##) = (# C# (chr# (word2Int# w#)), 1# #)
         | isTrue# (ltWord# w# 0xE0##) = (# chr2 ba# offset# w#, 2# #)
@@ -368,7 +368,7 @@ chr2 :: ByteArray# -> Int# -> Word# -> Char
 chr2 ba# offset# firstWord# =
   let
     !i1# = word2Int# firstWord#
-    !i2# = word2Int# (indexWord8Array# ba# (offset# +# 1#))
+    !i2# = word8ToInt# (indexWord8Array# ba# (offset# +# 1#))
     !c1# = uncheckedIShiftL# (i1# -# 0xC0#) 6#
     !c2# = i2# -# 0x80#
   in
@@ -380,8 +380,8 @@ chr3 :: ByteArray# -> Int# -> Word# -> Char
 chr3 ba# offset# firstWord# =
   let
     !i1# = word2Int# firstWord#
-    !i2# = word2Int# (indexWord8Array# ba# (offset# +# 1#))
-    !i3# = word2Int# (indexWord8Array# ba# (offset# +# 2#))
+    !i2# = word8ToInt# (indexWord8Array# ba# (offset# +# 1#))
+    !i3# = word8ToInt# (indexWord8Array# ba# (offset# +# 2#))
     !c1# = uncheckedIShiftL# (i1# -# 0xE0#) 12#
     !c2# = uncheckedIShiftL# (i2# -# 0x80#) 6#
     !c3# = i3# -# 0x80#
@@ -394,9 +394,9 @@ chr4 :: ByteArray# -> Int# -> Word# -> Char
 chr4 ba# offset# firstWord# =
   let
     !i1# = word2Int# firstWord#
-    !i2# = word2Int# (indexWord8Array# ba# (offset# +# 1#))
-    !i3# = word2Int# (indexWord8Array# ba# (offset# +# 2#))
-    !i4# = word2Int# (indexWord8Array# ba# (offset# +# 3#))
+    !i2# = word8ToInt# (indexWord8Array# ba# (offset# +# 1#))
+    !i3# = word8ToInt# (indexWord8Array# ba# (offset# +# 2#))
+    !i4# = word8ToInt# (indexWord8Array# ba# (offset# +# 3#))
     !c1# = uncheckedIShiftL# (i1# -# 0xF0#) 18#
     !c2# = uncheckedIShiftL# (i2# -# 0x80#) 12#
     !c3# = uncheckedIShiftL# (i3# -# 0x80#) 6#
@@ -405,6 +405,10 @@ chr4 ba# offset# firstWord# =
   C# (chr# (c1# +# c2# +# c3# +# c4#))
 
 
+word8ToInt# :: Word8# -> Int#
+word8ToInt# word8 =
+  word2Int# (word8ToWord# word8)
+
 
 -- TO BUILDER
 
@@ -471,7 +475,7 @@ toEscapedBuilderHelp before after !name@(Utf8 ba#) k =
 escape :: Word8 -> Word8 -> Ptr a -> Utf8 t -> Int -> Int -> Int -> IO ()
 escape before@(W8# before#) after ptr name@(Utf8 ba#) offset@(I# offset#) len@(I# len#) i@(I# i#) =
   if isTrue# (i# <# len#) then
-    if isTrue# (eqWord# before# (indexWord8Array# ba# (offset# +# i#)))
+    if isTrue# (eqWord8# before# (indexWord8Array# ba# (offset# +# i#)))
     then
       do  writeWordToPtr ptr i after
           escape before after ptr name offset len (i + 1)

compiler/src/Parse/Variable.hs

@@ -21,7 +21,7 @@ import qualified Data.Name as Name
 import qualified Data.Set as Set
 import Data.Word (Word8)
 import Foreign.Ptr (Ptr, plusPtr)
-import GHC.Exts (Char(C#), Int#, (+#), (-#), chr#, uncheckedIShiftL#, word2Int#)
+import GHC.Exts (Char(C#), Int#, (+#), (-#), chr#, uncheckedIShiftL#, word2Int#, word8ToWord#)
 import GHC.Word (Word8(W8#))
 
 import qualified AST.Source as Src
@@ -384,4 +384,4 @@ chr4 pos firstWord =
 
 unpack :: Word8 -> Int#
 unpack (W8# word#) =
-  word2Int# word#
+  word2Int# (word8ToWord# word#)

elm.cabal

@@ -340,7 +340,7 @@ Executable lamdera
         ansi-wl-pprint >= 0.6.8 && < 0.7,
         base >=4.11 && <5,
         binary >= 0.8 && < 0.9,
-        bytestring >= 0.9 && < 0.11,
+        bytestring >= 0.11.5.2 && < 0.12,
         containers,
           -- >= 0.5.8.2 && < 0.6,
         directory >= 1.2.3.0 && < 2.0,
@@ -350,7 +350,7 @@ Executable lamdera
         filepath >= 1 && < 2.0,
         ghc-prim >= 0.5.2,
         haskeline,
-        HTTP >= 4000.2.5 && < 4000.4,
+        HTTP >= 4000.4.1 && < 4000.5,
         http-client >= 0.6 && < 0.8,
         http-client-tls >= 0.3 && < 0.4,
         http-types >= 0.12 && < 1.0,

ext-sentry/Ext/Filewatch.hs

@@ -36,7 +36,7 @@ watch root action =
                 Added f _ _ -> f
                 Modified f _ _ -> f
                 Removed f _ _ -> f
-                Unknown f _ _ -> f
+                Unknown f _ _ _ -> f
 
           -- @TODO it would be better to not listen to these folders in the `watchTree` when available
           -- https://github.com/haskell-fswatch/hfsnotify/issues/101

extra/Lamdera/Version.hs

@@ -9,7 +9,7 @@ import qualified Elm.Version as V
 
 
 raw :: (Int, Int, Int)
-raw = (1,2,0)
+raw = (1,2,1)
 
 
 rawToString :: (Int, Int, Int) -> String

extra/StandaloneInstances.hs

@@ -396,9 +396,6 @@ deriving instance Show Deps.Solver.Details
 
 deriving instance Show Json.Encode.Value
 
-instance Show B.Builder where
-  show = T.unpack . T.decodeUtf8 . BSL.toStrict . B.toLazyByteString
-
 
 instance Show Elm.Package.Project where
   show = Utf8.toChars

stack.yaml

@@ -1,12 +1,11 @@
-resolver: lts-19.33 # ghc-9.0.2
+resolver: lts-21.12 # ghc-9.4.7
 system-ghc: true
 allow-newer: true
 extra-deps:
 - timeout-0.1.1@sha256:56c1d3321d7139d1f7ebf04d46c95d3a3f1c8c9e0f15666ae3ccd6bae6204b6e,1427
 - command-0.1.1@sha256:5232b98c195bc3b8a6f35c55ccd2fa424abe355ca54cfcd836bbe7e494834773,1110
 - snap-server-1.1.2.0@sha256:325378e4f7a50b1a94cf6175e11b9ac6db5edcdd87226f2d5997999334b85c46,15200
 - websockets-snap-0.10.3.1@sha256:89582b7db916e67b6c8192f489e4eafe7488d9f813e349836a2e74fa4388623d,991
-- io-streams-haproxy-1.0.1.0@sha256:2241a754697935e0a11e814affcaa4861b42fe88131f807b586ef48051e28a08,3070
 # Required to build on windows
 - regex-posix-clib-2.7
 # elm-format vendoring
@@ -23,13 +22,9 @@ packages:
 - '.'
 
 
-extra-include-dirs: # Try remove this in 9.3.2 as it should be fixed: https://gitlab.haskell.org/ghc/ghc/-/issues/20592#note_436353
-# This should be a system agnostic path to macos FFI libs, if not working for you try find a valid with these commands:
-# dir=`xcrun --show-sdk-path`/usr/include/ffi && ls -alh $dir && echo $dir
-# dir=`pkg-config --cflags libffi | sed -E "s/^-I//"` && ls -alh $dir && echo $dir
-- /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/ffi
-
-
+# Need to re-check if the below is still an issue now we're on GHC 9.4:
+# > The system-cxx-std-lib metapackage should significantly improve the status quo here and is shipped with GHC %9.4.1. Closing.
+# ---------------
 # https://gitlab.haskell.org/ghc/ghc/-/issues/20010#note_359766
 # however extra-libraries is not a supported stack.yaml field...?
 # extra-libraries: stdc++ supc++ gcc_s
@@ -38,31 +33,3 @@ extra-include-dirs: # Try remove this in 9.3.2 as it should be fixed: https://gi
 # https://discourse.haskell.org/t/announce-ghcup-0-1-15-rc2-windows-pre-release/2616/14
 # however it seems stack automatically includes a bunch of paths, don't think this helped?
 # - C:\ghcup\msys64\mingw64\include
-
-
-
-# GHC.Exts has had a change between 9.0.2 and 9.2.4, so need to figure out how to update Utf8:
-# https://gist.github.com/supermario/7b103ab79fe6c95bb110d679e4e1a324
-# resolver: nightly-2022-11-07 # ghc-9.2.4
-# allow-newer: true
-# extra-deps:
-# - timeout-0.1.1@sha256:56c1d3321d7139d1f7ebf04d46c95d3a3f1c8c9e0f15666ae3ccd6bae6204b6e,1427
-# - command-0.1.1@sha256:5232b98c195bc3b8a6f35c55ccd2fa424abe355ca54cfcd836bbe7e494834773,1110
-# - snap-server-1.1.2.0@sha256:325378e4f7a50b1a94cf6175e11b9ac6db5edcdd87226f2d5997999334b85c46,15200
-# - websockets-snap-0.10.3.1@sha256:89582b7db916e67b6c8192f489e4eafe7488d9f813e349836a2e74fa4388623d,991
-# # - io-streams-haproxy-1.0.1.0@sha256:2241a754697935e0a11e814affcaa4861b42fe88131f807b586ef48051e28a08,3070
-# - fold-debounce-0.2.0.9@sha256:47353532fdd6ae7b73d935cb583a19516dd7c9a8d306a6276811e0675f45c169,2196
-# - snap-core-1.0.5.0@sha256:655c018169185e689ae38f2dc26a9fc3e0c7fd87b7e320bd971a3482bdeb9b91,10019
-# - readable-0.3.1@sha256:ea550740bbee9ae46c6bbf1c5e5185818a1d37509b855c640b0a7f2dfba6dc37,1121
-# # Required to build on windows
-# - regex-posix-clib-2.7
-# flags:
-#   regex-posix:
-#      _regex-posix-clib: true
-# packages:
-# - '.'
-# extra-include-dirs: # Try remove this in 9.3.2 as it should be fixed: https://gitlab.haskell.org/ghc/ghc/-/issues/20592#note_436353
-# # This should be a system agnostic path to macos FFI libs, if not working for you try find a valid with these commands:
-# # dir=`xcrun --show-sdk-path`/usr/include/ffi && ls -alh $dir && echo $dir
-# # dir=`pkg-config --cflags libffi | sed -E "s/^-I//"` && ls -alh $dir && echo $dir
-# - /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/ffi

stack.yaml.lock

@@ -7,55 +7,48 @@ packages:
 - completed:
     hackage: timeout-0.1.1@sha256:56c1d3321d7139d1f7ebf04d46c95d3a3f1c8c9e0f15666ae3ccd6bae6204b6e,1427
     pantry-tree:
-      size: 437
       sha256: e571503d7e609c3fe496de7e858613360bfa6c06e20ac57d9659bd32d0645889
+      size: 437
   original:
     hackage: timeout-0.1.1@sha256:56c1d3321d7139d1f7ebf04d46c95d3a3f1c8c9e0f15666ae3ccd6bae6204b6e,1427
 - completed:
     hackage: command-0.1.1@sha256:5232b98c195bc3b8a6f35c55ccd2fa424abe355ca54cfcd836bbe7e494834773,1110
     pantry-tree:
-      size: 167
       sha256: 1ecfeb4b1367de6b489dbda20be05df78beb07f71d7c0b1f471fab1cd9c8044a
+      size: 167
   original:
     hackage: command-0.1.1@sha256:5232b98c195bc3b8a6f35c55ccd2fa424abe355ca54cfcd836bbe7e494834773,1110
 - completed:
     hackage: snap-server-1.1.2.0@sha256:325378e4f7a50b1a94cf6175e11b9ac6db5edcdd87226f2d5997999334b85c46,15200
     pantry-tree:
-      size: 3313
       sha256: bac856da3319ff93d100dfd5811fbcc39d7d8b7e51d6adc07aea3fc81aacd14e
+      size: 3313
   original:
     hackage: snap-server-1.1.2.0@sha256:325378e4f7a50b1a94cf6175e11b9ac6db5edcdd87226f2d5997999334b85c46,15200
 - completed:
     hackage: websockets-snap-0.10.3.1@sha256:89582b7db916e67b6c8192f489e4eafe7488d9f813e349836a2e74fa4388623d,991
     pantry-tree:
-      size: 330
       sha256: 1630fc5df984c0fd574e68860bf21e1ea3f60ffc26ed1f3859d4e5411bc1e6d8
+      size: 330
   original:
     hackage: websockets-snap-0.10.3.1@sha256:89582b7db916e67b6c8192f489e4eafe7488d9f813e349836a2e74fa4388623d,991
-- completed:
-    hackage: io-streams-haproxy-1.0.1.0@sha256:2241a754697935e0a11e814affcaa4861b42fe88131f807b586ef48051e28a08,3070
-    pantry-tree:
-      size: 589
-      sha256: e0fd63710948210cda2b5d21bd51eedc43f8813470d015158de8bd03237b1cb9
-  original:
-    hackage: io-streams-haproxy-1.0.1.0@sha256:2241a754697935e0a11e814affcaa4861b42fe88131f807b586ef48051e28a08,3070
 - completed:
     hackage: regex-posix-clib-2.7@sha256:998fca06da3d719818f0691ef0b8b9b7375afeea228cb08bd9e2db53f96b0cd7,1232
     pantry-tree:
-      size: 524
       sha256: 5bf20952472d930323766d250f5fbbe3fe6f2cd3d931e5cf7b62a238ab2099ff
+      size: 524
   original:
     hackage: regex-posix-clib-2.7
 - completed:
     hackage: ansi-terminal-0.11@sha256:97470250c92aae14c4c810d7f664c532995ba8910e2ad797b29f22ad0d2d0194,3307
     pantry-tree:
-      size: 1461
       sha256: 4098c4b8bb503fcf0730aedc8247a479d3e22fd1fe4c6b4b2b2b5da30bdfb713
+      size: 1461
   original:
     hackage: ansi-terminal-0.11
 snapshots:
 - completed:
-    size: 619204
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/33.yaml
-    sha256: 6d1532d40621957a25bad5195bfca7938e8a06d923c91bc52aa0f3c41181f2d4
-  original: lts-19.33
+    sha256: 9313df78f49519315342f4c51ffc5da12659d3735f8ac3c54a1fb98ff874474e
+    size: 640036
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/12.yaml
+  original: lts-21.12