[Git][ghc/ghc][wip/9.4.8-backports] 3 commits: testsuite: add the req_process predicate

Zubin (@wz1000) gitlab at gitlab.haskell.org
Tue Nov 7 10:26:44 UTC 2023



Zubin pushed to branch wip/9.4.8-backports at Glasgow Haskell Compiler / GHC


Commits:
9f73ab09 by Cheng Shao at 2023-11-07T15:56:35+05:30
testsuite: add the req_process predicate

This patch adds the req_process predicate to the testsuite to assert
the platform has a process model, also marking tests that involve
spawning processes as req_process. Also bumps hpc & process submodule.

(cherry picked from commit ce580426ce3052e3b3d2847d0312652ea9087994)

- - - - -
6612e3a1 by Zubin Duggal at 2023-11-07T15:56:35+05:30
testsuite: add omit_ghci for use in process

- - - - -
d5ce95b6 by Zubin Duggal at 2023-11-07T15:56:35+05:30
Prepare release 9.4.8

- - - - -


23 changed files:

- configure.ac
- docs/users_guide/9.4.7-notes.rst
- + docs/users_guide/9.4.8-notes.rst
- docs/users_guide/release-notes.rst
- libraries/base/base.cabal
- libraries/base/changelog.md
- testsuite/driver/testglobals.py
- testsuite/driver/testlib.py
- testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
- testsuite/tests/cabal/t18567/T18567.stderr
- testsuite/tests/dependent/should_compile/T14729.stderr
- testsuite/tests/dependent/should_compile/T15743.stderr
- testsuite/tests/dependent/should_compile/T15743e.stderr
- testsuite/tests/indexed-types/should_compile/T15711.stderr
- testsuite/tests/indexed-types/should_compile/T15852.stderr
- testsuite/tests/polykinds/T15592.stderr
- testsuite/tests/polykinds/T15592b.stderr
- testsuite/tests/th/T21547.stderr
- testsuite/tests/typecheck/should_compile/T12763.stderr
- testsuite/tests/typecheck/should_compile/T18406b.stderr
- testsuite/tests/typecheck/should_compile/T18529.stderr
- testsuite/tests/typecheck/should_compile/T21023.stderr
- testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr


Changes:

=====================================
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.4.7], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.4.8], [glasgow-haskell-bugs at 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


=====================================
docs/users_guide/9.4.7-notes.rst
=====================================
@@ -1,4 +1,4 @@
-.. _release-9-4-6:
+.. _release-9-4-7:
 
 Version 9.4.7
 ==============


=====================================
docs/users_guide/9.4.8-notes.rst
=====================================
@@ -0,0 +1,99 @@
+.. _release-9-4-8:
+
+Version 9.4.8
+==============
+
+The significant changes to the various parts of the compiler are listed in the
+following sections.
+
+The :ghc-flag:`LLVM backend <-fllvm>` of this release is to be used with LLVM
+10, 11, 12, 13, or 14.
+
+Significant Changes
+~~~~~~~~~~~~~~~~~~~~
+
+Issues fixed in this release include:
+
+Compiler
+--------
+
+- Fix a recompilation checking bug where GHC may miss changes in transitive
+  dependencies when deciding to relink a program (:ghc-ticket:`23724`).
+- Fix a compiler panic resulting from incorrect eta-reduction of join points
+  (:ghc-ticket:`23922`).
+- Fix a code generator bug on AArch64 platforms resulting in invalid conditional
+  jumps (:ghc-ticket:`23746`).
+- Improve STG code generation in certain scenarios (:ghc-ticket:`23783`).
+- Fix a bug where we could silently truncate 64 bit values to 32 bit on
+  32 bit architectures.
+- Fix ``-split-sections`` on Windows (:ghc-ticket:`22834`).
+
+Runtime system
+--------------
+
+- Remove an assertion prone to race conditions (:ghc-ticket:`22563`).
+- Fix some crashes and loops with the non-moving GC (:ghc-ticket:`24042, :ghc-ticket:`23003`).
+- Properly escape characters when writing JSON profiles (``-pJ``) (:ghc-ticket:`23924`).
+
+Build system and packaging
+--------------------------
+
+- Ensure ``-split-sections`` is enabled while building binary distributions for
+  all platforms where this is supported (:ghc-ticket:`21135`).
+- Make the configure script use ``AC_PATH_TOOL`` instead of ``AC_PATH_PROG`` to
+  detect tools, making cross-compilation easier (:ghc-ticket:`21601`).
+- Fix a bug where ``-DNOSMP`` wasn't being passed to the C compiler even if the
+  target doesn't support SMP (:ghc-ticket:`24082`).
+
+Core libraries
+--------------
+
+- Bump ``base`` to 4.17.2.1
+- Bump ``bytestring`` to 0.11.5.3
+- Bump ``process`` to 1.6.18.0
+
+Included libraries
+------------------
+
+The package database provided with this distribution also contains a number of
+packages other than GHC itself. See the changelogs provided with these packages
+for further change information.
+
+.. ghc-package-list::
+
+    libraries/array/array.cabal:             Dependency of ``ghc`` library
+    libraries/base/base.cabal:               Core library
+    libraries/binary/binary.cabal:           Dependency of ``ghc`` library
+    libraries/bytestring/bytestring.cabal:   Dependency of ``ghc`` library
+    libraries/Cabal/Cabal/Cabal.cabal:       Dependency of ``ghc-pkg`` utility
+    libraries/Cabal/Cabal-syntax/Cabal-syntax.cabal:  Dependency of ``ghc-pkg`` utility
+    libraries/containers/containers/containers.cabal: Dependency of ``ghc`` library
+    libraries/deepseq/deepseq.cabal:         Dependency of ``ghc`` library
+    libraries/directory/directory.cabal:     Dependency of ``ghc`` library
+    libraries/exceptions/exceptions.cabal:   Dependency of ``ghc`` and ``haskeline`` library
+    libraries/filepath/filepath.cabal:       Dependency of ``ghc`` library
+    compiler/ghc.cabal:                      The compiler itself
+    libraries/ghci/ghci.cabal:               The REPL interface
+    libraries/ghc-boot/ghc-boot.cabal:       Internal compiler library
+    libraries/ghc-boot-th/ghc-boot-th.cabal: Internal compiler library
+    libraries/ghc-compact/ghc-compact.cabal: Core library
+    libraries/ghc-heap/ghc-heap.cabal:       GHC heap-walking library
+    libraries/ghc-prim/ghc-prim.cabal:       Core library
+    libraries/haskeline/haskeline.cabal:     Dependency of ``ghci`` executable
+    libraries/hpc/hpc.cabal:                 Dependency of ``hpc`` executable
+    libraries/integer-gmp/integer-gmp.cabal: Core library
+    libraries/libiserv/libiserv.cabal:       Internal compiler library
+    libraries/mtl/mtl.cabal:                 Dependency of ``Cabal`` library
+    libraries/parsec/parsec.cabal:           Dependency of ``Cabal`` library
+    libraries/pretty/pretty.cabal:           Dependency of ``ghc`` library
+    libraries/process/process.cabal:         Dependency of ``ghc`` library
+    libraries/stm/stm.cabal:                 Dependency of ``haskeline`` library
+    libraries/template-haskell/template-haskell.cabal: Core library
+    libraries/terminfo/terminfo.cabal:       Dependency of ``haskeline`` library
+    libraries/text/text.cabal:               Dependency of ``Cabal`` library
+    libraries/time/time.cabal:               Dependency of ``ghc`` library
+    libraries/transformers/transformers.cabal: Dependency of ``ghc`` library
+    libraries/unix/unix.cabal:               Dependency of ``ghc`` library
+    libraries/Win32/Win32.cabal:             Dependency of ``ghc`` library
+    libraries/xhtml/xhtml.cabal:             Dependency of ``haddock`` executable
+


=====================================
docs/users_guide/release-notes.rst
=====================================
@@ -4,6 +4,7 @@ Release notes
 .. toctree::
    :maxdepth: 1
 
+   9.4.8-notes
    9.4.7-notes
    9.4.6-notes
    9.4.5-notes


=====================================
libraries/base/base.cabal
=====================================
@@ -1,6 +1,6 @@
 cabal-version:  3.0
 name:           base
-version:        4.17.2.0
+version:        4.17.2.1
 -- NOTE: Don't forget to update ./changelog.md
 
 license:        BSD-3-Clause


=====================================
libraries/base/changelog.md
=====================================
@@ -1,5 +1,11 @@
 # Changelog for [`base` package](http://hackage.haskell.org/package/base)
 
+## 4.17.2.1 *November 2023*
+
+   * Add missing int64/word64-to-double/float rules ([CLC Proposal #203](https://github.com/haskell/core-libraries-committee/issues/203))
+
+   * Improve String & IsString documentation.
+
 ## 4.17.2.0 *August 2023*
 
    * Restore `mingwex` dependency on Windows (#23309).


=====================================
testsuite/driver/testglobals.py
=====================================
@@ -134,6 +134,8 @@ class TestConfig:
         # Do we have interpreter support?
         self.have_interp = False
 
+        # Do we even have processes?
+        self.have_process = True
         # Does the platform support loading of dynamic shared libraries? e.g.
         # some musl-based environments do not.
         self.supports_dynamic_libs = True


=====================================
testsuite/driver/testlib.py
=====================================
@@ -274,6 +274,9 @@ def req_smp( name, opts ):
     if not config.have_smp:
         opts.expect = 'fail'
 
+def req_process( name, opts ):
+    if not config.have_process:
+        opts.skip = True
 def ignore_stdout(name, opts):
     opts.ignore_stdout = True
 
@@ -389,6 +392,8 @@ def _omit_ways( name: TestName, opts, ways: List[WayName] ):
     _lint_ways(name, ways)
     opts.omit_ways += ways
 
+omit_ghci = omit_ways([WayName('ghci'), WayName('ghci-opt')])
+
 # -----
 
 def only_ways( ways: List[WayName] ):


=====================================
testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
=====================================
@@ -4,4 +4,4 @@ for bkpcabal01-0.1.0.0..
 Preprocessing library 'q' for bkpcabal01-0.1.0.0..
 Building library 'q' instantiated with H = <H>
 for bkpcabal01-0.1.0.0..
-[2 of 2] Instantiating bkpcabal01-0.1.0.0-9EeElPXCwbT1H2r14ZWyw3-p
+[2 of 2] Instantiating bkpcabal01-0.1.0.0-CEUpXjWCty3JAbUU0c8zyO-p


=====================================
testsuite/tests/cabal/t18567/T18567.stderr
=====================================
@@ -2,4 +2,4 @@
 <no location info>: warning: [-Wunused-packages]
     The following packages were specified via -package or -package-id flags,
     but were not needed for compilation:
-      - internal-lib-0.1.0.0 (exposed by flag -package-id internal-lib-0.1.0.0-6LFEauuQzmN1lhf9BsFCch-sublib-unused)
+      - internal-lib-0.1.0.0 (exposed by flag -package-id internal-lib-0.1.0.0-4pSe9cqTgej5hWlpsCk6Gx-sublib-unused)


=====================================
testsuite/tests/dependent/should_compile/T14729.stderr
=====================================
@@ -11,4 +11,4 @@ COERCION AXIOMS
 FAMILY INSTANCES
   type instance F Int = Bool -- Defined at T14729.hs:10:15
 Dependent modules: []
-Dependent packages: [base-4.17.2.0]
+Dependent packages: [base-4.17.2.1]


=====================================
testsuite/tests/dependent/should_compile/T15743.stderr
=====================================
@@ -3,4 +3,4 @@ TYPE CONSTRUCTORS
     forall {k1} k2 (k3 :: k2). Proxy k3 -> k1 -> k2 -> *
     roles nominal nominal nominal phantom phantom phantom
 Dependent modules: []
-Dependent packages: [base-4.17.2.0]
+Dependent packages: [base-4.17.2.1]


=====================================
testsuite/tests/dependent/should_compile/T15743e.stderr
=====================================
@@ -54,4 +54,4 @@ DATA CONSTRUCTORS
                 (d :: Proxy k5) (e :: Proxy k7).
          f c -> T k8 a b f c d e
 Dependent modules: []
-Dependent packages: [base-4.17.2.0]
+Dependent packages: [base-4.17.2.1]


=====================================
testsuite/tests/indexed-types/should_compile/T15711.stderr
=====================================
@@ -3,4 +3,4 @@ TYPE CONSTRUCTORS
   associated type family F{2} :: forall a. Maybe a -> *
     roles nominal nominal
 Dependent modules: []
-Dependent packages: [base-4.17.2.0]
+Dependent packages: [base-4.17.2.1]


=====================================
testsuite/tests/indexed-types/should_compile/T15852.stderr
=====================================
@@ -9,4 +9,4 @@ FAMILY INSTANCES
   data instance forall {k1} {k2} {c :: k1} {j :: k2}.
                   DF (Proxy c) -- Defined at T15852.hs:10:15
 Dependent modules: []
-Dependent packages: [base-4.17.2.0]
+Dependent packages: [base-4.17.2.1]


=====================================
testsuite/tests/polykinds/T15592.stderr
=====================================
@@ -5,4 +5,4 @@ DATA CONSTRUCTORS
   MkT :: forall {k} k1 (f :: k1 -> k -> *) (a :: k1) (b :: k).
          f a b -> T f a b -> T f a b
 Dependent modules: []
-Dependent packages: [base-4.17.2.0]
+Dependent packages: [base-4.17.2.1]


=====================================
testsuite/tests/polykinds/T15592b.stderr
=====================================
@@ -4,4 +4,4 @@ TYPE CONSTRUCTORS
     forall k (f :: k -> *) (a :: k). f a -> *
     roles nominal nominal nominal nominal
 Dependent modules: []
-Dependent packages: [base-4.17.2.0]
+Dependent packages: [base-4.17.2.1]


=====================================
testsuite/tests/th/T21547.stderr
=====================================
@@ -1,7 +1,7 @@
 
 T21547.hs:9:14: error:
     • GHC stage restriction:
-        instance for ‘base-4.17.2.0:Data.Typeable.Internal.Typeable
+        instance for ‘base-4.17.2.1:Data.Typeable.Internal.Typeable
                         T’ is used in a top-level splice, quasi-quote, or annotation,
         and must be imported, not defined locally
     • In the expression: foo [|| T () ||]


=====================================
testsuite/tests/typecheck/should_compile/T12763.stderr
=====================================
@@ -8,4 +8,4 @@ COERCION AXIOMS
 CLASS INSTANCES
   instance C Int -- Defined at T12763.hs:9:10
 Dependent modules: []
-Dependent packages: [base-4.17.2.0]
+Dependent packages: [base-4.17.2.1]


=====================================
testsuite/tests/typecheck/should_compile/T18406b.stderr
=====================================
@@ -6,7 +6,7 @@ TYPE CONSTRUCTORS
 COERCION AXIOMS
   axiom Bug.N:C :: forall a b. C a b = a -> a
 Dependent modules: []
-Dependent packages: [base-4.17.2.0]
+Dependent packages: [base-4.17.2.1]
 
 ==================== Typechecker ====================
 Bug.$tcC


=====================================
testsuite/tests/typecheck/should_compile/T18529.stderr
=====================================
@@ -6,7 +6,7 @@ TYPE CONSTRUCTORS
 COERCION AXIOMS
   axiom Bug.N:C :: forall a b. C a b = a -> b -> ()
 Dependent modules: []
-Dependent packages: [base-4.17.2.0]
+Dependent packages: [base-4.17.2.1]
 
 ==================== Typechecker ====================
 Bug.$tcC


=====================================
testsuite/tests/typecheck/should_compile/T21023.stderr
=====================================
@@ -2,4 +2,4 @@ TYPE SIGNATURES
   f :: forall {a}. a -> (a, Integer)
   x :: Integer
 Dependent modules: []
-Dependent packages: [base-4.17.2.0]
+Dependent packages: [base-4.17.2.1]


=====================================
testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr
=====================================
@@ -8,10 +8,10 @@ subsumption_sort_hole_fits.hs:2:5: warning: [-Wtyped-holes (in -Wdefault)]
       Valid hole fits include
         lines :: String -> [String]
           (imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1
-           (and originally defined in ‘base-4.17.2.0:Data.OldList’))
+           (and originally defined in ‘base-4.17.2.1:Data.OldList’))
         words :: String -> [String]
           (imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1
-           (and originally defined in ‘base-4.17.2.0:Data.OldList’))
+           (and originally defined in ‘base-4.17.2.1:Data.OldList’))
         read :: forall a. Read a => String -> a
           with read @[String]
           (imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/89949c9f7bf79d2af47dc534201f0b0be9605949...d5ce95b66544896384e506370a3e1b64d3caba88

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/89949c9f7bf79d2af47dc534201f0b0be9605949...d5ce95b66544896384e506370a3e1b64d3caba88
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20231107/ab1161b8/attachment-0001.html>


More information about the ghc-commits mailing list