Do not print DmdType in Core output

too verbose, and usualy preceded by Str= anyways.

compiler/basicTypes/Demand.hs

@@ -1239,8 +1239,7 @@ bothDmdType (DmdType fv1 ds1 r1) (fv2, t2)
 
 instance Outputable DmdType where
   ppr (DmdType fv ds res)
-    = hsep [text "DmdType",
-            hcat (map ppr ds) <> ppr res,
+    = hsep [hcat (map ppr ds) <> ppr res,
             if null fv_elts then empty
             else braces (fsep (map pp_elt fv_elts))]
     where

testsuite/tests/deSugar/should_compile/T2431.stderr

@@ -6,7 +6,7 @@ Result size of Tidy Core = {terms: 36, types: 30, coercions: 1}
 T2431.$WRefl [InlPrag=INLINE] :: forall a. a :~: a
 [GblId[DataConWrapper],
  Caf=NoCafRefs,
- Str=DmdType m,
+ Str=m,
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=0,unsat_ok=False,boring_ok=False)
@@ -18,32 +18,32 @@ T2431.$WRefl =
 
 -- RHS size: {terms: 4, types: 8, coercions: 0}
 absurd :: forall a. Int :~: Bool -> a
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <L,U>x]
+[GblId, Arity=1, Caf=NoCafRefs, Str=<L,U>x]
 absurd = \ (@ a) (x :: Int :~: Bool) -> case x of _ [Occ=Dead] { }
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 $trModule1 :: GHC.Types.TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 $trModule1 = GHC.Types.TrNameS "main"#
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 $trModule2 :: GHC.Types.TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 $trModule2 = GHC.Types.TrNameS "T2431"#
 
 -- RHS size: {terms: 3, types: 0, coercions: 0}
 T2431.$trModule :: GHC.Types.Module
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 T2431.$trModule = GHC.Types.Module $trModule1 $trModule2
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 $tc'Refl1 :: GHC.Types.TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 $tc'Refl1 = GHC.Types.TrNameS "'Refl"#
 
 -- RHS size: {terms: 5, types: 0, coercions: 0}
 T2431.$tc'Refl :: GHC.Types.TyCon
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 T2431.$tc'Refl =
   GHC.Types.TyCon
     15026191172322750497##
@@ -53,12 +53,12 @@ T2431.$tc'Refl =
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 $tc:~:1 :: GHC.Types.TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 $tc:~:1 = GHC.Types.TrNameS ":~:"#
 
 -- RHS size: {terms: 5, types: 0, coercions: 0}
 T2431.$tc:~: :: GHC.Types.TyCon
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 T2431.$tc:~: =
   GHC.Types.TyCon
     9759653149176674453##

testsuite/tests/determinism/should_compile/determ004.hs

@@ -46,7 +46,7 @@ $s$wsFoldr1_szbtK
              (Let1627448493XsSym4 x_azbOM m_azbFg ipv_szbwN ipv_szbwO))
 [LclId,
  Arity=4,
- Str=DmdType <L,U><L,U><L,U><C(S(C(S))),C(U(1*C1(U)))>]
+ Str=<L,U><L,U><L,U><C(S(C(S))),C(U(1*C1(U)))>]
 $s$wsFoldr1_szbtK =
   \ (@ (m_azbFg :: a_afdP_azbON))
     (@ (x_azbOM :: TyFun

testsuite/tests/determinism/simplCore/should_compile/spec-inline-determ.hs

@@ -8,7 +8,7 @@ module Roman where
 -- Compare:
 --
 --   $s$wgo_s1CN :: Int# -> Int -> Int#
---   [LclId, Arity=2, Str=DmdType <L,U><L,U>]
+--   [LclId, Arity=2, Str=<L,U><L,U>]
 --   $s$wgo_s1CN =
 --     \ (sc_s1CI :: Int#) (sc_s1CJ :: Int) ->
 --       case tagToEnum# @ Bool (<=# sc_s1CI 0#) of _ [Occ=Dead] {
@@ -20,7 +20,7 @@ module Roman where
 -- vs
 --
 --   $s$wgo_s18mTj :: Int -> Int# -> Int#
---   [LclId, Arity=2, Str=DmdType <L,U><L,U>]
+--   [LclId, Arity=2, Str=<L,U><L,U>]
 --   $s$wgo_s18mTj =
 --     \ (sc_s18mTn :: Int) (sc_s18mTo :: Int#) ->
 --       case tagToEnum# @ Bool (<=# sc_s18mTo 0#) of _ [Occ=Dead] {

testsuite/tests/numeric/should_compile/T7116.stdout

@@ -6,7 +6,7 @@ Result size of Tidy Core = {terms: 32, types: 17, coercions: 0}
 T7116.$trModule2 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}]
 T7116.$trModule2 = GHC.Types.TrNameS "main"#
@@ -15,7 +15,7 @@ T7116.$trModule2 = GHC.Types.TrNameS "main"#
 T7116.$trModule1 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}]
 T7116.$trModule1 = GHC.Types.TrNameS "T7116"#
