[commit: ghc] master: Comments only (03ec792)

git at git.haskell.org git at git.haskell.org
Fri Apr 28 11:04:18 UTC 2017


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

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

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

commit 03ec7927f050c203a43843d95938ededf6d2c8f9
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Apr 26 16:56:33 2017 +0100

    Comments only


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

03ec7927f050c203a43843d95938ededf6d2c8f9
 compiler/coreSyn/CoreOpt.hs              |  2 +-
 compiler/coreSyn/CoreUnfold.hs           | 12 ++++++------
 testsuite/tests/perf/should_run/T7257.hs |  0
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/coreSyn/CoreOpt.hs b/compiler/coreSyn/CoreOpt.hs
index da58a4b..4a19605 100644
--- a/compiler/coreSyn/CoreOpt.hs
+++ b/compiler/coreSyn/CoreOpt.hs
@@ -479,7 +479,7 @@ subst_opt_id_bndr (SOE { soe_subst = subst, soe_inl = inl }) old_id
     id1    = uniqAway in_scope old_id
     id2    = setIdType id1 (substTy subst (idType old_id))
     new_id = zapFragileIdInfo id2
-             -- Zaps rules, worker-info, unfolding, and fragile OccInfo
+             -- Zaps rules, unfolding, and fragile OccInfo
              -- The unfolding and rules will get added back later, by add_info
 
     new_in_scope = in_scope `extendInScopeSet` new_id
diff --git a/compiler/coreSyn/CoreUnfold.hs b/compiler/coreSyn/CoreUnfold.hs
index e629467..811ddad 100644
--- a/compiler/coreSyn/CoreUnfold.hs
+++ b/compiler/coreSyn/CoreUnfold.hs
@@ -1472,15 +1472,15 @@ computeDiscount dflags arg_discounts res_discount arg_infos cont_info
       = res_discount   -- Over-saturated
       | otherwise
       = case cont_info of
-                        BoringCtxt  -> 0
-                        CaseCtxt    -> res_discount  -- Presumably a constructor
-                        ValAppCtxt  -> res_discount  -- Presumably a function
-                        _           -> 40 `min` res_discount
+           BoringCtxt  -> 0
+           CaseCtxt    -> res_discount  -- Presumably a constructor
+           ValAppCtxt  -> res_discount  -- Presumably a function
+           _           -> 40 `min` res_discount
                 -- ToDo: this 40 `min` res_discount doesn't seem right
                 --   for DiscArgCtxt it shouldn't matter because the function will
-                --    get the arg discount for any non-triv arg
+                --       get the arg discount for any non-triv arg
                 --   for RuleArgCtxt we do want to be keener to inline; but not only
-                --    constructor results
+                --       constructor results
                 --   for RhsCtxt I suppose that exposing a data con is good in general
                 --   And 40 seems very arbitrary
                 --



More information about the ghc-commits mailing list