[commit: ghc] master: Fix expected result from T13143 (d4a6a7f)

git at git.haskell.org git at git.haskell.org
Thu Mar 2 18:14:13 UTC 2017


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d4a6a7fe6d80c23c7e724981d2cfab08cf0fd64b/ghc

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

commit d4a6a7fe6d80c23c7e724981d2cfab08cf0fd64b
Author: David Feuer <david.feuer at gmail.com>
Date:   Thu Mar 2 11:29:39 2017 -0500

    Fix expected result from T13143
    
    Reviewers: austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D3260


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

d4a6a7fe6d80c23c7e724981d2cfab08cf0fd64b
 .../tests/simplCore/should_compile/T13143.stderr   | 52 +++++++++++-----------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/testsuite/tests/simplCore/should_compile/T13143.stderr b/testsuite/tests/simplCore/should_compile/T13143.stderr
index c576f56..3973a3c 100644
--- a/testsuite/tests/simplCore/should_compile/T13143.stderr
+++ b/testsuite/tests/simplCore/should_compile/T13143.stderr
@@ -4,16 +4,15 @@ Result size of Tidy Core
   = {terms: 73, types: 50, coercions: 0, joins: 0/0}
 
 Rec {
+-- RHS size: {terms: 3, types: 4, coercions: 0, joins: 0/0}
+T13143.$wf [InlPrag=NOINLINE] :: forall a. GHC.Prim.Void# -> a
+[GblId, Arity=1, Str=<B,A>b]
+T13143.$wf = \ (@ a) _ [Occ=Dead] -> lvl @ a
+
 -- RHS size: {terms: 3, types: 3, coercions: 0, joins: 0/0}
 lvl :: forall a. a
 [GblId, Str=b]
 lvl = \ (@ a) -> T13143.$wf @ a GHC.Prim.void#
-
--- RHS size: {terms: 3, types: 4, coercions: 0, joins: 0/0}
-T13143.$wf [InlPrag=NOINLINE, Occ=LoopBreaker]
-  :: forall a. GHC.Prim.Void# -> a
-[GblId, Arity=1, Str=<B,A>b]
-T13143.$wf = \ (@ a) _ [Occ=Dead] -> lvl @ a
 end Rec }
 
 -- RHS size: {terms: 3, types: 4, coercions: 0, joins: 0/0}
@@ -68,8 +67,8 @@ T13143.$trModule :: GHC.Types.Module
  Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
-T13143.$trModule =
-  GHC.Types.Module T13143.$trModule3 T13143.$trModule1
+T13143.$trModule
+  = GHC.Types.Module T13143.$trModule3 T13143.$trModule1
 
 -- RHS size: {terms: 2, types: 1, coercions: 0, joins: 0/0}
 lvl1 :: Int
@@ -81,20 +80,20 @@ Rec {
 T13143.$wg [InlPrag=[0], Occ=LoopBreaker]
   :: Bool -> Bool -> GHC.Prim.Int# -> GHC.Prim.Int#
 [GblId, Arity=3, Str=<S,1*U><S,1*U><S,U>]
-T13143.$wg =
-  \ (w :: Bool) (w1 :: Bool) (ww :: GHC.Prim.Int#) ->
-    case w of {
-      False ->
-        case w1 of {
-          False -> T13143.$wg GHC.Types.False GHC.Types.True ww;
-          True -> GHC.Prim.+# ww 1#
-        };
-      True ->
-        case w1 of {
-          False -> T13143.$wg GHC.Types.True GHC.Types.True ww;
-          True -> case lvl1 of wild2 { }
-        }
-    }
+T13143.$wg
+  = \ (w :: Bool) (w1 :: Bool) (ww :: GHC.Prim.Int#) ->
+      case w of {
+        False ->
+          case w1 of {
+            False -> T13143.$wg GHC.Types.False GHC.Types.True ww;
+            True -> GHC.Prim.+# ww 1#
+          };
+        True ->
+          case w1 of {
+            False -> T13143.$wg GHC.Types.True GHC.Types.True ww;
+            True -> case lvl1 of wild2 { }
+          }
+      }
 end Rec }
 
 -- RHS size: {terms: 14, types: 6, coercions: 0, joins: 0/0}
@@ -111,11 +110,10 @@ g [InlPrag=INLINE[0]] :: Bool -> Bool -> Int -> Int
                  case w2 of { GHC.Types.I# ww1 [Occ=Once] ->
                  case T13143.$wg w w1 ww1 of ww2 { __DEFAULT -> GHC.Types.I# ww2 }
                  }}]
-g =
-  \ (w :: Bool) (w1 :: Bool) (w2 :: Int) ->
-    case w2 of { GHC.Types.I# ww1 ->
-    case T13143.$wg w w1 ww1 of ww2 { __DEFAULT -> GHC.Types.I# ww2 }
-    }
+g = \ (w :: Bool) (w1 :: Bool) (w2 :: Int) ->
+      case w2 of { GHC.Types.I# ww1 ->
+      case T13143.$wg w w1 ww1 of ww2 { __DEFAULT -> GHC.Types.I# ww2 }
+      }
 
 
 



More information about the ghc-commits mailing list