sheaf pushed to branch wip/andreask/ticked_joins at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • compiler/GHC/Core/Opt/Simplify/Iteration.hs
    ... ... @@ -2077,7 +2077,7 @@ simplNonRecJoinPoint env bndr rhs body cont
    2077 2077
               -- and wrap wrap_cont around the whole thing
    
    2078 2078
             ; let (mult, res_ty)
    
    2079 2079
                     -- SLD TODO
    
    2080
    -                | Just QuasiJoinPoint <- occInfoJoinPointType_maybe (idOccInfo bndr)
    
    2080
    +                | Just QuasiJoinPoint <- joinId_maybe bndr
    
    2081 2081
                     = (idMult bndr, peelJoinResTy (idJoinArity bndr) $ substTy env (idType bndr))
    
    2082 2082
                     | otherwise
    
    2083 2083
                     = (contHoleScaling cont, contResultType cont)
    
    ... ... @@ -2102,7 +2102,7 @@ simplRecJoinPoint env pairs body cont
    2102 2102
                  (mult, res_ty)
    
    2103 2103
                     -- SLD TODO
    
    2104 2104
                     | [b] <- bndrs
    
    2105
    -                , Just QuasiJoinPoint <- occInfoJoinPointType_maybe (idOccInfo b)
    
    2105
    +                , Just QuasiJoinPoint <- joinId_maybe b
    
    2106 2106
                     = (idMult b, peelJoinResTy (idJoinArity b) $ substTy env (idType b))
    
    2107 2107
                     | otherwise
    
    2108 2108
                     = (contHoleScaling cont, contResultType cont)