[Git][ghc/ghc][wip/simplifier-tweaks] Error message wibbles

[Simon Peyton Jones (@simonpj)]

Simon Peyton Jones pushed to branch wip/simplifier-tweaks at Glasgow Haskell Compiler / GHC


Commits:
606a08b5 by Simon Peyton Jones at 2024-03-28T12:15:59+00:00
Error message wibbles

- - - - -


2 changed files:

- testsuite/tests/arityanal/should_compile/Arity01.stderr
- testsuite/tests/arityanal/should_compile/Arity02.stderr


Changes:

=====================================
testsuite/tests/arityanal/should_compile/Arity01.stderr
=====================================
@@ -1,6 +1,6 @@
 
 ==================== Tidy Core ====================
-Result size of Tidy Core = {terms: 65, types: 41, coercions: 0, joins: 0/0}
+Result size of Tidy Core = {terms: 71, types: 43, coercions: 0, joins: 0/0}
 
 -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0}
 F1.f2 :: Integer
@@ -8,14 +8,18 @@ F1.f2 :: Integer
 F1.f2 = GHC.Num.Integer.IS 1#
 
 Rec {
--- RHS size: {terms: 18, types: 4, coercions: 0, joins: 0/0}
+-- RHS size: {terms: 24, types: 6, coercions: 0, joins: 0/0}
 F1.f1_h1 [Occ=LoopBreaker] :: Integer -> Integer -> Integer -> Integer
-[GblId, Arity=3, Str=<SL><SL><SL>, Unf=OtherCon []]
+[GblId, Arity=3, Str=<1L><1L><SL>, Unf=OtherCon []]
 F1.f1_h1
-  = \ (n :: Integer) (x :: Integer) (eta :: Integer) ->
-      case GHC.Num.Integer.integerLt x n of {
-        False -> eta;
-        True -> F1.f1_h1 n (GHC.Num.Integer.integerAdd x F1.f2) (GHC.Num.Integer.integerAdd x eta)
+  = \ (n :: Integer) (x :: Integer) (eta [OS=OneShot] :: Integer) ->
+      case x of x1 { __DEFAULT ->
+      case n of y1 { __DEFAULT ->
+      case GHC.Num.Integer.integerLt# x1 y1 of {
+        __DEFAULT -> eta;
+        1# -> F1.f1_h1 y1 (GHC.Num.Integer.integerAdd x1 F1.f2) (GHC.Num.Integer.integerAdd x1 eta)
+      }
+      }
       }
 end Rec }
 


=====================================
testsuite/tests/arityanal/should_compile/Arity02.stderr
=====================================
@@ -1,6 +1,6 @@
 
 ==================== Tidy Core ====================
-Result size of Tidy Core = {terms: 38, types: 23, coercions: 0, joins: 0/0}
+Result size of Tidy Core = {terms: 51, types: 27, coercions: 0, joins: 0/0}
 
 -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0}
 F2.f1 :: Integer
@@ -18,14 +18,19 @@ lvl :: Integer
 lvl = GHC.Num.Integer.IS 1#
 
 Rec {
--- RHS size: {terms: 16, types: 3, coercions: 0, joins: 0/0}
+-- RHS size: {terms: 29, types: 7, coercions: 0, joins: 0/0}
 F2.f2_g [Occ=LoopBreaker] :: Integer -> Integer -> Integer
-[GblId, Arity=2, Str=<SL><SL>, Unf=OtherCon []]
+[GblId, Arity=2, Str=<1L><SL>, Unf=OtherCon []]
 F2.f2_g
   = \ (x :: Integer) (y :: Integer) ->
-      case GHC.Num.Integer.integerGt x F2.f1 of {
-        False -> y;
-        True -> F2.f2_g (GHC.Num.Integer.integerSub x lvl) (GHC.Num.Integer.integerAdd x y)
+      case x of x1 {
+        GHC.Num.Integer.IS x2 ->
+          case GHC.Prim.># x2 0# of {
+            __DEFAULT -> y;
+            1# -> F2.f2_g (GHC.Num.Integer.integerSub x1 lvl) (GHC.Num.Integer.integerAdd x1 y)
+          };
+        GHC.Num.Integer.IP x2 -> F2.f2_g (GHC.Num.Integer.integerSub x1 lvl) (GHC.Num.Integer.integerAdd x1 y);
+        GHC.Num.Integer.IN x2 -> y
       }
 end Rec }
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/606a08b5f3126921be99e6255087476aa359862e

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/606a08b5f3126921be99e6255087476aa359862e
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/20240328/7510ef8e/attachment-0001.html>