[commit: ghc] ghc-7.6: Fix Trac #7280 by zonking the final_quant_candidates in simplifyInfer (439ddf9)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-7.6 http://hackage.haskell.org/trac/ghc/changeset/439ddf9182489c1c4f03ff9eecb460796be829fe >--------------------------------------------------------------- commit 439ddf9182489c1c4f03ff9eecb460796be829fe Author: Simon Peyton Jones <[email protected]> Date: Mon Oct 8 08:33:41 2012 +0100 Fix Trac #7280 by zonking the final_quant_candidates in simplifyInfer This fix is only needed on the branch; HEAD already works differently (and correctly). >--------------------------------------------------------------- compiler/typecheck/TcSimplify.lhs | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/compiler/typecheck/TcSimplify.lhs b/compiler/typecheck/TcSimplify.lhs index c36ee43..bf407eb 100644 --- a/compiler/typecheck/TcSimplify.lhs +++ b/compiler/typecheck/TcSimplify.lhs @@ -394,6 +394,8 @@ simplifyInfer _top_lvl apply_mr name_taus (untch,wanteds) final_quant_candidates = map ctPred $ bagToList $ keepWanted (wc_flat quant_candidates_transformed) -- NB: Already the fixpoint of any unifications that may have happened + -- But need to zonk out the flatten-skolems + ; final_quant_candidates <- mapM zonkTcType final_quant_candidates ; gbl_tvs <- tcGetGlobalTyVars -- TODO: can we just use untch instead of gbl_tvs? ; zonked_tau_tvs <- zonkTyVarsAndFV zonked_tau_tvs