Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/81f19d66c66d3d4d0c33481b4d00b2490a55f5d8

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

commit 81f19d66c66d3d4d0c33481b4d00b2490a55f5d8
Author: Dimitrios.Vytiniotis <[email protected]>
Date:   Tue Apr 10 09:57:10 2012 +0100

    Setting empty touchable range in implications that are generated from 
polytype
    decomposition in the constraint solver.

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

 compiler/typecheck/TcSMonad.lhs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/typecheck/TcSMonad.lhs b/compiler/typecheck/TcSMonad.lhs
index 45272c2..b3a64e3 100644
--- a/compiler/typecheck/TcSMonad.lhs
+++ b/compiler/typecheck/TcSMonad.lhs
@@ -1545,12 +1545,10 @@ deferTcSForAllEq (loc,orig_ev) (tvs1,body1) (tvs2,body2)
                               ; let ev_binds = TcEvBinds ev_binds_var
                               ; lcl_env <- wrapTcS $ TcM.getLclTypeEnv
                               ; loc <- wrapTcS $ TcM.getCtLoc skol_info
-                              ; untch <- getUntouchables
                               ; let wc = WC { wc_flat  = singleCt new_ct 
                                             , wc_impl  = emptyBag
                                             , wc_insol = emptyCts }
-                                    imp = Implic { ic_untch  = fst untch
-                                                     -- What about TcS 
touchables?
+                                    imp = Implic { ic_untch  = all_untouchables
                                                  , ic_env    = lcl_env
                                                  , ic_skols  = skol_tvs
                                                  , ic_given  = []
@@ -1564,6 +1562,8 @@ deferTcSForAllEq (loc,orig_ev) (tvs1,body1) (tvs2,body2)
         ; setEvBind orig_ev $
           EvCoercion (foldr mkTcForAllCo coe_inside skol_tvs)
         }
+ where all_untouchables = TouchableRange u u
+       u = idUnique orig_ev -- HACK: empty range
 
 \end{code}
 



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to