Hannes Siebenhandl pushed to branch wip/fendor/t23703 at Glasgow Haskell Compiler / GHC Commits: 69d328b2 by fendor at 2025-10-06T09:27:22+02:00 Fixup: refactoring - - - - - 2 changed files: - compiler/GHC/Types/Unique/DFM.hs - compiler/GHC/Types/Unique/Map.hs Changes: ===================================== compiler/GHC/Types/Unique/DFM.hs ===================================== @@ -472,14 +472,12 @@ alterUDFM_L -> (Maybe elt, UniqDFM key elt) -- ^ New element at @key@ and modified 'UniqDFM' alterUDFM_L f (UDFM m i) k = let - -- Force the key Word64 as the thunk is almost never worth it. - !key = getKey $ getUnique k - (mElt, udfm) = M.alterF (dupe . alterf) key m + (mElt, udfm) = M.alterLookupWithKey alterf (getKey $ getUnique k) m in - (mElt, UDFM udfm (i + 1)) + (untag mElt, UDFM udfm (i + 1)) where - dupe :: Maybe (TaggedVal elt) -> (Maybe elt, Maybe (TaggedVal elt)) - dupe mt = (fmap taggedFst mt, mt) + untag Nothing = Nothing + untag (Just (TaggedVal v _)) = Just v alterf :: Maybe (TaggedVal elt) -> (Maybe (TaggedVal elt)) alterf Nothing = inject $ f Nothing alterf (Just (TaggedVal v _)) = inject $ f (Just v) ===================================== compiler/GHC/Types/Unique/Map.hs ===================================== @@ -22,7 +22,6 @@ module GHC.Types.Unique.Map ( addToUniqMap_Acc, addToUniqMap_L, alterUniqMap, - alterUniqMap_L, addListToUniqMap_C, adjustUniqMap, delFromUniqMap, @@ -161,15 +160,6 @@ alterUniqMap :: Uniquable k alterUniqMap f (UniqMap m) k = UniqMap $ alterUFM (fmap (k,) . f . fmap snd) m k -alterUniqMap_L :: Uniquable k - => (Maybe a -> Maybe a) - -> UniqMap k a - -> k - -> (Maybe a, UniqMap k a) -alterUniqMap_L f (UniqMap m) k = - let (r, m') = alterUFM_L (fmap (k,) . f . fmap snd) m k - in (snd <$> r, UniqMap m') - addListToUniqMap_C :: Uniquable k => (a -> a -> a) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/69d328b259594b42de7ea27bd82a57d1... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/69d328b259594b42de7ea27bd82a57d1... You're receiving this email because of your account on gitlab.haskell.org.