compiler/GHC/Core/Unify.hs

@@ -1054,20 +1054,11 @@ unify_ty env ty1 ty2 _kco
             ; unless (um_inj_tf env) $ -- See (end of) Note [Specification of unification]
               don'tBeSoSure MARTypeFamily $ unify_tys env noninj_tys1 noninj_tys2 }
 
-  | Just (tc1, _) <- mb_tc_app1
-  , not (isGenerativeTyCon tc1 Nominal)
-    -- E.g.   unify_ty (F ty1) b  =  MaybeApart
-    --        because the (F ty1) behaves like a variable
-    --        NB: if unifying, we have already dealt
-    --            with the 'ty2 = variable' case
-  = maybeApart MARTypeFamily
+  | isTyFamApp mb_tc_app1     -- A (not-over-saturated) type-family application
+  = maybeApart MARTypeFamily  -- behaves like a type variable; might match
 
-  | Just (tc2, _) <- mb_tc_app2
-  , not (isGenerativeTyCon tc2 Nominal)
-  , um_unif env
-    -- E.g.   unify_ty [a] (F ty2) =  MaybeApart, when unifying (only)
-    --        because the (F ty2) behaves like a variable
-    --        NB: we have already dealt with the 'ty1 = variable' case
+  | isTyFamApp mb_tc_app2     -- A (not-over-saturated) type-family application
+  , um_unif env               -- behaves like a type variable; might unify
   = maybeApart MARTypeFamily
 
   -- TYPE and CONSTRAINT are not Apart
@@ -1169,6 +1160,17 @@ unify_tys env orig_xs orig_ys
       -- Possibly different saturations of a polykinded tycon
       -- See Note [Polykinded tycon applications]
 
+isTyFamApp :: Maybe (TyCon, [Type]) -> Bool
+-- True if we have a saturated or under-saturated type family application
+-- If it is /over/ saturated then we return False.  E.g.
+--     unify_ty (F a b) (c d)    where F has arity 1
+-- we definitely want to decompose that type application! (#22647)
+isTyFamApp (Just (tc, tys))
+  =  not (isGenerativeTyCon tc Nominal)       -- Type family-ish
+  && not (tys `lengthExceeds` tyConArity tc)  -- Not over-saturated
+isTyFamApp Nothing
+  = False
+
 ---------------------------------
 uVar :: UMEnv
      -> InTyVar         -- Variable to be unified

compiler/ghc.cabal.in

@@ -76,7 +76,7 @@ Library
     if flag(build-tool-depends)
       build-tool-depends: alex:alex >= 3.2.6, happy:happy >= 1.20.0, genprimopcode:genprimopcode, deriveConstants:deriveConstants
 
-    Build-Depends: base       >= 4.11 && < 4.18,
+    Build-Depends: base       >= 4.11 && < 4.19,
                    deepseq    >= 1.4 && < 1.5,
                    directory  >= 1   && < 1.4,
                    process    >= 1   && < 1.7,

configure.ac

@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.5], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.6], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION])
     # Version on master must be X.Y (not X.Y.Z) for ProjectVersionMunged variable
     # to be useful (cf #19058). However, the version must have three components
     # (X.Y.Z) on stable branches (e.g. ghc-9.2) to ensure that pre-releases are

hadrian/bindist/Makefile

@@ -66,7 +66,7 @@ install_bin: install_bin_libdir install_wrappers
 endif
 
 install: install_bin install_lib
-install: install_docs update_package_db
+install: install_man install_docs update_package_db
 
 ActualBinsDir=${ghclibdir}/bin
 ifeq "$(RelocatableBuild)" "YES"
@@ -187,19 +187,30 @@ install_lib: lib/settings
 install_docs:
 	@echo "Copying docs to $(DESTDIR)$(docdir)"
 	$(INSTALL_DIR) "$(DESTDIR)$(docdir)"
-	
+
 	if [ -d doc ]; then \
 		cd doc; $(FIND) . -type f -exec sh -c \
 			'$(INSTALL_DIR) "$(DESTDIR)$(docdir)/`dirname $$1`" && $(INSTALL_DATA) "$$1" "$(DESTDIR)$(docdir)/`dirname $$1`"' \
 			sh '{}' ';'; \
 	fi
-	
+
 	if [ -d docs-utils ]; then \
 		$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html/libraries/"; \
 		$(INSTALL_DATA) docs-utils/prologue.txt "$(DESTDIR)$(docdir)/html/libraries/"; \
 		$(INSTALL_SCRIPT) docs-utils/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/"; \
 	fi
 
+MAN_SECTION := 1
+MAN_PAGES := doc/users_guide/build-man/ghc.1
+
+.PHONY: install_man
+install_man:
+	if [ -f $(MAN_PAGES) ]; then \
+		$(INSTALL_DIR) "$(DESTDIR)$(mandir)"; \
+		$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man$(MAN_SECTION)"; \
+		$(INSTALL_MAN) $(INSTALL_OPTS) $(MAN_PAGES) "$(DESTDIR)$(mandir)/man$(MAN_SECTION)"; \
+	fi
+
 export SHELL
 install_wrappers: install_bin_libdir
 	@echo "Installing wrapper scripts"

array @ f7a498b8

-Subproject commit acd92ba77c205a039d9c6eaabb3e35d09e330160
+Subproject commit f7a498b880a1fff833699d8417bac155d58ed59e

libraries/base/base.cabal

 cabal-version:  3.0
 name:           base
-version:        4.17.0.0
+version:        4.18.0.0
 -- NOTE: Don't forget to update ./changelog.md
 
 license:        BSD-3-Clause

deepseq @ 7e77698d

-Subproject commit 28f4d5b00448239581ead0de9140ff4a6847c806
+Subproject commit 7e77698d6a78981bc2649df78021a6c33a5d3913

directory @ 7f906613

-Subproject commit 102428041a44835b5446c329f746c7503c283199
+Subproject commit 7f9066137c694ab7cef9a4ebd8c19a281fad42e4

filepath @ 7139cd33

-Subproject commit 872e19fce06ddd40bd0771dbd3cad2c3c6ed5e7d
+Subproject commit 7139cd3383a2aae440a57b5604a8182d9a983715

libraries/ghc-boot-th/ghc-boot-th.cabal.in

@@ -36,4 +36,4 @@ Library
             GHC.ForeignSrcLang.Type
             GHC.Lexeme
 
-    build-depends: base       >= 4.7 && < 4.18
+    build-depends: base       >= 4.7 && < 4.19

libraries/ghc-boot/GHC/Utils/Encoding/UTF8.hs

@@ -44,17 +44,20 @@ module GHC.Utils.Encoding.UTF8
 import Prelude
 
 import Foreign
+import GHC.IO
+#if MIN_VERSION_base(4,18,0)
+import GHC.Encoding.UTF8
+#else
 import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)
 import Data.Char
-import GHC.IO
+import GHC.Exts
 import GHC.ST
+#endif
 
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Internal as BS
 import Data.ByteString.Short.Internal (ShortByteString(..))
 
-import GHC.Exts
-
 -- | Find the start of the codepoint preceding the codepoint at the given
 -- 'Ptr'. This is undefined if there is no previous valid codepoint.
 utf8PrevChar :: Ptr Word8 -> IO (Ptr Word8)

libraries/ghc-boot/ghc-boot.cabal.in

@@ -70,7 +70,7 @@ Library
             GHC.Version
             GHC.Platform.Host
 
-    build-depends: base       >= 4.7 && < 4.18,
+    build-depends: base       >= 4.7 && < 4.19,
                    binary     == 0.8.*,
                    bytestring >= 0.10 && < 0.12,
                    containers >= 0.5 && < 0.7,

libraries/ghc-compact/ghc-compact.cabal

@@ -40,7 +40,7 @@ library
     CPP
 
   build-depends: ghc-prim   >= 0.5.3 && < 0.11,
-                 base       >= 4.9.0 && < 4.18,
+                 base       >= 4.9.0 && < 4.19,
                  bytestring >= 0.10.6.0 && <0.12
   ghc-options: -Wall
 

libraries/ghc-prim/changelog.md

@@ -21,6 +21,13 @@
 - The `threadLabel#` primop was added, allowing the user to query the label of
   a given `ThreadId#`.
 
+- `isByteArrayPinned#` now only considers an array pinned if it was explicitly pinned
+  by the user. This is required to avoid ghc issue [#22255](https://gitlab.haskell.org/ghc/ghc/-/issues/22255)
+  which showed that the old behaviour could cause segfaults when used in combination
+  with compact regions.
+  We are working on ways to allow users and library authors to get back the
+  performance benefits of the old behaviour where possible.
+
 ## 0.9.0 *August 2022*
 
 - Shipped with GHC 9.4.1

libraries/ghci/ghci.cabal.in

@@ -70,7 +70,7 @@ library
     Build-Depends:
         rts,
         array            == 0.5.*,
-        base             >= 4.8 && < 4.18,
+        base             >= 4.8 && < 4.19,
         ghc-prim         >= 0.5.0 && < 0.11,
         binary           == 0.8.*,
         bytestring       >= 0.10 && < 0.12,

parsec @ 0e23b324

-Subproject commit f1171a4b212070bb0299b636aeee7d0534a6c76c
+Subproject commit 0e23b3246fd7f6d125129316dcbedd609e6d2dca

process @ 7c6871d8

-Subproject commit cb89d5079d29c38683bcb6feec7dc53ad3836ed0
+Subproject commit 7c6871d89bd87875b4e402de26d7267c11e617a9

stm @ 4ac6ead6

-Subproject commit f4eb5a85c2732f8f5a03ef8af88d6aff90945415
+Subproject commit 4ac6ead642829c9c983ee3c96ba13fa0308891ff

libraries/template-haskell/template-haskell.cabal.in

@@ -55,7 +55,7 @@ Library
         Language.Haskell.TH.Lib.Map
 
     build-depends:
-        base        >= 4.11 && < 4.18,
+        base        >= 4.11 && < 4.19,
         ghc-boot-th == @ProjectVersionMunged@,
         ghc-prim,
         pretty      == 1.1.*

terminfo @ 0a05f06b

-Subproject commit a21cc7e2d58f3e35a4ac3fb386738d9b448eaf13
+Subproject commit 0a05f06bc8a56c43578ce06d4ef1339ee70fb3fc