[commit: ghc] master: Fix the use of UniqueFM in the type checker (commit bf5af91ca597666641b8519abc85a31297b30823) to preserve the ordering of contexts (5ff42f0)

Manuel Chakravarty chak at cse.unsw.edu.au
Sun Jul 31 09:55:30 CEST 2011


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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5ff42f08320838a1000a525d4d9d98a5b370f77f

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

commit 5ff42f08320838a1000a525d4d9d98a5b370f77f
Author: Manuel M T Chakravarty <chak at cse.unsw.edu.au>
Date:   Sun Jul 31 17:29:39 2011 +1000

    Fix the use of UniqueFM in the type checker (commit bf5af91ca597666641b8519abc85a31297b30823) to preserve the ordering of contexts
    
    See also http://www.haskell.org/pipermail/cvs-ghc/2011-July/064550.html

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

 compiler/typecheck/TcInteract.lhs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/compiler/typecheck/TcInteract.lhs b/compiler/typecheck/TcInteract.lhs
index 4c450f7..983df3c 100644
--- a/compiler/typecheck/TcInteract.lhs
+++ b/compiler/typecheck/TcInteract.lhs
@@ -111,7 +111,7 @@ updCCanMap (a,ct) cmap
       Given {}   -> cmap { cts_given   = insert_into (cts_given cmap)   }
       Derived {} -> cmap { cts_derived = insert_into (cts_derived cmap) }
   where 
-    insert_into m = addToUFM_C unionBags m a (singleCCan ct)
+    insert_into m = addToUFM_C (flip unionBags) m a (singleCCan ct)
 
 getRelevantCts :: Uniquable a => a -> CCanMap a -> (CanonicalCts, CCanMap a) 
 -- Gets the relevant constraints and returns the rest of the CCanMap





More information about the Cvs-ghc mailing list