@@ -24,7 +24,7 @@ T7116.$trModule1 = GHC.Types.TrNameS "T7116"#
 T7116.$trModule :: GHC.Types.Module
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m,
+ Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
 T7116.$trModule =
@@ -35,7 +35,7 @@ dr :: Double -> Double
 [GblId,
  Arity=1,
  Caf=NoCafRefs,
- Str=DmdType <S(S),1*U(U)>m,
+ Str=<S(S),1*U(U)>m,
  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)
@@ -54,7 +54,7 @@ dl :: Double -> Double
 [GblId,
  Arity=1,
  Caf=NoCafRefs,
- Str=DmdType <S(S),1*U(U)>m,
+ Str=<S(S),1*U(U)>m,
  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)
@@ -69,7 +69,7 @@ fr :: Float -> Float
 [GblId,
  Arity=1,
  Caf=NoCafRefs,
- Str=DmdType <S(S),1*U(U)>m,
+ Str=<S(S),1*U(U)>m,
  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)
@@ -88,7 +88,7 @@ fl :: Float -> Float
 [GblId,
  Arity=1,
  Caf=NoCafRefs,
- Str=DmdType <S(S),1*U(U)>m,
+ Str=<S(S),1*U(U)>m,
  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)

testsuite/tests/perf/should_run/T4267.hs

