[Git][ghc/ghc][wip/T17676] Accept a bunch of testcase changes
Sebastian Graf
gitlab at gitlab.haskell.org
Thu Mar 19 17:30:31 UTC 2020
Sebastian Graf pushed to branch wip/T17676 at Glasgow Haskell Compiler / GHC
Commits:
1f0861c1 by Sebastian Graf at 2020-03-19T17:30:20Z
Accept a bunch of testcase changes
- - - - -
12 changed files:
- testsuite/tests/stranal/should_compile/T10694.stderr
- testsuite/tests/stranal/sigs/BottomFromInnerLambda.stderr
- testsuite/tests/stranal/sigs/CaseBinderCPR.stderr
- testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr
- testsuite/tests/stranal/sigs/HyperStrUse.stderr
- testsuite/tests/stranal/sigs/NewtypeArity.stderr
- testsuite/tests/stranal/sigs/StrAnalExample.stderr
- testsuite/tests/stranal/sigs/T12370.stderr
- testsuite/tests/stranal/sigs/T5075.stderr
- testsuite/tests/stranal/sigs/T8569.stderr
- testsuite/tests/stranal/sigs/T8598.stderr
- testsuite/tests/stranal/sigs/UnsatFun.stderr
Changes:
=====================================
testsuite/tests/stranal/should_compile/T10694.stderr
=====================================
@@ -4,72 +4,78 @@ Result size of Tidy Core = {terms: 74, types: 65, coercions: 0, joins: 0/4}
-- RHS size: {terms: 39, types: 25, coercions: 0, joins: 0/4}
T10694.$wpm [InlPrag=NOINLINE] :: Int -> Int -> (# Int, Int #)
-[GblId, Arity=2, Str=<L,U(U)><L,U(U)>, Unf=OtherCon []]
+[GblId, Arity=2, Str=<L,U(U)><L,U(U)>c, Unf=OtherCon []]
T10694.$wpm
- = \ (w_s1vj :: Int) (w1_s1vk :: Int) ->
+ = \ (w_s1vi :: Int) (w1_s1vj :: Int) ->
let {
- l_s1uR :: Int
+ l_s1uQ :: Int
[LclId]
- l_s1uR
- = case w_s1vj of { GHC.Types.I# x_aJ9 -> case w1_s1vk of { GHC.Types.I# y_aJc -> GHC.Types.I# (GHC.Prim.+# x_aJ9 y_aJc) } } } in
+ l_s1uQ
+ = case w_s1vi of { GHC.Types.I# x_aJ8 -> case w1_s1vj of { GHC.Types.I# y_aJb -> GHC.Types.I# (GHC.Prim.+# x_aJ8 y_aJb) } } } in
let {
- l1_s1uS :: Int
+ l1_s1uR :: Int
[LclId]
- l1_s1uS
- = case w_s1vj of { GHC.Types.I# x_aJh -> case w1_s1vk of { GHC.Types.I# y_aJk -> GHC.Types.I# (GHC.Prim.-# x_aJh y_aJk) } } } in
+ l1_s1uR
+ = case w_s1vi of { GHC.Types.I# x_aJg -> case w1_s1vj of { GHC.Types.I# y_aJj -> GHC.Types.I# (GHC.Prim.-# x_aJg y_aJj) } } } in
let {
- l2_s1uT :: [Int]
+ l2_s1uS :: [Int]
[LclId, Unf=OtherCon []]
- l2_s1uT = GHC.Types.: @Int l1_s1uS (GHC.Types.[] @Int) } in
+ l2_s1uS = GHC.Types.: @Int l1_s1uR (GHC.Types.[] @Int) } in
let {
- l3_sJv :: [Int]
+ l3_sJu :: [Int]
[LclId, Unf=OtherCon []]
- l3_sJv = GHC.Types.: @Int l_s1uR l2_s1uT } in
- (# GHC.List.$w!! @Int l3_sJv 0#, GHC.List.$w!! @Int l3_sJv 1# #)
+ l3_sJu = GHC.Types.: @Int l_s1uQ l2_s1uS } in
+ (# GHC.List.$w!! @Int l3_sJu 0#, GHC.List.$w!! @Int l3_sJu 1# #)
-- RHS size: {terms: 10, types: 11, coercions: 0, joins: 0/0}
pm [InlPrag=NOUSERINLINE[0]] :: Int -> Int -> (Int, Int)
[GblId,
Arity=2,
- Str=<L,U(U)><L,U(U)>,
+ Str=<L,U(U)><L,U(U)>c,
Cpr=m1,
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= \ (w_s1vj [Occ=Once] :: Int) (w1_s1vk [Occ=Once] :: Int) ->
- case T10694.$wpm w_s1vj w1_s1vk of { (# ww1_s1vp [Occ=Once], ww2_s1vq [Occ=Once] #) -> (ww1_s1vp, ww2_s1vq) }}]
-pm = \ (w_s1vj :: Int) (w1_s1vk :: Int) -> case T10694.$wpm w_s1vj w1_s1vk of { (# ww1_s1vp, ww2_s1vq #) -> (ww1_s1vp, ww2_s1vq) }
+ Tmpl= \ (w_s1vi [Occ=Once] :: Int) (w1_s1vj [Occ=Once] :: Int) ->
+ case T10694.$wpm w_s1vi w1_s1vj of { (# ww1_s1vo [Occ=Once], ww2_s1vp [Occ=Once] #) -> (ww1_s1vo, ww2_s1vp) }}]
+pm = \ (w_s1vi :: Int) (w1_s1vj :: Int) -> case T10694.$wpm w_s1vi w1_s1vj of { (# ww1_s1vo, ww2_s1vp #) -> (ww1_s1vo, ww2_s1vp) }
-- RHS size: {terms: 8, types: 9, coercions: 0, joins: 0/0}
m :: Int -> Int -> Int
[GblId,
Arity=2,
- Str=<L,U(U)><L,U(U)>,
+ Str=<L,U(U)><L,U(U)>c,
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= \ (x_awt [Occ=Once] :: Int) (y_awu [Occ=Once] :: Int) ->
- case pm x_awt y_awu of { (_ [Occ=Dead], mr_aww [Occ=Once]) -> mr_aww }}]
-m = \ (x_awt :: Int) (y_awu :: Int) -> case T10694.$wpm x_awt y_awu of { (# ww1_s1vp, ww2_s1vq #) -> ww2_s1vq }
+ Tmpl= \ (x_awv [Occ=Once] :: Int) (y_aww [Occ=Once] :: Int) ->
+ case pm x_awv y_aww of { (_ [Occ=Dead], mr_awy [Occ=Once]) -> mr_awy }}]
+m = \ (x_awv :: Int) (y_aww :: Int) -> case T10694.$wpm x_awv y_aww of { (# ww1_s1vo, ww2_s1vp #) -> ww2_s1vp }
-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
T10694.$trModule4 :: GHC.Prim.Addr#
-[GblId, Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 20 0}]
+[GblId,
+ Str=c,
+ Unf=Unf{Src=<vanilla>, 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,
+ Str=c,
Cpr=m1,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 20}]
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=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 0}]
+[GblId,
+ Str=c,
+ Unf=Unf{Src=<vanilla>, 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,
+ Str=c,
Cpr=m1,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 20}]
T10694.$trModule1 = GHC.Types.TrNameS T10694.$trModule2
@@ -77,6 +83,7 @@ T10694.$trModule1 = GHC.Types.TrNameS T10694.$trModule2
-- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
T10694.$trModule :: GHC.Types.Module
[GblId,
+ Str=c,
Cpr=m1,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
T10694.$trModule = GHC.Types.Module T10694.$trModule3 T10694.$trModule1
=====================================
testsuite/tests/stranal/sigs/BottomFromInnerLambda.stderr
=====================================
@@ -1,8 +1,8 @@
==================== Strictness signatures ====================
-BottomFromInnerLambda.$trModule:
-BottomFromInnerLambda.expensive: <S(S),1*U(U)>
-BottomFromInnerLambda.f: <S(S),1*U(U)>
+BottomFromInnerLambda.$trModule: c
+BottomFromInnerLambda.expensive: <S(S),1*U(U)>c
+BottomFromInnerLambda.f: <S(S),1*U(U)>c
@@ -14,8 +14,8 @@ BottomFromInnerLambda.f:
==================== Strictness signatures ====================
-BottomFromInnerLambda.$trModule:
-BottomFromInnerLambda.expensive: <S(S),1*U(1*U)>
-BottomFromInnerLambda.f: <S(S),1*U(1*U)>
+BottomFromInnerLambda.$trModule: c
+BottomFromInnerLambda.expensive: <S(S),1*U(1*U)>c
+BottomFromInnerLambda.f: <S(S),1*U(1*U)>c
=====================================
testsuite/tests/stranal/sigs/CaseBinderCPR.stderr
=====================================
@@ -1,7 +1,7 @@
==================== Strictness signatures ====================
-CaseBinderCPR.$trModule:
-CaseBinderCPR.f_list_cmp: <L,C(C1(U(U)))><S,1*U><S,1*U>
+CaseBinderCPR.$trModule: c
+CaseBinderCPR.f_list_cmp: <L,C(C1(U(U)))><S,1*U><S,1*U>c
@@ -12,7 +12,7 @@ CaseBinderCPR.f_list_cmp: m1
==================== Strictness signatures ====================
-CaseBinderCPR.$trModule:
-CaseBinderCPR.f_list_cmp: <L,C(C1(U(1*U)))><S,1*U><S,1*U>
+CaseBinderCPR.$trModule: c
+CaseBinderCPR.f_list_cmp: <L,C(C1(U(1*U)))><S,1*U><S,1*U>c
=====================================
testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr
=====================================
@@ -1,15 +1,15 @@
==================== Strictness signatures ====================
-DmdAnalGADTs.$tc'A:
-DmdAnalGADTs.$tc'B:
-DmdAnalGADTs.$tcD:
-DmdAnalGADTs.$trModule:
+DmdAnalGADTs.$tc'A: c
+DmdAnalGADTs.$tc'B: c
+DmdAnalGADTs.$tcD: c
+DmdAnalGADTs.$trModule: c
DmdAnalGADTs.diverges: b
DmdAnalGADTs.f: <S,1*U>
-DmdAnalGADTs.f': <S,1*U>
-DmdAnalGADTs.g: <S,1*U>
-DmdAnalGADTs.hasCPR:
-DmdAnalGADTs.hasStrSig: <S,1*U(U)>
+DmdAnalGADTs.f': <S,1*U>c
+DmdAnalGADTs.g: <S,1*U>c
+DmdAnalGADTs.hasCPR: c
+DmdAnalGADTs.hasStrSig: <S,1*U(U)>c
@@ -28,15 +28,15 @@ DmdAnalGADTs.hasStrSig: m1
==================== Strictness signatures ====================
-DmdAnalGADTs.$tc'A:
-DmdAnalGADTs.$tc'B:
-DmdAnalGADTs.$tcD:
-DmdAnalGADTs.$trModule:
+DmdAnalGADTs.$tc'A: c
+DmdAnalGADTs.$tc'B: c
+DmdAnalGADTs.$tcD: c
+DmdAnalGADTs.$trModule: c
DmdAnalGADTs.diverges: b
DmdAnalGADTs.f: <S,1*U>
-DmdAnalGADTs.f': <S,1*U>
-DmdAnalGADTs.g: <S,1*U>
-DmdAnalGADTs.hasCPR:
-DmdAnalGADTs.hasStrSig: <S,1*U(U)>
+DmdAnalGADTs.f': <S,1*U>c
+DmdAnalGADTs.g: <S,1*U>c
+DmdAnalGADTs.hasCPR: c
+DmdAnalGADTs.hasStrSig: <S,1*U(U)>c
=====================================
testsuite/tests/stranal/sigs/HyperStrUse.stderr
=====================================
@@ -1,7 +1,7 @@
==================== Strictness signatures ====================
-HyperStrUse.$trModule:
-HyperStrUse.f: <S(SL),1*U(1*U(U),A)><S,1*U>
+HyperStrUse.$trModule: c
+HyperStrUse.f: <S(SL),1*U(1*U(U),A)><S,1*U>c
@@ -12,7 +12,7 @@ HyperStrUse.f: m1
==================== Strictness signatures ====================
-HyperStrUse.$trModule:
-HyperStrUse.f: <S(SL),1*U(1*U(U),A)><S,1*U>
+HyperStrUse.$trModule: c
+HyperStrUse.f: <S(SL),1*U(1*U(U),A)><S,1*U>c
=====================================
testsuite/tests/stranal/sigs/NewtypeArity.stderr
=====================================
@@ -1,10 +1,10 @@
==================== Strictness signatures ====================
-Test.$tc'MkT:
-Test.$tcT:
-Test.$trModule:
-Test.t: <S,1*U(U)><S,1*U(U)>
-Test.t2: <S,1*U(U)><S,1*U(U)>
+Test.$tc'MkT: c
+Test.$tcT: c
+Test.$trModule: c
+Test.t: <S,1*U(U)><S,1*U(U)>c
+Test.t2: <S,1*U(U)><S,1*U(U)>c
@@ -18,10 +18,10 @@ Test.t2: m1
==================== Strictness signatures ====================
-Test.$tc'MkT:
-Test.$tcT:
-Test.$trModule:
-Test.t: <S,1*U(U)><S,1*U(U)>
-Test.t2: <S,1*U(U)><S,1*U(U)>
+Test.$tc'MkT: c
+Test.$tcT: c
+Test.$trModule: c
+Test.t: <S,1*U(U)><S,1*U(U)>c
+Test.t2: <S,1*U(U)><S,1*U(U)>c
=====================================
testsuite/tests/stranal/sigs/StrAnalExample.stderr
=====================================
@@ -1,7 +1,7 @@
==================== Strictness signatures ====================
-StrAnalExample.$trModule:
-StrAnalExample.foo: <S,1*U>
+StrAnalExample.$trModule: c
+StrAnalExample.foo: <S,1*U>c
@@ -12,7 +12,7 @@ StrAnalExample.foo:
==================== Strictness signatures ====================
-StrAnalExample.$trModule:
-StrAnalExample.foo: <S,1*U>
+StrAnalExample.$trModule: c
+StrAnalExample.foo: <S,1*U>c
=====================================
testsuite/tests/stranal/sigs/T12370.stderr
=====================================
@@ -1,8 +1,8 @@
==================== Strictness signatures ====================
-T12370.$trModule:
-T12370.bar: <S,1*U(U)><S,1*U(U)>
-T12370.foo: <S(SS),1*U(1*U(U),1*U(U))>
+T12370.$trModule: c
+T12370.bar: <S,1*U(U)><S,1*U(U)>c
+T12370.foo: <S(SS),1*U(1*U(U),1*U(U))>c
@@ -14,8 +14,8 @@ T12370.foo: m1
==================== Strictness signatures ====================
-T12370.$trModule:
-T12370.bar: <S,1*U(U)><S,1*U(U)>
-T12370.foo: <S(SS),1*U(1*U(U),1*U(U))>
+T12370.$trModule: c
+T12370.bar: <S,1*U(U)><S,1*U(U)>c
+T12370.foo: <S(SS),1*U(1*U(U),1*U(U))>c
=====================================
testsuite/tests/stranal/sigs/T5075.stderr
=====================================
@@ -1,7 +1,7 @@
==================== Strictness signatures ====================
-T5075.$trModule:
-T5075.loop: <S(LLC(C(S))LLLLL),U(A,A,C(C1(U)),A,A,A,A,A)><L,U(A,A,C(C1(U)),A,A,A,C(U))><L,U>
+T5075.$trModule: c
+T5075.loop: <S(LLC(C(S))LLLLL),U(A,A,C(C1(U)),A,A,A,A,A)><L,U(A,A,C(C1(U)),A,A,A,C(U))><L,U>c
@@ -12,7 +12,7 @@ T5075.loop:
==================== Strictness signatures ====================
-T5075.$trModule:
-T5075.loop: <S(LLC(C(S))LLLLL),1*U(A,A,C(C1(U)),A,A,A,A,A)><L,U(A,A,C(C1(U)),A,A,A,C(U))><L,U>
+T5075.$trModule: c
+T5075.loop: <S(LLC(C(S))LLLLL),1*U(A,A,C(C1(U)),A,A,A,A,A)><L,U(A,A,C(C1(U)),A,A,A,C(U))><L,U>c
=====================================
testsuite/tests/stranal/sigs/T8569.stderr
=====================================
@@ -1,10 +1,10 @@
==================== Strictness signatures ====================
-T8569.$tc'Rdata:
-T8569.$tc'Rint:
-T8569.$tcRep:
-T8569.$trModule:
-T8569.addUp: <S,1*U><L,U>
+T8569.$tc'Rdata: c
+T8569.$tc'Rint: c
+T8569.$tcRep: c
+T8569.$trModule: c
+T8569.addUp: <S,1*U><L,U>c
@@ -18,10 +18,10 @@ T8569.addUp:
==================== Strictness signatures ====================
-T8569.$tc'Rdata:
-T8569.$tc'Rint:
-T8569.$tcRep:
-T8569.$trModule:
-T8569.addUp: <S,1*U><L,U>
+T8569.$tc'Rdata: c
+T8569.$tc'Rint: c
+T8569.$tcRep: c
+T8569.$trModule: c
+T8569.addUp: <S,1*U><L,U>c
=====================================
testsuite/tests/stranal/sigs/T8598.stderr
=====================================
@@ -1,6 +1,6 @@
==================== Strictness signatures ====================
-T8598.$trModule:
+T8598.$trModule: c
T8598.fun: <S,1*U(U)>
@@ -12,7 +12,7 @@ T8598.fun: m1
==================== Strictness signatures ====================
-T8598.$trModule:
+T8598.$trModule: c
T8598.fun: <S,1*U(U)>
=====================================
testsuite/tests/stranal/sigs/UnsatFun.stderr
=====================================
@@ -1,13 +1,13 @@
==================== Strictness signatures ====================
-UnsatFun.$trModule:
+UnsatFun.$trModule: c
UnsatFun.f: <B,1*U(U)><B,A>b
UnsatFun.g: <B,1*U(U)>b
-UnsatFun.g': <L,1*U(U)>
-UnsatFun.g3: <L,U(U)>
-UnsatFun.h: <C(S),1*C1(U(U))>
-UnsatFun.h2: <S,1*U><L,1*C1(U(U))>
-UnsatFun.h3: <C(S),1*C1(U)>
+UnsatFun.g': <L,1*U(U)>c
+UnsatFun.g3: <L,U(U)>c
+UnsatFun.h: <C(S),1*C1(U(U))>c
+UnsatFun.h2: <S,1*U><L,1*C1(U(U))>c
+UnsatFun.h3: <C(S),1*C1(U)>c
@@ -24,13 +24,13 @@ UnsatFun.h3: m1
==================== Strictness signatures ====================
-UnsatFun.$trModule:
+UnsatFun.$trModule: c
UnsatFun.f: <B,1*U(U)><B,A>b
UnsatFun.g: <B,1*U(U)>b
-UnsatFun.g': <L,1*U(U)>
-UnsatFun.g3: <L,U(U)>
-UnsatFun.h: <C(S),1*C1(U(U))>
-UnsatFun.h2: <S,1*U><L,1*C1(U(U))>
-UnsatFun.h3: <C(S),1*C1(U)>
+UnsatFun.g': <L,1*U(U)>c
+UnsatFun.g3: <L,U(U)>c
+UnsatFun.h: <C(S),1*C1(U(U))>c
+UnsatFun.h2: <S,1*U><L,1*C1(U(U))>c
+UnsatFun.h3: <C(S),1*C1(U)>c
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/1f0861c187099ef136fd27b3140be2c836314bb4
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/1f0861c187099ef136fd27b3140be2c836314bb4
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200319/e66fc0f3/attachment-0001.html>
More information about the ghc-commits
mailing list