Skip to content
Snippets Groups Projects
Commit e1fd9461 authored by Ben Gamari's avatar Ben Gamari Committed by Ben Gamari
Browse files

ghc-prim: Bump version 

unpackClosure#'s behavior and type has changed. This caused a CPP guard
in the new ghc-heap package to fail when bootstrapping with GHC 8.4.

Test Plan: Validate bootstrapping with GHC 8.4

Reviewers: RyanGlScott

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4716
parent ec22f7dd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 25 additions and 21 deletions
libraries/ghc-compact/ghc-compact.cabal
+ 1
− 1
View file @ e1fd9461
......@@ -36,7 +36,7 @@ library
UnboxedTuples
CPP
build-depends: ghc-prim == 0.5.2.*,
build-depends: ghc-prim == 0.5.3.*,
base >= 4.9.0 && < 4.13,
bytestring >= 0.10.6.0
ghc-options: -Wall
......
libraries/ghc-heap/GHC/Exts/Heap.hs
+ 1
− 1
View file @ e1fd9461
......@@ -111,7 +111,7 @@ getClosureRaw x = do
-- This is a hack to cover the bootstrap compiler using the old version of
-- 'unpackClosure'. The new 'unpackClosure' return values are not merely
-- a reordering, so using the old version would not work.
#if MIN_VERSION_ghc_prim(0,5,2)
#if MIN_VERSION_ghc_prim(0,5,3)
(# iptr, dat, pointers #) -> do
#else
(# iptr, pointers, dat #) -> do
......
libraries/ghc-prim/changelog.md
+ 5
− 1
View file @ e1fd9461
## 0.5.2.1 (edit as necessary)
## 0.5.3 (edit as necessary)
- Shipped with GHC 8.6.1
- Added to `GHC.Prim`:
addWordC# :: Word# -> Word# -> (# Word#, Int# #)
- `unpackClosure#` can now unpack any valid Haskell closure.
Previously it returned empty pointer and non-pointer arrays
for thunks.
## 0.5.2.0
- Shipped with GHC 8.4.1
......
libraries/ghc-prim/ghc-prim.cabal
+ 1
− 1
View file @ e1fd9461
cabal-version: 2.1
name: ghc-prim
version: 0.5.2.1
version: 0.5.3
-- NOTE: Don't forget to update ./changelog.md
license: BSD-3-Clause
license-file: LICENSE
......
testsuite/tests/ado/ado004.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -44,5 +44,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/backpack/should_compile/bkp16.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -4,5 +4,5 @@
Instantiating q
[1 of 1] Including p[Int=base-4.12.0.0:GHC.Exts]
Instantiating p[Int=base-4.12.0.0:GHC.Exts]
[1 of 1] Including ghc-prim-0.5.2.1
[1 of 1] Including ghc-prim-0.5.3
[1 of 1] Compiling Int[sig] ( p/Int.hsig, bkp16.out/p/p-97PZnzqiJmd2hTwUNGdjod/Int.o )
testsuite/tests/determinism/determ021/determ021.stdout
+ 2
− 2
View file @ e1fd9461
......@@ -7,7 +7,7 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
[1 of 1] Compiling A ( A.hs, A.o )
TYPE SIGNATURES
......@@ -18,5 +18,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/driver/json2.stderr
+ 1
− 1
View file @ e1fd9461
{"span": null,"doc": "TYPE SIGNATURES/n foo :: forall a. a -> a/nTYPE CONSTRUCTORS/nCOERCION AXIOMS/nDependent modules: []/nDependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,/n integer-<IMPL>-<VERSION>]","severity": "SevOutput","reason": null}
{"span": null,"doc": "TYPE SIGNATURES\n foo :: forall a. a -> a\nTYPE CONSTRUCTORS\nCOERCION AXIOMS\nDependent modules: []\nDependent packages: [base-4.12.0.0, ghc-prim-0.5.3,\n integer-gmp-1.0.2.0]","severity": "SevOutput","reason": null}
testsuite/tests/indexed-types/should_compile/T3017.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -20,5 +20,5 @@ INSTANCES
FAMILY INSTANCES
type Elem (ListColl a)
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/partial-sigs/should_compile/ADT.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -5,5 +5,5 @@ TYPE CONSTRUCTORS
data Foo x y z = Foo x y z
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/partial-sigs/should_compile/DataFamilyInstanceLHS.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -20,5 +20,5 @@ COERCION AXIOMS
FAMILY INSTANCES
data instance Sing
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr
+ 1
− 1
View file @ e1fd9461
......@@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.2.1,
Dependent packages: [base-4.12.0.0, ghc-prim-0.5.3,
integer-gmp-1.0.2.0]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment