diff options
| author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2020-07-12 22:08:10 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-07-22 20:21:48 -0400 |
| commit | cfa89149b55837f822ba619b797781813fdcdabc (patch) | |
| tree | 932b9af9f50b88b137b6faf42050e3e2445d252c /testsuite | |
| parent | ff1b7710c9975a3cc1025cb5b9d29197a5f1a98a (diff) | |
| download | haskell-cfa89149b55837f822ba619b797781813fdcdabc.tar.gz | |
Define type Void# = (# #) (#18441)
There's one backwards compatibility issue: GHC.Prim no longer exports
Void#, we now manually re-export it from GHC.Exts.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/tests/codeGen/should_compile/T12115.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/printer/T18052a.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/simplCore/should_compile/T13143.stderr | 10 | ||||
| -rw-r--r-- | testsuite/tests/unboxedsums/ffi1.hs | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/testsuite/tests/codeGen/should_compile/T12115.hs b/testsuite/tests/codeGen/should_compile/T12115.hs index 9cbb1b6bbd..bc119e58b4 100644 --- a/testsuite/tests/codeGen/should_compile/T12115.hs +++ b/testsuite/tests/codeGen/should_compile/T12115.hs @@ -5,5 +5,5 @@ module T12115 where import GHC.Prim import GHC.Types -f :: (# Void#, (# #) #) -> String +f :: (# (# #), (# #) #) -> String f = f diff --git a/testsuite/tests/printer/T18052a.stderr b/testsuite/tests/printer/T18052a.stderr index 428855692b..a45c9c958c 100644 --- a/testsuite/tests/printer/T18052a.stderr +++ b/testsuite/tests/printer/T18052a.stderr @@ -25,7 +25,7 @@ T18052a.$b:||: = \ (@a) (@b) (x :: a) (y :: b) -> (x, y) -- RHS size: {terms: 13, types: 20, coercions: 0, joins: 0/0} T18052a.$m:||: :: forall {rep :: GHC.Types.RuntimeRep} {r :: TYPE rep} {a} {b}. - (a, b) -> (a -> b -> r) -> (GHC.Prim.Void# -> r) -> r + (a, b) -> (a -> b -> r) -> ((# #) -> r) -> r [GblId, Arity=3, Unf=OtherCon []] T18052a.$m:||: = \ (@(rep :: GHC.Types.RuntimeRep)) diff --git a/testsuite/tests/simplCore/should_compile/T13143.stderr b/testsuite/tests/simplCore/should_compile/T13143.stderr index 13f6d769ec..6d069f6cbd 100644 --- a/testsuite/tests/simplCore/should_compile/T13143.stderr +++ b/testsuite/tests/simplCore/should_compile/T13143.stderr @@ -6,9 +6,9 @@ Result size of Tidy Core Rec { -- RHS size: {terms: 4, types: 4, coercions: 0, joins: 0/0} T13143.$wf [InlPrag=NOINLINE, Occ=LoopBreaker] - :: forall {a}. GHC.Prim.Void# -> a + :: forall {a}. (# #) -> a [GblId, Arity=1, Str=<B,A>b, Cpr=b, Unf=OtherCon []] -T13143.$wf = \ (@a) _ [Occ=Dead] -> T13143.$wf @a GHC.Prim.void# +T13143.$wf = \ (@a) _ [Occ=Dead] -> T13143.$wf @a GHC.Prim.(##) end Rec } -- RHS size: {terms: 4, types: 4, coercions: 0, joins: 0/0} @@ -20,8 +20,8 @@ f [InlPrag=NOUSERINLINE[final]] :: forall a. Int -> a Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=True) - Tmpl= \ (@a) _ [Occ=Dead] -> T13143.$wf @a GHC.Prim.void#}] -f = \ (@a) _ [Occ=Dead] -> T13143.$wf @a GHC.Prim.void# + Tmpl= \ (@a) _ [Occ=Dead] -> T13143.$wf @a GHC.Prim.(##)}] +f = \ (@a) _ [Occ=Dead] -> T13143.$wf @a GHC.Prim.(##) -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} T13143.$trModule4 :: GHC.Prim.Addr# @@ -62,7 +62,7 @@ T13143.$trModule -- RHS size: {terms: 2, types: 1, coercions: 0, joins: 0/0} lvl :: Int [GblId, Str=b, Cpr=b] -lvl = T13143.$wf @Int GHC.Prim.void# +lvl = T13143.$wf @Int GHC.Prim.(##) Rec { -- RHS size: {terms: 28, types: 7, coercions: 0, joins: 0/0} diff --git a/testsuite/tests/unboxedsums/ffi1.hs b/testsuite/tests/unboxedsums/ffi1.hs index e6128e4ff1..aff0e73799 100644 --- a/testsuite/tests/unboxedsums/ffi1.hs +++ b/testsuite/tests/unboxedsums/ffi1.hs @@ -2,7 +2,7 @@ module Lib where -import GHC.Prim +import GHC.Exts -- Can't unboxed tuples and sums to FFI, we should fail appropriately. |