From bbaf76f949426c91d6abbbc5eced1f705530087b Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 29 Oct 2015 17:41:34 +0100 Subject: Revert "Generate Typeable info at definition sites" This reverts commit bef2f03e4d56d88a7e9752a7afd6a0a35616da6c. This merge was botched Also reverts haddock submodule. --- .../tests/simplCore/should_compile/T3234.stderr | 4 +- .../tests/simplCore/should_compile/T3717.stderr | 29 +------------ .../tests/simplCore/should_compile/T3772.stdout | 29 +------------ .../tests/simplCore/should_compile/T4908.stderr | 29 +------------ .../tests/simplCore/should_compile/T4930.stderr | 29 +------------ .../tests/simplCore/should_compile/T7360.stderr | 47 +--------------------- .../tests/simplCore/should_compile/T8274.stdout | 8 ---- .../tests/simplCore/should_compile/T9400.stderr | 17 +------- .../tests/simplCore/should_compile/rule2.stderr | 3 +- .../simplCore/should_compile/spec-inline.stderr | 29 +------------ 10 files changed, 10 insertions(+), 214 deletions(-) (limited to 'testsuite/tests/simplCore') diff --git a/testsuite/tests/simplCore/should_compile/T3234.stderr b/testsuite/tests/simplCore/should_compile/T3234.stderr index d317991925..c3591d02fe 100644 --- a/testsuite/tests/simplCore/should_compile/T3234.stderr +++ b/testsuite/tests/simplCore/should_compile/T3234.stderr @@ -10,7 +10,7 @@ ==================== Grand total simplifier statistics ==================== -Total ticks: 46 +Total ticks: 45 14 PreInlineUnconditionally 1 n @@ -37,7 +37,7 @@ Total ticks: 46 1 foldr/single 1 unpack 1 unpack-list -2 LetFloatFromLet 2 +1 LetFloatFromLet 1 22 BetaReduction 1 a 1 b diff --git a/testsuite/tests/simplCore/should_compile/T3717.stderr b/testsuite/tests/simplCore/should_compile/T3717.stderr index f7fa084ef0..374533605e 100644 --- a/testsuite/tests/simplCore/should_compile/T3717.stderr +++ b/testsuite/tests/simplCore/should_compile/T3717.stderr @@ -1,33 +1,6 @@ ==================== Tidy Core ==================== -Result size of Tidy Core = {terms: 32, types: 13, coercions: 0} - --- RHS size: {terms: 2, types: 0, coercions: 0} -T3717.$trModule2 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}] -T3717.$trModule2 = TrNameS "main"# - --- RHS size: {terms: 2, types: 0, coercions: 0} -T3717.$trModule1 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}] -T3717.$trModule1 = TrNameS "T3717"# - --- RHS size: {terms: 3, types: 0, coercions: 0} -T3717.$trModule :: Module -[GblId[ReflectionId], - Caf=NoCafRefs, - Str=DmdType m, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}] -T3717.$trModule = Module T3717.$trModule2 T3717.$trModule1 +Result size of Tidy Core = {terms: 22, types: 10, coercions: 0} Rec { -- RHS size: {terms: 10, types: 2, coercions: 0} diff --git a/testsuite/tests/simplCore/should_compile/T3772.stdout b/testsuite/tests/simplCore/should_compile/T3772.stdout index 1ef8c79002..e74fa39cb5 100644 --- a/testsuite/tests/simplCore/should_compile/T3772.stdout +++ b/testsuite/tests/simplCore/should_compile/T3772.stdout @@ -1,6 +1,6 @@ ==================== Tidy Core ==================== -Result size of Tidy Core = {terms: 36, types: 14, coercions: 0} +Result size of Tidy Core = {terms: 26, types: 11, coercions: 0} Rec { -- RHS size: {terms: 10, types: 2, coercions: 0} @@ -26,32 +26,5 @@ foo = } } --- RHS size: {terms: 2, types: 0, coercions: 0} -T3772.$trModule1 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}] -T3772.$trModule1 = TrNameS "T3772"# - --- RHS size: {terms: 2, types: 0, coercions: 0} -T3772.$trModule2 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}] -T3772.$trModule2 = TrNameS "main"# - --- RHS size: {terms: 3, types: 0, coercions: 0} -T3772.$trModule :: Module -[GblId[ReflectionId], - Caf=NoCafRefs, - Str=DmdType m, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}] -T3772.$trModule = Module T3772.$trModule2 T3772.$trModule1 - diff --git a/testsuite/tests/simplCore/should_compile/T4908.stderr b/testsuite/tests/simplCore/should_compile/T4908.stderr index 334935ddd4..6ad89470bb 100644 --- a/testsuite/tests/simplCore/should_compile/T4908.stderr +++ b/testsuite/tests/simplCore/should_compile/T4908.stderr @@ -1,33 +1,6 @@ ==================== Tidy Core ==================== -Result size of Tidy Core = {terms: 64, types: 41, coercions: 0} - --- RHS size: {terms: 2, types: 0, coercions: 0} -T4908.$trModule2 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}] -T4908.$trModule2 = TrNameS "main"# - --- RHS size: {terms: 2, types: 0, coercions: 0} -T4908.$trModule1 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}] -T4908.$trModule1 = TrNameS "T4908"# - --- RHS size: {terms: 3, types: 0, coercions: 0} -T4908.$trModule :: Module -[GblId[ReflectionId], - Caf=NoCafRefs, - Str=DmdType m, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}] -T4908.$trModule = Module T4908.$trModule2 T4908.$trModule1 +Result size of Tidy Core = {terms: 54, types: 38, coercions: 0} Rec { -- RHS size: {terms: 19, types: 5, coercions: 0} diff --git a/testsuite/tests/simplCore/should_compile/T4930.stderr b/testsuite/tests/simplCore/should_compile/T4930.stderr index 9f71161d14..552c8a8ddc 100644 --- a/testsuite/tests/simplCore/should_compile/T4930.stderr +++ b/testsuite/tests/simplCore/should_compile/T4930.stderr @@ -1,33 +1,6 @@ ==================== Tidy Core ==================== -Result size of Tidy Core = {terms: 45, types: 17, coercions: 0} - --- RHS size: {terms: 2, types: 0, coercions: 0} -T4930.$trModule2 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}] -T4930.$trModule2 = TrNameS "main"# - --- RHS size: {terms: 2, types: 0, coercions: 0} -T4930.$trModule1 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}] -T4930.$trModule1 = TrNameS "T4930"# - --- RHS size: {terms: 3, types: 0, coercions: 0} -T4930.$trModule :: Module -[GblId[ReflectionId], - Caf=NoCafRefs, - Str=DmdType m, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}] -T4930.$trModule = Module T4930.$trModule2 T4930.$trModule1 +Result size of Tidy Core = {terms: 35, types: 14, coercions: 0} Rec { -- RHS size: {terms: 23, types: 6, coercions: 0} diff --git a/testsuite/tests/simplCore/should_compile/T7360.stderr b/testsuite/tests/simplCore/should_compile/T7360.stderr index 1cd13301f9..f7979075ac 100644 --- a/testsuite/tests/simplCore/should_compile/T7360.stderr +++ b/testsuite/tests/simplCore/should_compile/T7360.stderr @@ -1,6 +1,6 @@ ==================== Tidy Core ==================== -Result size of Tidy Core = {terms: 55, types: 34, coercions: 0} +Result size of Tidy Core = {terms: 36, types: 29, coercions: 0} -- RHS size: {terms: 6, types: 3, coercions: 0} T7360.$WFoo3 [InlPrag=INLINE] :: Int -> Foo @@ -17,51 +17,6 @@ T7360.$WFoo3 = \ (dt [Occ=Once!] :: Int) -> case dt of _ [Occ=Dead] { I# dt [Occ=Once] -> T7360.Foo3 dt } --- RHS size: {terms: 2, types: 0, coercions: 0} -T7360.$trModule2 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}] -T7360.$trModule2 = TrNameS "main"# - --- RHS size: {terms: 2, types: 0, coercions: 0} -T7360.$trModule1 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}] -T7360.$trModule1 = TrNameS "T7360"# - --- RHS size: {terms: 3, types: 0, coercions: 0} -T7360.$trModule :: Module -[GblId[ReflectionId], - Caf=NoCafRefs, - Str=DmdType m, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}] -T7360.$trModule = Module T7360.$trModule2 T7360.$trModule1 - --- RHS size: {terms: 2, types: 0, coercions: 0} -T7360.$tcFoo1 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}] -T7360.$tcFoo1 = TrNameS "Foo"# - --- RHS size: {terms: 5, types: 0, coercions: 0} -T7360.$tcFoo :: TyCon -[GblId[ReflectionId], - Caf=NoCafRefs, - Str=DmdType m, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 50}] -T7360.$tcFoo = TyCon 0## 0## T7360.$trModule T7360.$tcFoo1 - -- RHS size: {terms: 5, types: 2, coercions: 0} fun1 [InlPrag=NOINLINE] :: Foo -> () [GblId, Arity=1, Caf=NoCafRefs, Str=DmdType ] diff --git a/testsuite/tests/simplCore/should_compile/T8274.stdout b/testsuite/tests/simplCore/should_compile/T8274.stdout index 6c0e36f8f9..35f2412bc4 100644 --- a/testsuite/tests/simplCore/should_compile/T8274.stdout +++ b/testsuite/tests/simplCore/should_compile/T8274.stdout @@ -1,10 +1,2 @@ -T8274.$trModule2 = TrNameS "main"# -T8274.$trModule1 = TrNameS "T8274"# -T8274.$tcP1 = TrNameS "P"# - 11095028091707994303## - 9476557054198009608## -T8274.$tcN1 = TrNameS "N"# - 7479687563082171902## - 17616649989360543185## p = T8274.Positives 42# 4.23# 4.23## '4'# 4## n = T8274.Negatives -4# -4.0# -4.0## diff --git a/testsuite/tests/simplCore/should_compile/T9400.stderr b/testsuite/tests/simplCore/should_compile/T9400.stderr index 3bc95e42cc..5216d1ed5f 100644 --- a/testsuite/tests/simplCore/should_compile/T9400.stderr +++ b/testsuite/tests/simplCore/should_compile/T9400.stderr @@ -1,21 +1,6 @@ ==================== Tidy Core ==================== -Result size of Tidy Core = {terms: 33, types: 19, coercions: 0} - --- RHS size: {terms: 2, types: 0, coercions: 0} -a :: TrName -[GblId, Caf=NoCafRefs, Str=DmdType] -a = TrNameS "main"# - --- RHS size: {terms: 2, types: 0, coercions: 0} -a1 :: TrName -[GblId, Caf=NoCafRefs, Str=DmdType] -a1 = TrNameS "T9400"# - --- RHS size: {terms: 3, types: 0, coercions: 0} -T9400.$trModule :: Module -[GblId[ReflectionId], Caf=NoCafRefs, Str=DmdType] -T9400.$trModule = Module a a1 +Result size of Tidy Core = {terms: 23, types: 16, coercions: 0} -- RHS size: {terms: 22, types: 14, coercions: 0} main :: IO () diff --git a/testsuite/tests/simplCore/should_compile/rule2.stderr b/testsuite/tests/simplCore/should_compile/rule2.stderr index da97b8859c..082f9aa134 100644 --- a/testsuite/tests/simplCore/should_compile/rule2.stderr +++ b/testsuite/tests/simplCore/should_compile/rule2.stderr @@ -10,14 +10,13 @@ ==================== Grand total simplifier statistics ==================== -Total ticks: 13 +Total ticks: 12 2 PreInlineUnconditionally 1 f 1 lvl 1 UnfoldingDone 1 Roman.bar 1 RuleFired 1 foo/bar -1 LetFloatFromLet 1 1 EtaReduction 1 ds 7 BetaReduction 1 f diff --git a/testsuite/tests/simplCore/should_compile/spec-inline.stderr b/testsuite/tests/simplCore/should_compile/spec-inline.stderr index 7ae0e9c920..392d4fba73 100644 --- a/testsuite/tests/simplCore/should_compile/spec-inline.stderr +++ b/testsuite/tests/simplCore/should_compile/spec-inline.stderr @@ -1,33 +1,6 @@ ==================== Tidy Core ==================== -Result size of Tidy Core = {terms: 172, types: 64, coercions: 0} - --- RHS size: {terms: 2, types: 0, coercions: 0} -Roman.$trModule2 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}] -Roman.$trModule2 = TrNameS "main"# - --- RHS size: {terms: 2, types: 0, coercions: 0} -Roman.$trModule1 :: TrName -[GblId, - Caf=NoCafRefs, - Str=DmdType m1, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}] -Roman.$trModule1 = TrNameS "Roman"# - --- RHS size: {terms: 3, types: 0, coercions: 0} -Roman.$trModule :: Module -[GblId[ReflectionId], - Caf=NoCafRefs, - Str=DmdType m, - Unf=Unf{Src=, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}] -Roman.$trModule = Module Roman.$trModule2 Roman.$trModule1 +Result size of Tidy Core = {terms: 162, types: 61, coercions: 0} -- RHS size: {terms: 2, types: 1, coercions: 0} Roman.foo3 :: Int -- cgit v1.2.1