@@ -9,7 +9,7 @@ Bad:
 Rec {
 go_r1us
   :: GHC.Types.Int -> Main.Tree GHC.Types.Int -> GHC.Types.Int
-[GblId, Arity=2, Caf=NoCafRefs, Str=DmdType SS]
+[GblId, Arity=2, Caf=NoCafRefs, Str=SS]
 go_r1us =
   \ (z_aeS :: GHC.Types.Int) (ds_dmD :: Main.Tree GHC.Types.Int) ->
     case ds_dmD of _ {
@@ -29,7 +29,7 @@ Good:
 Rec {
 $wgo_r2fS
   :: GHC.Prim.Int# -> Main.Tree GHC.Types.Int -> GHC.Prim.Int#
-[GblId, Arity=2, Caf=NoCafRefs, Str=DmdType <L,U><S,1*U>]
+[GblId, Arity=2, Caf=NoCafRefs, Str=<L,U><S,1*U>]
 $wgo_r2fS =
   \ (ww_s2eZ :: GHC.Prim.Int#) (w_s2eW :: Main.Tree GHC.Types.Int) ->
     case w_s2eW of _ [Occ=Dead] {

testsuite/tests/perf/should_run/T5949.hs

@@ -9,7 +9,7 @@ Rec {
 $we_r1z8
   :: (GHC.Types.Int, GHC.Types.Int)
      -> GHC.Prim.Int# -> (# GHC.Types.Int, GHC.Types.Int #)
-[GblId, Arity=2, Caf=NoCafRefs, Str=DmdType S(AA)L]
+[GblId, Arity=2, Caf=NoCafRefs, Str=S(AA)L]
 $we_r1z8 =
   \ (w_s1yf :: (GHC.Types.Int, GHC.Types.Int))
     (ww_s1yi :: GHC.Prim.Int#) ->
@@ -30,7 +30,7 @@ $we_r2qK
      -> GHC.Types.Int
      -> GHC.Prim.Int#
      -> (# GHC.Types.Int, GHC.Types.Int #)
-[GblId, Arity=3, Caf=NoCafRefs, Str=DmdType <L,U><L,U><L,U>]
+[GblId, Arity=3, Caf=NoCafRefs, Str=<L,U><L,U><L,U>]
 $we_r2qK =
   \ (ww_s2pS :: GHC.Types.Int)
     (ww1_s2pT :: GHC.Types.Int)

testsuite/tests/roles/should_compile/Roles13.stderr

@@ -4,12 +4,12 @@ Result size of Tidy Core = {terms: 51, types: 20, coercions: 5}
 
 -- RHS size: {terms: 2, types: 2, coercions: 0}
 convert1 :: Wrap Age -> Wrap Age
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType]
+[GblId, Arity=1, Caf=NoCafRefs]
 convert1 = \ (ds :: Wrap Age) -> ds
 
 -- RHS size: {terms: 1, types: 0, coercions: 5}
 convert :: Wrap Age -> Int
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType]
+[GblId, Arity=1, Caf=NoCafRefs]
 convert =
   convert1
   `cast` (<Wrap Age>_R -> Roles13.N:Wrap[0] Roles13.N:Age[0]
@@ -17,27 +17,27 @@ convert =
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 $trModule1 :: GHC.Types.TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 $trModule1 = GHC.Types.TrNameS "main"#
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 $trModule2 :: GHC.Types.TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 $trModule2 = GHC.Types.TrNameS "Roles13"#
 
 -- RHS size: {terms: 3, types: 0, coercions: 0}
 Roles13.$trModule :: GHC.Types.Module
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 Roles13.$trModule = GHC.Types.Module $trModule1 $trModule2
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 $tc'MkAge1 :: GHC.Types.TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 $tc'MkAge1 = GHC.Types.TrNameS "'MkAge"#
 
 -- RHS size: {terms: 5, types: 0, coercions: 0}
 Roles13.$tc'MkAge :: GHC.Types.TyCon
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 Roles13.$tc'MkAge =
   GHC.Types.TyCon
     1226019810264079099##
@@ -47,12 +47,12 @@ Roles13.$tc'MkAge =
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 $tcAge1 :: GHC.Types.TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 $tcAge1 = GHC.Types.TrNameS "Age"#
 
 -- RHS size: {terms: 5, types: 0, coercions: 0}
 Roles13.$tcAge :: GHC.Types.TyCon
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 Roles13.$tcAge =
   GHC.Types.TyCon
     18304088376370610314##
@@ -62,12 +62,12 @@ Roles13.$tcAge =
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 $tc'MkWrap1 :: GHC.Types.TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 $tc'MkWrap1 = GHC.Types.TrNameS "'MkWrap"#
 
 -- RHS size: {terms: 5, types: 0, coercions: 0}
 Roles13.$tc'MkWrap :: GHC.Types.TyCon
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 Roles13.$tc'MkWrap =
   GHC.Types.TyCon
     12402878715225676312##
@@ -77,12 +77,12 @@ Roles13.$tc'MkWrap =
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 $tcWrap1 :: GHC.Types.TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 $tcWrap1 = GHC.Types.TrNameS "Wrap"#
 
 -- RHS size: {terms: 5, types: 0, coercions: 0}
 Roles13.$tcWrap :: GHC.Types.TyCon
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 Roles13.$tcWrap =
   GHC.Types.TyCon
     5278920226786541118##

testsuite/tests/roles/should_compile/T8958.stderr

@@ -65,7 +65,6 @@ AbsBinds [a] []
    Exported types: T8958.$fRepresentationala [InlPrag=[ALWAYS] CONLIKE]
                      :: forall a. Representational a
                    [LclIdX[DFunId],
-                    Str=DmdType,
                     Unf=DFun: \ (@ a[ssk]) -> T8958.C:Representational TYPE: a[ssk]]
    Binds: $dRepresentational = T8958.C:Representational @ a
    Evidence: [EvBinds{}]}
@@ -75,7 +74,6 @@ AbsBinds [a] []
    Exported types: T8958.$fNominala [InlPrag=[ALWAYS] CONLIKE]
                      :: forall a. Nominal a
                    [LclIdX[DFunId],
-                    Str=DmdType,
                     Unf=DFun: \ (@ a[ssk]) -> T8958.C:Nominal TYPE: a[ssk]]
    Binds: $dNominal = T8958.C:Nominal @ a
    Evidence: [EvBinds{}]}

testsuite/tests/simplCore/should_compile/T3717.stderr

@@ -6,7 +6,7 @@ Result size of Tidy Core = {terms: 32, types: 13, coercions: 0}
 T3717.$trModule2 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}]
 T3717.$trModule2 = GHC.Types.TrNameS "main"#
@@ -15,7 +15,7 @@ T3717.$trModule2 = GHC.Types.TrNameS "main"#
 T3717.$trModule1 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}]
 T3717.$trModule1 = GHC.Types.TrNameS "T3717"#
@@ -24,7 +24,7 @@ T3717.$trModule1 = GHC.Types.TrNameS "T3717"#
 T3717.$trModule :: GHC.Types.Module
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m,
+ Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
 T3717.$trModule =
@@ -34,7 +34,7 @@ Rec {
 -- RHS size: {terms: 10, types: 2, coercions: 0}
 T3717.$wfoo [InlPrag=[0], Occ=LoopBreaker]
   :: GHC.Prim.Int# -> GHC.Prim.Int#
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,1*U>]
+[GblId, Arity=1, Caf=NoCafRefs, Str=<S,1*U>]
 T3717.$wfoo =
   \ (ww :: GHC.Prim.Int#) ->
     case ww of ds {
@@ -48,7 +48,7 @@ foo [InlPrag=INLINE[0]] :: Int -> Int
 [GblId,
  Arity=1,
  Caf=NoCafRefs,
- Str=DmdType <S(S),1*U(1*U)>m,
+ Str=<S(S),1*U(1*U)>m,
  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)

testsuite/tests/simplCore/should_compile/T3772.stdout

@@ -5,7 +5,7 @@ Result size of Tidy Core = {terms: 36, types: 14, coercions: 0}
 Rec {
 -- RHS size: {terms: 10, types: 2, coercions: 0}
 $wxs :: GHC.Prim.Int# -> ()
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,1*U>]
+[GblId, Arity=1, Caf=NoCafRefs, Str=<S,1*U>]
 $wxs =
   \ (ww :: GHC.Prim.Int#) ->
     case ww of ds1 {
@@ -16,7 +16,7 @@ end Rec }
 
 -- RHS size: {terms: 14, types: 5, coercions: 0}
 foo [InlPrag=NOINLINE] :: Int -> ()
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S(S),1*U(U)>]
+[GblId, Arity=1, Caf=NoCafRefs, Str=<S(S),1*U(U)>]
 foo =
   \ (n :: Int) ->
     case n of _ [Occ=Dead] { GHC.Types.I# y ->
@@ -31,7 +31,7 @@ foo =
 T3772.$trModule1 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}]
 T3772.$trModule1 = GHC.Types.TrNameS "T3772"#
@@ -40,7 +40,7 @@ T3772.$trModule1 = GHC.Types.TrNameS "T3772"#
 T3772.$trModule2 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}]
 T3772.$trModule2 = GHC.Types.TrNameS "main"#
