[commit: testsuite] wip/nested-cpr: More nested CPR test output (9daeda0)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/testsuite

On branch  : wip/nested-cpr
Link       : http://ghc.haskell.org/trac/ghc/changeset/9daeda021b359f4c11aed301a177254c6154c3eb/testsuite

>---------------------------------------------------------------

commit 9daeda021b359f4c11aed301a177254c6154c3eb
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Dec 6 18:03:53 2013 +0000

    More nested CPR test output


>---------------------------------------------------------------

9daeda021b359f4c11aed301a177254c6154c3eb
 tests/simplCore/should_compile/T3717.stderr       |    8 ++++----
 tests/simplCore/should_compile/T4908.stderr       |    6 +++---
 tests/simplCore/should_compile/T4918.stdout       |    4 ++--
 tests/simplCore/should_compile/spec-inline.stderr |    2 +-
 tests/stranal/sigs/HyperStrUse.hs                 |    2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/simplCore/should_compile/T3717.stderr b/tests/simplCore/should_compile/T3717.stderr
index 58f1349..753d081 100644
--- a/tests/simplCore/should_compile/T3717.stderr
+++ b/tests/simplCore/should_compile/T3717.stderr
@@ -22,13 +22,13 @@ T3717.foo [InlPrag=INLINE[0]] :: GHC.Types.Int -> GHC.Types.Int
          ConLike=True, WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
          Tmpl= \ (w [Occ=Once!] :: GHC.Types.Int) ->
-                 case w of _ [Occ=Dead] { GHC.Types.I# ww1 [Occ=Once] ->
-                 case T3717.$wfoo ww1 of ww2 { __DEFAULT -> GHC.Types.I# ww2 }
+                 case w of _ [Occ=Dead] { GHC.Types.I# ww [Occ=Once] ->
+                 case T3717.$wfoo ww of ww1 { __DEFAULT -> GHC.Types.I# ww1 }
                  }}]
 T3717.foo =
   \ (w :: GHC.Types.Int) ->
-    case w of _ [Occ=Dead] { GHC.Types.I# ww1 ->
-    case T3717.$wfoo ww1 of ww2 { __DEFAULT -> GHC.Types.I# ww2 }
+    case w of _ [Occ=Dead] { GHC.Types.I# ww ->
+    case T3717.$wfoo ww of ww1 { __DEFAULT -> GHC.Types.I# ww1 }
     }
 
 
diff --git a/tests/simplCore/should_compile/T4908.stderr b/tests/simplCore/should_compile/T4908.stderr
index 3acef2f..b1d74d8 100644
--- a/tests/simplCore/should_compile/T4908.stderr
+++ b/tests/simplCore/should_compile/T4908.stderr
@@ -58,12 +58,12 @@ T4908.f [InlPrag=INLINE[0]]
          Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
          Tmpl= \ (w [Occ=Once!] :: GHC.Types.Int)
                  (w1 [Occ=Once] :: (GHC.Types.Int, GHC.Types.Int)) ->
-                 case w of _ [Occ=Dead] { GHC.Types.I# ww1 [Occ=Once] ->
-                 T4908.$wf ww1 w1
+                 case w of _ [Occ=Dead] { GHC.Types.I# ww [Occ=Once] ->
+                 T4908.$wf ww w1
                  }}]
 T4908.f =
   \ (w :: GHC.Types.Int) (w1 :: (GHC.Types.Int, GHC.Types.Int)) ->
-    case w of _ [Occ=Dead] { GHC.Types.I# ww1 -> T4908.$wf ww1 w1 }
+    case w of _ [Occ=Dead] { GHC.Types.I# ww -> T4908.$wf ww w1 }
 
 
 ------ Local rules for imported ids --------
diff --git a/tests/simplCore/should_compile/T4918.stdout b/tests/simplCore/should_compile/T4918.stdout
index c79b116..cfffda7 100644
--- a/tests/simplCore/should_compile/T4918.stdout
+++ b/tests/simplCore/should_compile/T4918.stdout
@@ -1,2 +1,2 @@
-    {- HasNoCafRefs, Strictness: m, Unfolding: (GHC.Types.C# 'p') -}
-    {- HasNoCafRefs, Strictness: m, Unfolding: (GHC.Types.C# 'q') -}
+       Unfolding: (GHC.Types.C# 'p') -}
+       Unfolding: (GHC.Types.C# 'q') -}
diff --git a/tests/simplCore/should_compile/spec-inline.stderr b/tests/simplCore/should_compile/spec-inline.stderr
index f931af3..c0a7b58 100644
--- a/tests/simplCore/should_compile/spec-inline.stderr
+++ b/tests/simplCore/should_compile/spec-inline.stderr
@@ -122,7 +122,7 @@ Roman.foo2 = GHC.Types.I# 6
 Roman.foo1 :: Data.Maybe.Maybe GHC.Types.Int
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType t,
+ Str=DmdType tm2(tm1(d)),
  Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=0, Value=True,
          ConLike=True, WorkFree=True, Expandable=True,
          Guidance=IF_ARGS [] 10 20}]
diff --git a/tests/stranal/sigs/HyperStrUse.hs b/tests/stranal/sigs/HyperStrUse.hs
index 88ba3e3..6febf3d 100644
--- a/tests/stranal/sigs/HyperStrUse.hs
+++ b/tests/stranal/sigs/HyperStrUse.hs
@@ -6,4 +6,4 @@ import StrAnalAnnotation (StrAnal(StrAnal))
 f :: (Int, Int) -> Bool -> Int
 f (x,y) True = error (show x)
 f (x,y) False = x +1
-{-# ANN f (StrAnal "<S(SL),1*U(1*U(U),A)><S,1*U>m") #-}
+{-# ANN f (StrAnal "<S(SL),1*U(1*U(U),A)><S,1*U>dm1(d)") #-}