[Git][ghc/ghc][wip/plusUDFM] WIP

[Josh Meredith (@JoshMeredith)]

Josh Meredith pushed to branch wip/plusUDFM at Glasgow Haskell Compiler / GHC


Commits:
93bf52af by Josh Meredith at 2023-08-08T00:36:21+10:00
WIP

- - - - -


1 changed file:

- compiler/GHC/Data/Word64Map/Internal.hs


Changes:

=====================================
compiler/GHC/Data/Word64Map/Internal.hs
=====================================
@@ -1436,9 +1436,9 @@ mergeMapWithKey' bin' f g1 g2 m = go
           | nomatch k1 p2 m2 = maybe_link k1 (g1 t1) p2 (g2 t2)
           | zero k1 m2 = bin' p2 m2 (merge0 t1 k1 l2) (g2 r2)
           | otherwise  = bin' p2 m2 (g2 l2) (merge0 t1 k1 r2)
-        merge0 t1 k1 t2@(Tip k2 x2)
+        merge0 t1 k1 (Tip k2 x2)
           | k1 == k2 = f t1 (Tip k2 $! m x2)
-          | otherwise = maybe_link k1 (g1 t1) k2 (g2 t2)
+          | otherwise = maybe_link k1 (g1 t1) k2 (g2 $! Tip k2 $ m x2)
         merge0 t1 _  Nil = g1 t1
 
     go Nil t2 = g2 t2



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/93bf52afa7f6a088bb10630418dd3f1551e0bd2f

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/93bf52afa7f6a088bb10630418dd3f1551e0bd2f
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230807/35252c10/attachment.html>