@@ -49,7 +49,7 @@ T3772.$trModule2 = GHC.Types.TrNameS "main"#
 T3772.$trModule :: GHC.Types.Module
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m,
+ Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
 T3772.$trModule =

testsuite/tests/simplCore/should_compile/T4398.stderr

@@ -4,17 +4,17 @@ T4398.hs:6:11: warning:
       Orig bndrs: [a, $dOrd, x, y]
       Orig lhs: let {
                   $dEq :: Eq a
-                  [LclId, Str=DmdType]
+                  [LclId]
                   $dEq = GHC.Classes.$p1Ord @ a $dOrd } in
                 f @ a
                   ((\ ($dOrd :: Ord a) ->
                       let {
                         $dEq :: Eq a
-                        [LclId, Str=DmdType]
+                        [LclId]
                         $dEq = GHC.Classes.$p1Ord @ a $dOrd } in
                       let {
                         $dEq :: Eq a
-                        [LclId, Str=DmdType]
+                        [LclId]
                         $dEq = GHC.Classes.$p1Ord @ a $dOrd } in
                       x)
                      $dOrd)

testsuite/tests/simplCore/should_compile/T4908.stderr

@@ -6,7 +6,7 @@ Result size of Tidy Core = {terms: 64, types: 41, coercions: 0}
 T4908.$trModule2 :: TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}]
 T4908.$trModule2 = GHC.Types.TrNameS "main"#
@@ -15,7 +15,7 @@ T4908.$trModule2 = GHC.Types.TrNameS "main"#
 T4908.$trModule1 :: TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}]
 T4908.$trModule1 = GHC.Types.TrNameS "T4908"#
@@ -24,7 +24,7 @@ T4908.$trModule1 = GHC.Types.TrNameS "T4908"#
 T4908.$trModule :: Module
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m,
+ Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
 T4908.$trModule =
@@ -33,7 +33,7 @@ T4908.$trModule =
 Rec {
 -- RHS size: {terms: 19, types: 5, coercions: 0}
 T4908.f_$s$wf [Occ=LoopBreaker] :: Int -> Int# -> Int# -> Bool
-[GblId, Arity=3, Caf=NoCafRefs, Str=DmdType <L,A><L,U><S,1*U>]
+[GblId, Arity=3, Caf=NoCafRefs, Str=<L,A><L,U><S,1*U>]
 T4908.f_$s$wf =
   \ (sc :: Int) (sc1 :: Int#) (sc2 :: Int#) ->
     case sc2 of ds {
@@ -51,7 +51,7 @@ T4908.$wf [InlPrag=[0]] :: Int# -> (Int, Int) -> Bool
 [GblId,
  Arity=2,
  Caf=NoCafRefs,
- Str=DmdType <S,1*U><L,1*U(A,U(U))>,
+ Str=<S,1*U><L,1*U(A,U(U))>,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [30 20] 101 20}]
 T4908.$wf =
@@ -74,7 +74,7 @@ f [InlPrag=INLINE[0]] :: Int -> (Int, Int) -> Bool
 [GblId,
  Arity=2,
  Caf=NoCafRefs,
- Str=DmdType <S(S),1*U(1*U)><L,1*U(A,U(U))>,
+ Str=<S(S),1*U(1*U)><L,1*U(A,U(U))>,
  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)

testsuite/tests/simplCore/should_compile/T4930.stderr

@@ -6,7 +6,7 @@ Result size of Tidy Core = {terms: 45, types: 17, coercions: 0}
 T4930.$trModule2 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}]
 T4930.$trModule2 = GHC.Types.TrNameS "main"#
@@ -15,7 +15,7 @@ T4930.$trModule2 = GHC.Types.TrNameS "main"#
 T4930.$trModule1 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}]
 T4930.$trModule1 = GHC.Types.TrNameS "T4930"#
@@ -24,7 +24,7 @@ T4930.$trModule1 = GHC.Types.TrNameS "T4930"#
 T4930.$trModule :: GHC.Types.Module
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m,
+ Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
 T4930.$trModule =
@@ -34,7 +34,7 @@ Rec {
 -- RHS size: {terms: 23, types: 6, coercions: 0}
 T4930.$wfoo [InlPrag=[0], Occ=LoopBreaker]
   :: GHC.Prim.Int# -> GHC.Prim.Int#
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,U>]
+[GblId, Arity=1, Caf=NoCafRefs, Str=<S,U>]
 T4930.$wfoo =
   \ (ww :: GHC.Prim.Int#) ->
     case case GHC.Prim.tagToEnum# @ Bool (GHC.Prim.<# ww 5#)
@@ -53,7 +53,7 @@ foo [InlPrag=INLINE[0]] :: Int -> Int
 [GblId,
  Arity=1,
  Caf=NoCafRefs,
- Str=DmdType <S(S),1*U(U)>m,
+ Str=<S(S),1*U(U)>m,
  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)

testsuite/tests/simplCore/should_compile/T7360.stderr

@@ -7,7 +7,7 @@ T7360.$WFoo3 [InlPrag=INLINE] :: Int -> Foo
 [GblId[DataConWrapper],
  Arity=1,
  Caf=NoCafRefs,
- Str=DmdType <S,U>m3,
+ Str=<S,U>m3,
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=1,unsat_ok=False,boring_ok=False)
@@ -23,7 +23,7 @@ T7360.$WFoo3 =
 
 -- RHS size: {terms: 5, types: 2, coercions: 0}
 fun1 [InlPrag=NOINLINE] :: Foo -> ()
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,1*U>]
+[GblId, Arity=1, Caf=NoCafRefs, Str=<S,1*U>]
 fun1 =
   \ (x :: Foo) ->
     case x of _ [Occ=Dead] { __DEFAULT -> GHC.Tuple.() }
