[commit: testsuite] master: Adjust debug output for different syntax of strictness annotations (c85582d)
Simon Peyton Jones
simonpj at microsoft.com
Thu Jan 17 15:01:53 CET 2013
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/c85582dc17711c352ae3befbf8a44074ee1d7618
>---------------------------------------------------------------
commit c85582dc17711c352ae3befbf8a44074ee1d7618
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Thu Jan 17 13:51:53 2013 +0000
Adjust debug output for different syntax of strictness annotations
>---------------------------------------------------------------
tests/deSugar/should_compile/T2431.stderr | 2 +-
tests/simplCore/should_compile/EvalTest.stdout | 2 +-
tests/simplCore/should_compile/T3717.stderr | 4 ++--
tests/simplCore/should_compile/T3772.stdout | 4 ++--
tests/simplCore/should_compile/T4908.stderr | 6 +++---
tests/simplCore/should_compile/T4930.stderr | 4 ++--
tests/simplCore/should_compile/T7360.stderr | 6 +++---
tests/simplCore/should_compile/spec-inline.stderr | 12 ++++++------
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/tests/deSugar/should_compile/T2431.stderr b/tests/deSugar/should_compile/T2431.stderr
index b338711..f8c5a0a 100644
--- a/tests/deSugar/should_compile/T2431.stderr
+++ b/tests/deSugar/should_compile/T2431.stderr
@@ -14,7 +14,7 @@ T2431.$WRefl = \ (@ a) -> T2431.Refl @ a @ a @~ <a>
T2431.absurd
:: forall a. (GHC.Types.Int T2431.:~: GHC.Types.Bool) -> a
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType Tb]
+[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <L,U>b]
T2431.absurd =
\ (@ a) (x :: GHC.Types.Int T2431.:~: GHC.Types.Bool) ->
case x of _ { }
diff --git a/tests/simplCore/should_compile/EvalTest.stdout b/tests/simplCore/should_compile/EvalTest.stdout
index 5f32ee8..30c7ea4 100644
--- a/tests/simplCore/should_compile/EvalTest.stdout
+++ b/tests/simplCore/should_compile/EvalTest.stdout
@@ -1 +1 @@
-rght [Dmd=Just S] :: EvalTest.AList a
+rght [Dmd=<S,U>] :: EvalTest.AList a
diff --git a/tests/simplCore/should_compile/T3717.stderr b/tests/simplCore/should_compile/T3717.stderr
index 56824f5..d668122 100644
--- a/tests/simplCore/should_compile/T3717.stderr
+++ b/tests/simplCore/should_compile/T3717.stderr
@@ -4,7 +4,7 @@ Result size of Tidy Core = {terms: 19, types: 10, coercions: 0}
Rec {
T3717.$wfoo [Occ=LoopBreaker] :: GHC.Prim.Int# -> GHC.Prim.Int#
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType L]
+[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,U>]
T3717.$wfoo =
\ (ww :: GHC.Prim.Int#) ->
case ww of ds {
@@ -17,7 +17,7 @@ T3717.foo [InlPrag=INLINE[0]] :: GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType U(L)m,
+ Str=DmdType <S(S),U(U)>m,
Unf=Unf{Src=Worker=T3717.$wfoo, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/simplCore/should_compile/T3772.stdout b/tests/simplCore/should_compile/T3772.stdout
index 1366559..4f4d600 100644
--- a/tests/simplCore/should_compile/T3772.stdout
+++ b/tests/simplCore/should_compile/T3772.stdout
@@ -4,7 +4,7 @@ Result size of Tidy Core = {terms: 23, types: 10, coercions: 0}
Rec {
xs :: GHC.Prim.Int# -> ()
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType L]
+[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <L,U>]
xs =
\ (m :: GHC.Prim.Int#) ->
case GHC.Prim.<=# m 1 of _ {
@@ -14,7 +14,7 @@ xs =
end Rec }
T3772.foo [InlPrag=NOINLINE] :: GHC.Types.Int -> ()
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType U(L)]
+[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,U(U)>]
T3772.foo =
\ (n :: GHC.Types.Int) ->
case n of _ { GHC.Types.I# n# ->
diff --git a/tests/simplCore/should_compile/T4908.stderr b/tests/simplCore/should_compile/T4908.stderr
index 4f2c5f2..8f6952b 100644
--- a/tests/simplCore/should_compile/T4908.stderr
+++ b/tests/simplCore/should_compile/T4908.stderr
@@ -6,7 +6,7 @@ Rec {
T4908.f_$s$wf [Occ=LoopBreaker]
:: GHC.Prim.Int#
-> GHC.Types.Int -> GHC.Prim.Int# -> GHC.Types.Bool
-[GblId, Arity=3, Caf=NoCafRefs, Str=DmdType LLL]
+[GblId, Arity=3, Caf=NoCafRefs, Str=DmdType <S,U><L,U><L,U>]
T4908.f_$s$wf =
\ (sc :: GHC.Prim.Int#)
(sc1 :: GHC.Types.Int)
@@ -27,7 +27,7 @@ T4908.$wf
[GblId,
Arity=2,
Caf=NoCafRefs,
- Str=DmdType LL,
+ Str=DmdType <S,U><L,U(UU(U))>,
Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=2, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=IF_ARGS [30 20] 101 20}]
@@ -52,7 +52,7 @@ T4908.f [InlPrag=INLINE[0]]
[GblId,
Arity=2,
Caf=NoCafRefs,
- Str=DmdType U(L)L,
+ Str=DmdType <S(S),U(U)><L,U(UU(U))>,
Unf=Unf{Src=Worker=T4908.$wf, TopLvl=True, Arity=2, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/simplCore/should_compile/T4930.stderr b/tests/simplCore/should_compile/T4930.stderr
index 61c2f5a..fd3b72d 100644
--- a/tests/simplCore/should_compile/T4930.stderr
+++ b/tests/simplCore/should_compile/T4930.stderr
@@ -3,7 +3,7 @@
Result size of Tidy Core = {terms: 20, types: 10, coercions: 0}
lvl :: [GHC.Types.Char]
-[GblId]
+[GblId, Str=DmdType]
lvl = GHC.CString.unpackCString# "Too small"#
T4930.foo1 :: GHC.Types.Int
@@ -13,7 +13,7 @@ T4930.foo1 = GHC.Err.error @ GHC.Types.Int lvl
T4930.foo :: GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=1,
- Str=DmdType U(L)m,
+ Str=DmdType <S,U(U)>m,
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/simplCore/should_compile/T7360.stderr b/tests/simplCore/should_compile/T7360.stderr
index 0c5bb89..f8d0e91 100644
--- a/tests/simplCore/should_compile/T7360.stderr
+++ b/tests/simplCore/should_compile/T7360.stderr
@@ -6,7 +6,7 @@ T7360.$WFoo3 [InlPrag=INLINE] :: GHC.Types.Int -> T7360.Foo
[GblId[DataConWrapper],
Arity=1,
Caf=NoCafRefs,
- Str=DmdType S,
+ Str=DmdType <S,U>,
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=False,boring_ok=False)
@@ -17,7 +17,7 @@ T7360.$WFoo3 =
case dt of dt { __DEFAULT -> T7360.Foo3 dt }
T7360.fun1 [InlPrag=NOINLINE] :: T7360.Foo -> ()
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType S]
+[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,U>]
T7360.fun1 =
\ (x :: T7360.Foo) -> case x of _ { __DEFAULT -> GHC.Tuple.() }
@@ -32,7 +32,7 @@ T7360.fun3 = T7360.fun1 T7360.Foo1
T7360.fun2 :: forall a. [a] -> ((), GHC.Types.Int)
[GblId,
Arity=1,
- Str=DmdType Lm,
+ Str=DmdType <L,U>m,
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/simplCore/should_compile/spec-inline.stderr b/tests/simplCore/should_compile/spec-inline.stderr
index 2cff9e3..0d7172d 100644
--- a/tests/simplCore/should_compile/spec-inline.stderr
+++ b/tests/simplCore/should_compile/spec-inline.stderr
@@ -11,11 +11,11 @@ Roman.foo3 =
Rec {
Roman.foo_$s$wgo [Occ=LoopBreaker]
:: GHC.Prim.Int# -> GHC.Prim.Int# -> GHC.Prim.Int#
-[GblId, Arity=2, Caf=NoCafRefs, Str=DmdType LL]
+[GblId, Arity=2, Caf=NoCafRefs, Str=DmdType <L,U><L,U>]
Roman.foo_$s$wgo =
\ (sc :: GHC.Prim.Int#) (sc1 :: GHC.Prim.Int#) ->
let {
- a [Dmd=Just L] :: GHC.Prim.Int#
+ a :: GHC.Prim.Int#
[LclId, Str=DmdType]
a =
GHC.Prim.+#
@@ -44,7 +44,7 @@ Roman.$wgo
-> Data.Maybe.Maybe GHC.Types.Int -> GHC.Prim.Int#
[GblId,
Arity=2,
- Str=DmdType SS,
+ Str=DmdType <S,U><S,U>,
Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=2, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=IF_ARGS [60 30] 253 0}]
@@ -56,7 +56,7 @@ Roman.$wgo =
Data.Maybe.Just x ->
case x of _ { GHC.Types.I# ipv ->
let {
- a [Dmd=Just L] :: GHC.Prim.Int#
+ a :: GHC.Prim.Int#
[LclId, Str=DmdType]
a =
GHC.Prim.+#
@@ -92,7 +92,7 @@ Roman.foo_go [InlPrag=INLINE[0]]
-> Data.Maybe.Maybe GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=2,
- Str=DmdType SSm,
+ Str=DmdType <S,U><S,U>m,
Unf=Unf{Src=Worker=Roman.$wgo, TopLvl=True, Arity=2, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
@@ -126,7 +126,7 @@ Roman.foo :: GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType S(A)m,
+ Str=DmdType <S,U>m,
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
More information about the ghc-commits
mailing list