From 81b78b1969c4bc862ead14327973c070cc011520 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 12 Oct 2022 21:19:53 -0400 Subject: testsuite --- .../tests/numeric/should_compile/T14465.stdout | 2 +- .../numeric/should_compile/T19769.stderr-ws-64 | 22 +-- .../tests/numeric/should_compile/T20347.stderr | 4 +- .../tests/numeric/should_compile/T7116.stdout | 8 +- .../simplCore/should_compile/OpaqueNoRebox.stderr | 11 +- .../simplCore/should_compile/OpaqueNoRebox3.stderr | 7 +- .../should_compile/OpaqueNoSpecConstr.stderr | 17 ++- .../should_compile/OpaqueNoStrictArgWW.stderr | 9 +- .../tests/simplCore/should_compile/T13143.stderr | 4 +- .../tests/simplCore/should_compile/T3772.stdout | 4 +- .../tests/simplCore/should_compile/T4908.stderr | 2 +- .../tests/simplCore/should_compile/T4930.stderr | 7 +- .../simplCore/should_compile/noinline01.stderr | 2 +- .../tests/simplCore/should_compile/par01.stderr | 5 +- .../simplCore/should_compile/spec-inline.stderr | 10 +- .../tests/stranal/should_compile/T10694.stderr | 150 ++++++++++++++++----- .../tests/stranal/should_compile/T18122.stderr | 38 +++--- testsuite/tests/stranal/sigs/T21119.stderr | 6 +- 18 files changed, 206 insertions(+), 102 deletions(-) diff --git a/testsuite/tests/numeric/should_compile/T14465.stdout b/testsuite/tests/numeric/should_compile/T14465.stdout index 7ce467bc60..3efdcfdc3d 100644 --- a/testsuite/tests/numeric/should_compile/T14465.stdout +++ b/testsuite/tests/numeric/should_compile/T14465.stdout @@ -48,7 +48,7 @@ M.$trModule = GHC.Types.Module M.$trModule3 M.$trModule1 -- RHS size: {terms: 1, types: 1, coercions: 0, joins: 0/0} minusOne :: Natural [GblId, - Str=b, + Str={0t->1L}, Cpr=b, Unf=Unf{Src=, TopLvl=True, Value=False, ConLike=False, WorkFree=True, Expandable=True, diff --git a/testsuite/tests/numeric/should_compile/T19769.stderr-ws-64 b/testsuite/tests/numeric/should_compile/T19769.stderr-ws-64 index 99793137a2..c5620bbf4b 100644 --- a/testsuite/tests/numeric/should_compile/T19769.stderr-ws-64 +++ b/testsuite/tests/numeric/should_compile/T19769.stderr-ws-64 @@ -1,23 +1,23 @@ ==================== Tidy Core ==================== Result size of Tidy Core - = {terms: 74, types: 64, coercions: 0, joins: 0/0} + = {terms: 54, types: 54, coercions: 0, joins: 0/0} -wi8 = \ x -> word8ToInt8# x +wi8 = word8ToInt8# -wi16 = \ x -> word16ToInt16# x +wi16 = word16ToInt16# -wi32 = \ x -> word32ToInt32# x +wi32 = word32ToInt32# -wi64 = \ x -> word64ToInt64# x +wi64 = word64ToInt64# -iw8 = \ x -> int8ToWord8# x +iw8 = int8ToWord8# -iw16 = \ x -> int16ToWord16# x +iw16 = int16ToWord16# -iw32 = \ x -> int32ToWord32# x +iw32 = int32ToWord32# -iw64 = \ x -> int64ToWord64# x +iw64 = int64ToWord64# i8 = \ x -> x @@ -43,9 +43,9 @@ wiw64 = w64 iwi64 = i64 -ww64i = \ x -> word2Int# x +ww64i = word2Int# -ii64w = \ x -> int2Word# x +ii64w = int2Word# diff --git a/testsuite/tests/numeric/should_compile/T20347.stderr b/testsuite/tests/numeric/should_compile/T20347.stderr index 6fcb0b0722..e4e80ada00 100644 --- a/testsuite/tests/numeric/should_compile/T20347.stderr +++ b/testsuite/tests/numeric/should_compile/T20347.stderr @@ -1,7 +1,7 @@ ==================== Tidy Core ==================== Result size of Tidy Core - = {terms: 24, types: 17, coercions: 0, joins: 0/0} + = {terms: 20, types: 15, coercions: 0, joins: 0/0} foo0 = \ x -> -# 10# x @@ -9,7 +9,7 @@ foo1 = \ _ -> 10# foo2 = \ x -> +# 10# x -foo3 = \ x y -> *# x y +foo3 = *# foo4 = \ x -> *# -10# x diff --git a/testsuite/tests/numeric/should_compile/T7116.stdout b/testsuite/tests/numeric/should_compile/T7116.stdout index 90aeda659d..83a0c0170f 100644 --- a/testsuite/tests/numeric/should_compile/T7116.stdout +++ b/testsuite/tests/numeric/should_compile/T7116.stdout @@ -43,7 +43,7 @@ T7116.$trModule dr :: Double -> Double [GblId, Arity=1, - Str=<1!P(L)>, + Str=<1!P(L)> {94h->1C1(C1(L))}, Cpr=1, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, @@ -60,7 +60,7 @@ dr dl :: Double -> Double [GblId, Arity=1, - Str=<1!P(L)>, + Str=<1!P(L)> {94h->1C1(C1(L))}, Cpr=1, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, @@ -71,7 +71,7 @@ dl = dr fr :: Float -> Float [GblId, Arity=1, - Str=<1!P(L)>, + Str=<1!P(L)> {94P->1C1(C1(L))}, Cpr=1, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, @@ -90,7 +90,7 @@ fr fl :: Float -> Float [GblId, Arity=1, - Str=<1!P(L)>, + Str=<1!P(L)> {94P->1C1(C1(L))}, Cpr=1, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, diff --git a/testsuite/tests/simplCore/should_compile/OpaqueNoRebox.stderr b/testsuite/tests/simplCore/should_compile/OpaqueNoRebox.stderr index ad82c9e16c..5ba35d668f 100644 --- a/testsuite/tests/simplCore/should_compile/OpaqueNoRebox.stderr +++ b/testsuite/tests/simplCore/should_compile/OpaqueNoRebox.stderr @@ -45,19 +45,19 @@ OpaqueNoRebox.$trModule -- RHS size: {terms: 7, types: 8, coercions: 0, joins: 0/0} f [InlPrag=OPAQUE] :: (Int, Int) -> Int [GblId, Arity=1, Str=<1P(1L,1L)>, Unf=OtherCon []] -f = / (ds :: (Int, Int)) -> +f = \ (ds :: (Int, Int)) -> case ds of { (x, y) -> GHC.Num.$fNumInt_$c+ x y } -- RHS size: {terms: 19, types: 14, coercions: 0, joins: 0/0} g [InlPrag=[2]] :: (Int, Int) -> Int [GblId, Arity=1, - Str=<1P(SL,SL)>, + Str=<1P(SL,SL)> {92F->1C1(C1(L))}, Cpr=1, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False) - Tmpl= / (p [Occ=Once1!] :: (Int, Int)) -> + Tmpl= \ (p [Occ=Once1!] :: (Int, Int)) -> case p of wild { (x [Occ=Once1!], _ [Occ=Dead]) -> case x of { GHC.Types.I# x1 [Occ=Once1] -> case f (f wild, f wild) of { GHC.Types.I# y [Occ=Once1] -> @@ -65,7 +65,7 @@ g [InlPrag=[2]] :: (Int, Int) -> Int } } }}] -g = / (p :: (Int, Int)) -> +g = \ (p :: (Int, Int)) -> case p of wild { (x, ds1) -> case x of { GHC.Types.I# x1 -> case f (f wild, f wild) of { GHC.Types.I# y -> @@ -73,3 +73,6 @@ g = / (p :: (Int, Int)) -> } } } + + + diff --git a/testsuite/tests/simplCore/should_compile/OpaqueNoRebox3.stderr b/testsuite/tests/simplCore/should_compile/OpaqueNoRebox3.stderr index 3f01f42d2d..2f481e372c 100644 --- a/testsuite/tests/simplCore/should_compile/OpaqueNoRebox3.stderr +++ b/testsuite/tests/simplCore/should_compile/OpaqueNoRebox3.stderr @@ -44,7 +44,7 @@ OpaqueNoRebox3.$trModule -- RHS size: {terms: 8, types: 3, coercions: 0, joins: 0/0} f [InlPrag=OPAQUE] :: Int -> Int -[GblId, Arity=1, Str=<1L>, Unf=OtherCon []] +[GblId, Arity=1, Str=<1L> {92F->1C1(C1(L))}, Unf=OtherCon []] f = \ (x :: Int) -> case x of { GHC.Types.I# ipv -> GHC.Types.I# (GHC.Prim.+# ipv 1#) } @@ -132,7 +132,10 @@ lvl13 Rec { -- RHS size: {terms: 50, types: 13, coercions: 0, joins: 1/1} g [Occ=LoopBreaker] :: Bool -> Bool -> Bool -> Int -> Int -[GblId, Arity=4, Str=<1L>, Unf=OtherCon []] +[GblId, + Arity=4, + Str=<1L> {92F->SCS(C1(L))}, + Unf=OtherCon []] g = \ (w :: Bool) (w1 :: Bool) (w2 :: Bool) (p :: Int) -> join { fail_ [Dmd=M!P(L)] :: Int diff --git a/testsuite/tests/simplCore/should_compile/OpaqueNoSpecConstr.stderr b/testsuite/tests/simplCore/should_compile/OpaqueNoSpecConstr.stderr index e2a51a21b3..d7c2bc8853 100644 --- a/testsuite/tests/simplCore/should_compile/OpaqueNoSpecConstr.stderr +++ b/testsuite/tests/simplCore/should_compile/OpaqueNoSpecConstr.stderr @@ -18,7 +18,7 @@ lvl = "OpaqueNoSpecConstr.hs:(10,1)-(11,39)|function loop"# -- RHS size: {terms: 2, types: 2, coercions: 0, joins: 0/0} lvl1 :: () -[GblId, Str=b, Cpr=b] +[GblId, Str={0e->1C1(!A)}, Cpr=b] lvl1 = Control.Exception.Base.patError @GHC.Types.LiftedRep @() lvl Rec { @@ -99,8 +99,8 @@ OpaqueNoSpecConstr.$tcSPEC :: GHC.Types.TyCon WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}] OpaqueNoSpecConstr.$tcSPEC = GHC.Types.TyCon - 1794519131116102988## - 1536993820726345194## + 1794519131116102988##64 + 1536993820726345194##64 OpaqueNoSpecConstr.$trModule OpaqueNoSpecConstr.$tcSPEC1 0# @@ -135,8 +135,8 @@ OpaqueNoSpecConstr.$tc'SPEC :: GHC.Types.TyCon WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}] OpaqueNoSpecConstr.$tc'SPEC = GHC.Types.TyCon - 9648911419523887824## - 4100179153648933145## + 9648911419523887824##64 + 4100179153648933145##64 OpaqueNoSpecConstr.$trModule OpaqueNoSpecConstr.$tc'SPEC3 0# @@ -164,9 +164,12 @@ OpaqueNoSpecConstr.$tc'SPEC2 :: GHC.Types.TyCon WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}] OpaqueNoSpecConstr.$tc'SPEC2 = GHC.Types.TyCon - 4214136204857816792## - 17253701793498718125## + 4214136204857816792##64 + 17253701793498718125##64 OpaqueNoSpecConstr.$trModule OpaqueNoSpecConstr.$tc'SPEC5 0# OpaqueNoSpecConstr.$tc'SPEC1 + + + diff --git a/testsuite/tests/simplCore/should_compile/OpaqueNoStrictArgWW.stderr b/testsuite/tests/simplCore/should_compile/OpaqueNoStrictArgWW.stderr index c99e729976..73f20a7d39 100644 --- a/testsuite/tests/simplCore/should_compile/OpaqueNoStrictArgWW.stderr +++ b/testsuite/tests/simplCore/should_compile/OpaqueNoStrictArgWW.stderr @@ -44,6 +44,9 @@ OpaqueNoStrictArgWW.$trModule -- RHS size: {terms: 8, types: 3, coercions: 0, joins: 0/0} f [InlPrag=OPAQUE] :: Int -> Int -[GblId, Arity=1, Str=<1L>, Unf=OtherCon []] -f = / (x :: Int) -> - case x of { GHC.Types.I# x1 -> GHC.Types.I# (GHC.Prim.+# x1 1#) } \ No newline at end of file +[GblId, Arity=1, Str=<1L> {92F->1C1(C1(L))}, Unf=OtherCon []] +f = \ (x :: Int) -> + case x of { GHC.Types.I# x1 -> GHC.Types.I# (GHC.Prim.+# x1 1#) } + + + diff --git a/testsuite/tests/simplCore/should_compile/T13143.stderr b/testsuite/tests/simplCore/should_compile/T13143.stderr index 16189c6daa..9f6f56b99f 100644 --- a/testsuite/tests/simplCore/should_compile/T13143.stderr +++ b/testsuite/tests/simplCore/should_compile/T13143.stderr @@ -70,7 +70,7 @@ T13143.$wg [InlPrag=[2], Occ=LoopBreaker] :: Bool -> Bool -> GHC.Prim.Int# -> GHC.Prim.Int# [GblId[StrictWorker([!, !])], Arity=3, - Str=<1L><1L>, + Str=<1L><1L> {92F->SCS(C1(L))}, Unf=OtherCon []] T13143.$wg = \ (ds :: Bool) (ds1 :: Bool) (ww :: GHC.Prim.Int#) -> @@ -92,7 +92,7 @@ end Rec } g [InlPrag=[2]] :: Bool -> Bool -> Int -> Int [GblId, Arity=3, - Str=<1L><1L><1!P(L)>, + Str=<1L><1L><1!P(L)> {92F->SCS(C1(L))}, Cpr=1, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, diff --git a/testsuite/tests/simplCore/should_compile/T3772.stdout b/testsuite/tests/simplCore/should_compile/T3772.stdout index dde2503f31..f2aeca3773 100644 --- a/testsuite/tests/simplCore/should_compile/T3772.stdout +++ b/testsuite/tests/simplCore/should_compile/T3772.stdout @@ -53,7 +53,7 @@ end Rec } -- RHS size: {terms: 10, types: 2, coercions: 0, joins: 0/0} T3772.$wfoo [InlPrag=NOINLINE] :: GHC.Prim.Int# -> (# #) -[GblId, Arity=1, Str=, Unf=OtherCon []] +[GblId, Arity=1, Str= {92Y->1C1(C1(L))}, Unf=OtherCon []] T3772.$wfoo = \ (ww :: GHC.Prim.Int#) -> case GHC.Prim.<# 0# ww of { @@ -65,7 +65,7 @@ T3772.$wfoo foo [InlPrag=[final]] :: Int -> () [GblId, Arity=1, - Str=<1!P(L)>, + Str=<1!P(L)> {92Y->1C1(C1(L))}, Cpr=1, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, diff --git a/testsuite/tests/simplCore/should_compile/T4908.stderr b/testsuite/tests/simplCore/should_compile/T4908.stderr index 307c9fb728..f04dea46e5 100644 --- a/testsuite/tests/simplCore/should_compile/T4908.stderr +++ b/testsuite/tests/simplCore/should_compile/T4908.stderr @@ -59,7 +59,7 @@ end Rec } f [InlPrag=[2]] :: Int -> (Int, Int) -> Bool [GblId, Arity=2, - Str=<1!P(1L)>, + Str=<1!P(1L)> {92G->MC1(C1(L))}, Cpr=2, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, diff --git a/testsuite/tests/simplCore/should_compile/T4930.stderr b/testsuite/tests/simplCore/should_compile/T4930.stderr index 413f892942..b6b1138380 100644 --- a/testsuite/tests/simplCore/should_compile/T4930.stderr +++ b/testsuite/tests/simplCore/should_compile/T4930.stderr @@ -43,7 +43,10 @@ Rec { -- RHS size: {terms: 17, types: 3, coercions: 0, joins: 0/0} T4930.$wfoo [InlPrag=[2], Occ=LoopBreaker] :: GHC.Prim.Int# -> GHC.Prim.Int# -[GblId, Arity=1, Str=, Unf=OtherCon []] +[GblId, + Arity=1, + Str= {92F->SCS(C1(L)) 92Y->SCS(C1(L))}, + Unf=OtherCon []] T4930.$wfoo = \ (ww :: GHC.Prim.Int#) -> case GHC.Prim.<# ww 5# of { @@ -56,7 +59,7 @@ end Rec } foo [InlPrag=[2]] :: Int -> Int [GblId, Arity=1, - Str=<1!P(L)>, + Str=<1!P(L)> {92F->SCS(C1(L)) 92Y->SCS(C1(L))}, Cpr=1, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, diff --git a/testsuite/tests/simplCore/should_compile/noinline01.stderr b/testsuite/tests/simplCore/should_compile/noinline01.stderr index cf7eb10902..dd244a0f5b 100644 --- a/testsuite/tests/simplCore/should_compile/noinline01.stderr +++ b/testsuite/tests/simplCore/should_compile/noinline01.stderr @@ -6,7 +6,7 @@ Noinline01.f [InlPrag=INLINE (sat-args=1)] \r [eta] GHC.Types.True []; Noinline01.g :: GHC.Types.Bool -[GblId] = +[GblId, Str={021->1C1(C1(L))}] = \u [] Noinline01.f GHC.Types.False; Noinline01.$trModule4 :: GHC.Prim.Addr# diff --git a/testsuite/tests/simplCore/should_compile/par01.stderr b/testsuite/tests/simplCore/should_compile/par01.stderr index d70331f4a9..0f45ed028a 100644 --- a/testsuite/tests/simplCore/should_compile/par01.stderr +++ b/testsuite/tests/simplCore/should_compile/par01.stderr @@ -6,7 +6,10 @@ Result size of CorePrep Rec { -- RHS size: {terms: 7, types: 3, coercions: 0, joins: 0/0} Par01.depth [Occ=LoopBreaker] :: GHC.Types.Int -> GHC.Types.Int -[GblId, Arity=1, Str=, Unf=OtherCon []] +[GblId, + Arity=1, + Str= {01G->SCS(!P(L)) 9a5->SCS(!A)}, + Unf=OtherCon []] Par01.depth = \ (d :: GHC.Types.Int) -> case GHC.Prim.par# @GHC.Types.Int d of { __DEFAULT -> diff --git a/testsuite/tests/simplCore/should_compile/spec-inline.stderr b/testsuite/tests/simplCore/should_compile/spec-inline.stderr index e0b2ad4962..5ac859c6e4 100644 --- a/testsuite/tests/simplCore/should_compile/spec-inline.stderr +++ b/testsuite/tests/simplCore/should_compile/spec-inline.stderr @@ -46,7 +46,7 @@ lvl = "spec-inline.hs:(19,5)-(29,25)|function go"# -- RHS size: {terms: 2, types: 2, coercions: 0, joins: 0/0} Roman.foo3 :: () -[GblId, Str=b, Cpr=b] +[GblId, Str={0e->1C1(!A)}, Cpr=b] Roman.foo3 = Control.Exception.Base.patError @GHC.Types.LiftedRep @() lvl @@ -54,7 +54,7 @@ Rec { -- RHS size: {terms: 40, types: 5, coercions: 0, joins: 0/0} Roman.foo_$s$wgo [Occ=LoopBreaker] :: GHC.Prim.Int# -> GHC.Prim.Int# -> GHC.Prim.Int# -[GblId, Arity=2, Str=, Unf=OtherCon []] +[GblId, Arity=2, Str= {92Z->SCS(C1(L))}, Unf=OtherCon []] Roman.foo_$s$wgo = \ (sc :: GHC.Prim.Int#) (sc1 :: GHC.Prim.Int#) -> case GHC.Prim.<=# sc1 0# of { @@ -76,7 +76,7 @@ end Rec } Roman.$wgo [InlPrag=[2]] :: Maybe Int -> Maybe Int -> GHC.Prim.Int# [GblId[StrictWorker([!, !])], Arity=2, - Str=<1L><1L>, + Str=<1L><1L> {0e->MC1(!B) 92G->MC1(C1(L)) 92Z->SCS(C1(L))}, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [61 30] 249 0}] Roman.$wgo @@ -111,7 +111,7 @@ Roman.$wgo Roman.foo_go [InlPrag=[2]] :: Maybe Int -> Maybe Int -> Int [GblId[StrictWorker([!, !])], Arity=2, - Str=<1L><1L>, + Str=<1L><1L> {0e->MC1(!B) 92G->MC1(C1(L)) 92Z->SCS(C1(L))}, Cpr=1, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, @@ -143,7 +143,7 @@ Roman.foo1 = GHC.Maybe.Just @Int Roman.foo2 foo :: Int -> Int [GblId, Arity=1, - Str=<1!P(L)>, + Str=<1!P(L)> {92Z->SCS(C1(L))}, Cpr=1, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, diff --git a/testsuite/tests/stranal/should_compile/T10694.stderr b/testsuite/tests/stranal/should_compile/T10694.stderr index e809998142..2267c8ecf7 100644 --- a/testsuite/tests/stranal/should_compile/T10694.stderr +++ b/testsuite/tests/stranal/should_compile/T10694.stderr @@ -1,10 +1,110 @@ ==================== Tidy Core ==================== -Result size of Tidy Core = {terms: 74, types: 65, coercions: 0, joins: 0/4} +Result size of Tidy Core = {terms: 135, types: 84, coercions: 8, joins: 0/4} --- RHS size: {terms: 39, types: 25, coercions: 0, joins: 0/4} +-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} +T10694.$trModule4 :: GHC.Prim.Addr# +[GblId, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 20 0}] +T10694.$trModule4 = "main"# + +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} +T10694.$trModule3 :: GHC.Types.TrName +[GblId, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}] +T10694.$trModule3 = GHC.Types.TrNameS T10694.$trModule4 + +-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} +T10694.$trModule2 :: GHC.Prim.Addr# +[GblId, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 0}] +T10694.$trModule2 = "T10694"# + +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} +T10694.$trModule1 :: GHC.Types.TrName +[GblId, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}] +T10694.$trModule1 = GHC.Types.TrNameS T10694.$trModule2 + +-- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} +T10694.$trModule :: GHC.Types.Module +[GblId, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}] +T10694.$trModule = GHC.Types.Module T10694.$trModule3 T10694.$trModule1 + +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} +loc :: [Char] +[GblId] +loc = GHC.CString.unpackCString# T10694.$trModule4 + +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} +loc1 :: [Char] +[GblId] +loc1 = GHC.CString.unpackCString# T10694.$trModule2 + +-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} +loc2 :: GHC.Prim.Addr# +[GblId, Unf=OtherCon []] +loc2 = "T10694.hs"# + +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} +loc3 :: [Char] +[GblId] +loc3 = GHC.CString.unpackCString# loc2 + +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} +loc4 :: Int +[GblId, Unf=OtherCon []] +loc4 = GHC.Types.I# 10# + +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} +loc5 :: Int +[GblId, Unf=OtherCon []] +loc5 = GHC.Types.I# 21# + +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} +loc6 :: Int +[GblId, Unf=OtherCon []] +loc6 = GHC.Types.I# 23# + +-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} +$dIP :: GHC.Prim.Addr# +[GblId, Unf=OtherCon []] +$dIP = "!!"# + +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} +$dIP1 :: [Char] +[GblId] +$dIP1 = GHC.CString.unpackCString# $dIP + +-- RHS size: {terms: 8, types: 0, coercions: 0, joins: 0/0} +$dIP2 :: GHC.Stack.Types.SrcLoc +[GblId, Unf=OtherCon []] +$dIP2 = GHC.Stack.Types.SrcLoc loc loc1 loc3 loc4 loc5 loc4 loc6 + +-- RHS size: {terms: 4, types: 0, coercions: 0, joins: 0/0} +$dIP3 :: GHC.Stack.Types.CallStack +[GblId, Unf=OtherCon []] +$dIP3 = GHC.Stack.Types.PushCallStack $dIP1 $dIP2 GHC.Stack.Types.EmptyCallStack + +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} +loc7 :: Int +[GblId, Unf=OtherCon []] +loc7 = GHC.Types.I# 13# + +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} +loc8 :: Int +[GblId, Unf=OtherCon []] +loc8 = GHC.Types.I# 15# + +-- RHS size: {terms: 8, types: 0, coercions: 0, joins: 0/0} +$dIP4 :: GHC.Stack.Types.SrcLoc +[GblId, Unf=OtherCon []] +$dIP4 = GHC.Stack.Types.SrcLoc loc loc1 loc3 loc4 loc7 loc4 loc8 + +-- RHS size: {terms: 4, types: 0, coercions: 0, joins: 0/0} +$dIP5 :: GHC.Stack.Types.CallStack +[GblId, Unf=OtherCon []] +$dIP5 = GHC.Stack.Types.PushCallStack $dIP1 $dIP4 GHC.Stack.Types.EmptyCallStack + +-- RHS size: {terms: 41, types: 25, coercions: 8, joins: 0/4} T10694.$wpm [InlPrag=NOINLINE] :: Int -> Int -> (# Int, Int #) -[GblId, Arity=2, Str=, Unf=OtherCon []] +[GblId, Arity=2, Str= {92F->MC1(C1(L)) 92G->MC1(C1(L))}, Unf=OtherCon []] T10694.$wpm = \ (x :: Int) (y :: Int) -> let { @@ -23,13 +123,26 @@ T10694.$wpm l3 :: [Int] [LclId, Unf=OtherCon []] l3 = GHC.Types.: @Int l l2 } in - (# GHC.List.$w!! @Int l3 0#, GHC.List.$w!! @Int l3 1# #) + (# GHC.List.$w!! + @Int + ($dIP5 + `cast` (Sym (GHC.Classes.N:IP[0] <"callStack">_N _N) + :: GHC.Stack.Types.CallStack ~R# (?callStack::GHC.Stack.Types.CallStack))) + l3 + 0#, + GHC.List.$w!! + @Int + ($dIP3 + `cast` (Sym (GHC.Classes.N:IP[0] <"callStack">_N _N) + :: GHC.Stack.Types.CallStack ~R# (?callStack::GHC.Stack.Types.CallStack))) + l3 + 1# #) -- RHS size: {terms: 10, types: 11, coercions: 0, joins: 0/0} pm [InlPrag=[final]] :: Int -> Int -> (Int, Int) [GblId, Arity=2, - Str=, + Str= {92F->MC1(C1(L)) 92G->MC1(C1(L))}, Cpr=1, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=ALWAYS_IF(arity=2,unsat_ok=True,boring_ok=False) @@ -41,34 +154,9 @@ pm = \ (x :: Int) (y :: Int) -> case T10694.$wpm x y of { (# ww, ww1 #) -> (ww, m :: Int -> Int -> Int [GblId, Arity=2, - Str=, + Str= {92F->MC1(C1(L)) 92G->MC1(C1(L))}, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [0 0] 40 0}] m = \ (x :: Int) (y :: Int) -> case T10694.$wpm x y of { (# ww, ww1 #) -> ww1 } --- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T10694.$trModule4 :: GHC.Prim.Addr# -[GblId, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 20 0}] -T10694.$trModule4 = "main"# - --- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T10694.$trModule3 :: GHC.Types.TrName -[GblId, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}] -T10694.$trModule3 = GHC.Types.TrNameS T10694.$trModule4 - --- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T10694.$trModule2 :: GHC.Prim.Addr# -[GblId, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 0}] -T10694.$trModule2 = "T10694"# - --- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T10694.$trModule1 :: GHC.Types.TrName -[GblId, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}] -T10694.$trModule1 = GHC.Types.TrNameS T10694.$trModule2 - --- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -T10694.$trModule :: GHC.Types.Module -[GblId, Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}] -T10694.$trModule = GHC.Types.Module T10694.$trModule3 T10694.$trModule1 - diff --git a/testsuite/tests/stranal/should_compile/T18122.stderr b/testsuite/tests/stranal/should_compile/T18122.stderr index 8fe91fc57a..1110441566 100644 --- a/testsuite/tests/stranal/should_compile/T18122.stderr +++ b/testsuite/tests/stranal/should_compile/T18122.stderr @@ -1,7 +1,7 @@ ==================== Tidy Core ==================== Result size of Tidy Core - = {terms: 39, types: 29, coercions: 0, joins: 0/0} + = {terms: 35, types: 27, coercions: 0, joins: 0/0} -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} Lib.$trModule4 :: GHC.Prim.Addr# @@ -38,42 +38,40 @@ Lib.$trModule :: GHC.Types.Module WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}] Lib.$trModule = GHC.Types.Module Lib.$trModule3 Lib.$trModule1 --- RHS size: {terms: 5, types: 2, coercions: 0, joins: 0/0} +-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} Lib.$wfoo [InlPrag=NOINLINE] :: GHC.Prim.Int# -> GHC.Prim.Int# -> GHC.Prim.Int# -[GblId, Arity=2, Str=, Unf=OtherCon []] -Lib.$wfoo - = \ (ww_sF3 :: GHC.Prim.Int#) (ww1_sF9 :: GHC.Prim.Int#) -> - GHC.Prim.+# ww_sF3 ww1_sF9 +[GblId, Arity=2, Str= {92F->1C1(C1(L))}, Unf=OtherCon []] +Lib.$wfoo = GHC.Prim.+# -- RHS size: {terms: 18, types: 14, coercions: 0, joins: 0/0} foo [InlPrag=[final]] :: (Int, Int) -> Int -> Int [GblId, Arity=2, - Str=<1!P(1!L,A)><1!L>, + Str=<1!P(1!P(L),A)><1!P(L)> {92F->1C1(C1(L))}, Cpr=1, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=ALWAYS_IF(arity=2,unsat_ok=True,boring_ok=False) - Tmpl= \ (ds_sEZ [Occ=Once1!] :: (Int, Int)) - (z_sF7 [Occ=Once1!] :: Int) -> - case ds_sEZ of { (ww_sF1 [Occ=Once1!], _ [Occ=Dead]) -> - case ww_sF1 of { GHC.Types.I# ww2_sF3 [Occ=Once1] -> - case z_sF7 of { GHC.Types.I# ww3_sF9 [Occ=Once1] -> - case Lib.$wfoo ww2_sF3 ww3_sF9 of ww4_sFe [Occ=Once1] + Tmpl= \ (ds_sEG [Occ=Once1!] :: (Int, Int)) + (z_sEO [Occ=Once1!] :: Int) -> + case ds_sEG of { (ww_sEI [Occ=Once1!], _ [Occ=Dead]) -> + case ww_sEI of { GHC.Types.I# ww2_sEK [Occ=Once1] -> + case z_sEO of { GHC.Types.I# ww3_sEQ [Occ=Once1] -> + case Lib.$wfoo ww2_sEK ww3_sEQ of ww4_sEV [Occ=Once1] { __DEFAULT -> - GHC.Types.I# ww4_sFe + GHC.Types.I# ww4_sEV } } } }}] foo - = \ (ds_sEZ :: (Int, Int)) (z_sF7 :: Int) -> - case ds_sEZ of { (ww_sF1, ww1_sF5) -> - case ww_sF1 of { GHC.Types.I# ww2_sF3 -> - case z_sF7 of { GHC.Types.I# ww3_sF9 -> - case Lib.$wfoo ww2_sF3 ww3_sF9 of ww4_sFe { __DEFAULT -> - GHC.Types.I# ww4_sFe + = \ (ds_sEG :: (Int, Int)) (z_sEO :: Int) -> + case ds_sEG of { (ww_sEI, ww1_sEM) -> + case ww_sEI of { GHC.Types.I# ww2_sEK -> + case z_sEO of { GHC.Types.I# ww3_sEQ -> + case Lib.$wfoo ww2_sEK ww3_sEQ of ww4_sEV { __DEFAULT -> + GHC.Types.I# ww4_sEV } } } diff --git a/testsuite/tests/stranal/sigs/T21119.stderr b/testsuite/tests/stranal/sigs/T21119.stderr index ca60a36995..014a08c214 100644 --- a/testsuite/tests/stranal/sigs/T21119.stderr +++ b/testsuite/tests/stranal/sigs/T21119.stderr @@ -5,7 +5,7 @@ T21119.$fMyShowInt: <1!A> T21119.get: <1!P(1!P(L),1!P(L))><1!P(L)><1L> T21119.getIO: <1P(1L,ML)><1L> T21119.indexError: <1C1(S)><1!B>b -T21119.throwIndexError: x +T21119.throwIndexError: @@ -23,8 +23,8 @@ T21119.throwIndexError: b T21119.$fMyShow(,): <1!A> T21119.$fMyShowInt: <1!A> T21119.get: <1!P(1!P(L),1!P(L))><1!P(L)><1L> -T21119.getIO: <1P(1L,ML)><1L> +T21119.getIO: <1!P(1!P(L),ML)><1!P(L)> T21119.indexError: <1C1(S)><1!B>b -T21119.throwIndexError: x +T21119.throwIndexError: -- cgit v1.2.1