Simon Peyton Jones pushed to branch wip/T27484 at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Core.hs
    ... ... @@ -67,7 +67,7 @@ module GHC.Core (
    67 67
             isExpandableUnfolding, isConLikeUnfolding, isCompulsoryUnfolding,
    
    68 68
             isStableUnfolding, isStableUserUnfolding, isStableSystemUnfolding,
    
    69 69
             isInlineUnfolding, isBootUnfolding, isBetterUnfoldingThan,
    
    70
    -        hasCoreUnfolding, hasSomeUnfolding, 
    
    70
    +        hasCoreUnfolding, hasSomeUnfolding,
    
    71 71
             canUnfold, neverUnfoldGuidance, isStableSource,
    
    72 72
     
    
    73 73
             -- * Annotated expression data types
    

  • compiler/GHC/Core/Opt/OccurAnal.hs
    ... ... @@ -37,7 +37,7 @@ import GHC.Prelude hiding ( head, init, last, tail )
    37 37
     
    
    38 38
     import GHC.Core
    
    39 39
     import GHC.Core.FVs
    
    40
    -import GHC.Core.Utils   ( exprIsTrivial, isDefaultAlt, isExpandableApp,
    
    40
    +import GHC.Core.Utils   ( exprIsTrivial, isExpandableApp,
    
    41 41
                               mkCastMCo, mkTicks, BinderSwapDecision(..), scrutOkForBinderSwap )
    
    42 42
     import GHC.Core.Opt.Arity   ( joinRhsArity, isOneShotBndr )
    
    43 43
     import GHC.Core.Coercion
    
    ... ... @@ -3102,7 +3102,7 @@ noBinderSwaps :: OccEnv -> Bool
    3102 3102
     noBinderSwaps (OccEnv { occ_bs_env = bs_env }) = isEmptyVarEnv bs_env
    
    3103 3103
     
    
    3104 3104
     setScrutCtxt :: OccEnv -> [CoreAlt] -> OccEnv
    
    3105
    -setScrutCtxt !env alts
    
    3105
    +setScrutCtxt !env _alts
    
    3106 3106
       = setNonTailCtxt OccVanilla env
    
    3107 3107
     
    
    3108 3108
     {-    Historical code: we used to say OccInteresting for case-scrutinees