@@ -31,7 +31,6 @@ fun1 =
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 T7360.fun5 :: ()
 [GblId,
- Str=DmdType,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=False, ConLike=False,
          WorkFree=False, Expandable=False, Guidance=IF_ARGS [] 20 0}]
 T7360.fun5 = fun1 T7360.Foo1
@@ -40,7 +39,7 @@ T7360.fun5 = fun1 T7360.Foo1
 T7360.fun4 :: Int
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m,
+ Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 20}]
 T7360.fun4 = GHC.Types.I# 0#
@@ -49,7 +48,7 @@ T7360.fun4 = GHC.Types.I# 0#
 fun2 :: forall a. [a] -> ((), Int)
 [GblId,
  Arity=1,
- Str=DmdType <L,1*U>m,
+ Str=<L,1*U>m,
  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)
@@ -77,7 +76,7 @@ fun2 =
 T7360.$trModule2 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}]
 T7360.$trModule2 = GHC.Types.TrNameS "main"#
@@ -86,7 +85,7 @@ T7360.$trModule2 = GHC.Types.TrNameS "main"#
 T7360.$trModule1 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}]
 T7360.$trModule1 = GHC.Types.TrNameS "T7360"#
@@ -95,7 +94,7 @@ T7360.$trModule1 = GHC.Types.TrNameS "T7360"#
 T7360.$trModule :: GHC.Types.Module
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m,
+ Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
 T7360.$trModule =
@@ -105,7 +104,7 @@ T7360.$trModule =
 T7360.$tc'Foo6 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}]
 T7360.$tc'Foo6 = GHC.Types.TrNameS "'Foo3"#
@@ -114,7 +113,7 @@ T7360.$tc'Foo6 = GHC.Types.TrNameS "'Foo3"#
 T7360.$tc'Foo3 :: GHC.Types.TyCon
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m,
+ Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 50}]
 T7360.$tc'Foo3 =
@@ -128,7 +127,7 @@ T7360.$tc'Foo3 =
 T7360.$tc'Foo5 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}]
 T7360.$tc'Foo5 = GHC.Types.TrNameS "'Foo2"#
@@ -137,7 +136,7 @@ T7360.$tc'Foo5 = GHC.Types.TrNameS "'Foo2"#
 T7360.$tc'Foo2 :: GHC.Types.TyCon
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m,
+ Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 50}]
 T7360.$tc'Foo2 =
@@ -151,7 +150,7 @@ T7360.$tc'Foo2 =
 T7360.$tc'Foo4 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}]
 T7360.$tc'Foo4 = GHC.Types.TrNameS "'Foo1"#
@@ -160,7 +159,7 @@ T7360.$tc'Foo4 = GHC.Types.TrNameS "'Foo1"#
 T7360.$tc'Foo1 :: GHC.Types.TyCon
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m,
+ Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 50}]
 T7360.$tc'Foo1 =
@@ -174,7 +173,7 @@ T7360.$tc'Foo1 =
 T7360.$tcFoo1 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m1,
+ Str=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}]
 T7360.$tcFoo1 = GHC.Types.TrNameS "Foo"#
@@ -183,7 +182,7 @@ T7360.$tcFoo1 = GHC.Types.TrNameS "Foo"#
 T7360.$tcFoo :: GHC.Types.TyCon
 [GblId,
  Caf=NoCafRefs,
- Str=DmdType m,
+ Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 50}]
 T7360.$tcFoo =

testsuite/tests/simplCore/should_compile/T9400.stderr

@@ -4,22 +4,22 @@ Result size of Tidy Core = {terms: 33, types: 20, coercions: 0}
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 $trModule1 :: TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 $trModule1 = GHC.Types.TrNameS "main"#
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
 $trModule2 :: TrName
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 $trModule2 = GHC.Types.TrNameS "T9400"#
 
 -- RHS size: {terms: 3, types: 0, coercions: 0}
 T9400.$trModule :: Module
-[GblId, Caf=NoCafRefs, Str=DmdType]
+[GblId, Caf=NoCafRefs]
 T9400.$trModule = GHC.Types.Module $trModule1 $trModule2
 
 -- RHS size: {terms: 22, types: 15, coercions: 0}
 main :: IO ()
-[GblId, Str=DmdType]