[commit: testsuite] wip/nested-cpr: Test output update: Nested CPR signatures (0d96c4d)
git at git.haskell.org
git at git.haskell.org
Tue Dec 3 18:10:35 UTC 2013
Repository : ssh://git@git.haskell.org/testsuite
On branch : wip/nested-cpr
Link : http://ghc.haskell.org/trac/ghc/changeset/0d96c4d842e132884b174cdf686fe0eb3d33703f/testsuite
>---------------------------------------------------------------
commit 0d96c4d842e132884b174cdf686fe0eb3d33703f
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Tue Dec 3 17:08:50 2013 +0000
Test output update: Nested CPR signatures
>---------------------------------------------------------------
0d96c4d842e132884b174cdf686fe0eb3d33703f
tests/numeric/should_compile/T7116.stdout | 8 ++++----
tests/simplCore/should_compile/T3717.stderr | 2 +-
tests/simplCore/should_compile/T4201.stdout | 2 +-
tests/simplCore/should_compile/T4930.stderr | 2 +-
tests/simplCore/should_compile/T7360.stderr | 8 ++++----
tests/simplCore/should_compile/spec-inline.stderr | 8 ++++----
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tests/numeric/should_compile/T7116.stdout b/tests/numeric/should_compile/T7116.stdout
index 549ed48..79b4bf3 100644
--- a/tests/numeric/should_compile/T7116.stdout
+++ b/tests/numeric/should_compile/T7116.stdout
@@ -6,7 +6,7 @@ T7116.dl :: GHC.Types.Double -> GHC.Types.Double
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S,1*U(U)>m,
+ Str=DmdType <S,1*U(U)>tm1(d),
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)
@@ -24,7 +24,7 @@ T7116.dr :: GHC.Types.Double -> GHC.Types.Double
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S,1*U(U)>m,
+ Str=DmdType <S,1*U(U)>tm1(d),
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)
@@ -38,7 +38,7 @@ T7116.fl :: GHC.Types.Float -> GHC.Types.Float
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S,1*U(U)>m,
+ Str=DmdType <S,1*U(U)>tm1(d),
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)
@@ -56,7 +56,7 @@ T7116.fr :: GHC.Types.Float -> GHC.Types.Float
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S,1*U(U)>m,
+ Str=DmdType <S,1*U(U)>tm1(d),
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/T3717.stderr b/tests/simplCore/should_compile/T3717.stderr
index 4522fb5..58f1349 100644
--- a/tests/simplCore/should_compile/T3717.stderr
+++ b/tests/simplCore/should_compile/T3717.stderr
@@ -17,7 +17,7 @@ T3717.foo [InlPrag=INLINE[0]] :: GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S(S),1*U(1*U)>m,
+ Str=DmdType <S(S),1*U(1*U)>dm1(d),
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/T4201.stdout b/tests/simplCore/should_compile/T4201.stdout
index ed519ed..622276d 100644
--- a/tests/simplCore/should_compile/T4201.stdout
+++ b/tests/simplCore/should_compile/T4201.stdout
@@ -1,3 +1,3 @@
- {- Arity: 1, HasNoCafRefs, Strictness: <S,1*U()>m,
+ {- Arity: 1, HasNoCafRefs, Strictness: <S,1*U()>tm1(),
Unfolding: InlineRule (0, True, True)
Eta.bof `cast` (Sym (Eta.NTCo:Foo[0]) ->_R <Eta.T>_R) -}
diff --git a/tests/simplCore/should_compile/T4930.stderr b/tests/simplCore/should_compile/T4930.stderr
index 9570b7b..e9f2965 100644
--- a/tests/simplCore/should_compile/T4930.stderr
+++ b/tests/simplCore/should_compile/T4930.stderr
@@ -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 <S,1*U(U)>m,
+ Str=DmdType <S,1*U(U)>dm1(d),
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 9a5896a..10a267e 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,U>m3,
+ Str=DmdType <S,U>tm3(d),
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)
@@ -21,7 +21,7 @@ T7360.$WFoo3 =
}
T7360.fun1 [InlPrag=NOINLINE] :: T7360.Foo -> ()
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,1*U>]
+[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,1*U>dm1()]
T7360.fun1 =
\ (x :: T7360.Foo) ->
case x of _ [Occ=Dead] { __DEFAULT -> GHC.Tuple.() }
@@ -37,7 +37,7 @@ T7360.fun4 = T7360.fun1 T7360.Foo1
T7360.fun3 :: GHC.Types.Int
[GblId,
Caf=NoCafRefs,
- Str=DmdType m,
+ Str=DmdType tm1(d),
Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=0, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=IF_ARGS [] 10 20}]
@@ -46,7 +46,7 @@ T7360.fun3 = GHC.Types.I# 0
T7360.fun2 :: forall a. [a] -> ((), GHC.Types.Int)
[GblId,
Arity=1,
- Str=DmdType <L,1*U>m,
+ Str=DmdType <L,1*U>tm1(d,d),
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 8690176..f931af3 100644
--- a/tests/simplCore/should_compile/spec-inline.stderr
+++ b/tests/simplCore/should_compile/spec-inline.stderr
@@ -98,7 +98,7 @@ Roman.foo_go [InlPrag=INLINE[0]]
-> Data.Maybe.Maybe GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=2,
- Str=DmdType <S,1*U><S,1*U>m,
+ Str=DmdType <S,1*U><S,1*U>dm1(d),
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=2, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
@@ -113,7 +113,7 @@ Roman.foo_go =
Roman.foo2 :: GHC.Types.Int
[GblId,
Caf=NoCafRefs,
- Str=DmdType m,
+ Str=DmdType tm1(d),
Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=0, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=IF_ARGS [] 10 20}]
@@ -122,7 +122,7 @@ Roman.foo2 = GHC.Types.I# 6
Roman.foo1 :: Data.Maybe.Maybe GHC.Types.Int
[GblId,
Caf=NoCafRefs,
- Str=DmdType m2,
+ Str=DmdType t,
Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=0, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=IF_ARGS [] 10 20}]
@@ -132,7 +132,7 @@ Roman.foo :: GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S,1*U>m,
+ Str=DmdType <S,1*U>dm1(d),
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