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

Commits:

1 changed file:

Changes:

  • compiler/GHC/Tc/Solver/Equality.hs
    ... ... @@ -2222,7 +2222,7 @@ canEqCanLHSFinish_try_unification ev eq_rel swapped lhs rhs
    2222 2222
                       ; case check_result of
    
    2223 2223
                           PuFail {}         -> finish_no_unify
    
    2224 2224
                           PuOK cts rhs_redn -> do { emitWork cts
    
    2225
    -                                              ; do_unification lhs_tv rhs_redn }
    
    2225
    +                                              ; do_unification lhs_tv rhs_redn } }
    
    2226 2226
              }
    
    2227 2227
       -- Otherwise unification is off the table
    
    2228 2228
       | otherwise
    
    ... ... @@ -2236,12 +2236,12 @@ canEqCanLHSFinish_try_unification ev eq_rel swapped lhs rhs
    2236 2236
         -- We can't unify, and this equality should not be used to rewrite
    
    2237 2237
         -- other constraints (e.g. because it has an occurs check).
    
    2238 2238
         -- So add it to the inert Irreds.
    
    2239
    -    try_irred reason = tryIrredInstead reason ev eq_rel swapped lhs rhs
    
    2239
    +--    try_irred reason = tryIrredInstead reason ev eq_rel swapped lhs rhs
    
    2240 2240
     
    
    2241 2241
         -- We can't unify as-is, and want to flip the equality around.
    
    2242 2242
         -- Example: alpha ~ F tys, flip it around to become the canonical
    
    2243 2243
         -- equality f tys ~ alpha.
    
    2244
    -    swap_and_finish tv can_rhs = swapAndFinish ev eq_rel swapped (mkTyVarTy tv) can_rhs
    
    2244
    +--    swap_and_finish tv can_rhs = swapAndFinish ev eq_rel swapped (mkTyVarTy tv) can_rhs
    
    2245 2245
     
    
    2246 2246
         -- Phew! Finally!  We can unify; go ahead and do so.
    
    2247 2247
         do_unification tv rhs_redn =