Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/b058b8fbaceddbd076f2d667040d06302f0322ce >--------------------------------------------------------------- commit b058b8fbaceddbd076f2d667040d06302f0322ce Merge: fe31370... 2c3d474... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Tue Jan 8 08:33:25 2013 +0000 Merge branch 'master' of http://darcs.haskell.org/testsuite Conflicts: tests/simplCore/should_compile/T7360.stderr driver/testlib.py | 6 +++++ tests/codeGen/should_run/Word2Float32.hs | 17 ++++++++++++++ tests/codeGen/should_run/Word2Float32.stdout | 4 +++ .../should_run/{Word2Float.hs => Word2Float64.hs} | 0 .../{Word2Float.stdout => Word2Float64.stdout} | 0 tests/codeGen/should_run/all.T | 3 +- tests/deSugar/should_compile/T2431.hs | 8 +++++++ tests/deSugar/should_compile/T2431.stderr | 23 ++++++++++++++++++++ tests/deSugar/should_compile/all.T | 1 + tests/driver/T4437.hs | 3 +- tests/generics/GenDerivOutput.stderr | 2 +- .../indexed-types/should_fail/SimpleFail2a.stderr | 8 +----- tests/indexed-types/should_fail/SimpleFail9.stderr | 3 +- tests/perf/should_run/T7436.hs | 22 +++++++++++++++++++ tests/perf/should_run/T7436.stdout | 1 + tests/perf/should_run/all.T | 9 +++++++ 16 files changed, 100 insertions(+), 10 deletions(-) diff --cc tests/simplCore/should_compile/T7360.stderr index 895a411,f7a7bcf..366a60e --- a/tests/simplCore/should_compile/T7360.stderr +++ b/tests/simplCore/should_compile/T7360.stderr @@@ -1,50 -1,53 +1,50 @@@ - - ==================== Tidy Core ==================== - Result size of Tidy Core = {terms: 25, types: 22, coercions: 0} - - T7360.$WFoo3 [InlPrag=INLINE] :: GHC.Types.Int -> T7360.Foo - [GblId[DataConWrapper], - Arity=1, - Caf=NoCafRefs, - Str=DmdType S, - 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) - Tmpl= \ (dt [Occ=Once] :: GHC.Types.Int) -> - case dt of dt { __DEFAULT -> T7360.Foo3 dt }}] - T7360.$WFoo3 = - \ (dt [Occ=Once] :: GHC.Types.Int) -> - case dt of dt { __DEFAULT -> T7360.Foo3 dt } - - T7360.fun1 [InlPrag=NOINLINE] :: T7360.Foo -> () - [GblId, Arity=1, Caf=NoCafRefs, Str=DmdType S] - T7360.fun1 = - \ (x :: T7360.Foo) -> case x of _ { __DEFAULT -> GHC.Tuple.() } - - T7360.fun3 :: () - [GblId, - Str=DmdType, - Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=0, Value=False, - ConLike=False, WorkFree=False, Expandable=False, - Guidance=IF_ARGS [] 20 0}] - T7360.fun3 = T7360.fun1 T7360.Foo1 - - T7360.fun2 :: forall a. [a] -> ((), GHC.Types.Int) - [GblId, - Arity=1, - Str=DmdType Lm, - 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) - Tmpl= \ (@ a) (x [Occ=Once] :: [a]) -> - (T7360.fun3, - case GHC.List.$wlen @ a x 0 of ww { __DEFAULT -> - GHC.Types.I# ww - })}] - T7360.fun2 = - \ (@ a) (x :: [a]) -> - (T7360.fun3, - case GHC.List.$wlen @ a x 0 of ww { __DEFAULT -> GHC.Types.I# ww }) - - - + + ==================== Tidy Core ==================== -Result size of Tidy Core = {terms: 22, types: 19, coercions: 0} ++Result size of Tidy Core = {terms: 25, types: 22, coercions: 0} + + T7360.$WFoo3 [InlPrag=INLINE] :: GHC.Types.Int -> T7360.Foo + [GblId[DataConWrapper], + Arity=1, + Caf=NoCafRefs, + Str=DmdType S, + 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) + Tmpl= \ (dt [Occ=Once] :: GHC.Types.Int) -> + case dt of dt { __DEFAULT -> T7360.Foo3 dt }}] + T7360.$WFoo3 = + \ (dt [Occ=Once] :: GHC.Types.Int) -> + case dt of dt { __DEFAULT -> T7360.Foo3 dt } + -T7360.fun1 :: T7360.Foo -> () -[GblId, - Arity=1, - Caf=NoCafRefs, - Str=DmdType S, - Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=1, Value=True, - ConLike=True, WorkFree=True, Expandable=True, - Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=True)}] ++T7360.fun1 [InlPrag=NOINLINE] :: T7360.Foo -> () ++[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType S] + T7360.fun1 = + \ (x :: T7360.Foo) -> case x of _ { __DEFAULT -> GHC.Tuple.() } + -T7360.fun2 :: forall a. [a] -> GHC.Types.Int ++T7360.fun3 :: () ++[GblId, ++ Str=DmdType, ++ Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=0, Value=False, ++ ConLike=False, WorkFree=False, Expandable=False, ++ Guidance=IF_ARGS [] 20 0}] ++T7360.fun3 = T7360.fun1 T7360.Foo1 ++ ++T7360.fun2 :: forall a. [a] -> ((), GHC.Types.Int) + [GblId, + Arity=1, - Caf=NoCafRefs, - Str=DmdType Sm, ++ Str=DmdType Lm, + 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) + Tmpl= \ (@ a) (x [Occ=Once] :: [a]) -> - case x of wild { __DEFAULT -> - case GHC.List.$wlen @ a wild 0 of ww { __DEFAULT -> - GHC.Types.I# ww - } - }}] ++ (T7360.fun3, ++ case GHC.List.$wlen @ a x 0 of ww { __DEFAULT -> ++ GHC.Types.I# ww ++ })}] + T7360.fun2 = + \ (@ a) (x :: [a]) -> - case x of wild { __DEFAULT -> - case GHC.List.$wlen @ a wild 0 of ww { __DEFAULT -> - GHC.Types.I# ww - } - } ++ (T7360.fun3, ++ case GHC.List.$wlen @ a x 0 of ww { __DEFAULT -> GHC.Types.I# ww }) + + + _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
