diff options
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/GHC/Core/TyCon/Env.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/StgToCmm.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Tc/Module.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Types/Name/Env.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Types/Name/Occurrence.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Types/Name/Shape.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Types/Unique/FM.hs | 5 | ||||
-rw-r--r-- | compiler/GHC/Types/Unique/Map.hs | 2 |
8 files changed, 8 insertions, 11 deletions
diff --git a/compiler/GHC/Core/TyCon/Env.hs b/compiler/GHC/Core/TyCon/Env.hs index a891db9ea8..0d33b8d13f 100644 --- a/compiler/GHC/Core/TyCon/Env.hs +++ b/compiler/GHC/Core/TyCon/Env.hs @@ -78,7 +78,7 @@ anyTyConEnv :: (elt -> Bool) -> TyConEnv elt -> Bool mapTyConEnv :: (elt1 -> elt2) -> TyConEnv elt1 -> TyConEnv elt2 disjointTyConEnv :: TyConEnv a -> TyConEnv a -> Bool -nameEnvElts x = eltsUFM x +nameEnvElts x = nonDetEltsUFM x emptyTyConEnv = emptyUFM isEmptyTyConEnv = isNullUFM unitTyConEnv x y = unitUFM x y diff --git a/compiler/GHC/StgToCmm.hs b/compiler/GHC/StgToCmm.hs index ee297e4220..f9ece04b8a 100644 --- a/compiler/GHC/StgToCmm.hs +++ b/compiler/GHC/StgToCmm.hs @@ -143,7 +143,7 @@ codeGen logger tmpfs dflags this_mod (InfoTableProvMap (UniqMap denv) _ _) data_ | gopt Opt_OmitInterfacePragmas dflags = emptyNameEnv | otherwise - = mkNameEnv (Prelude.map extractInfo (eltsUFM cg_id_infos)) + = mkNameEnv (Prelude.map extractInfo (nonDetEltsUFM cg_id_infos)) ; return generatedInfo } diff --git a/compiler/GHC/Tc/Module.hs b/compiler/GHC/Tc/Module.hs index 9b7bed6aac..c649edd301 100644 --- a/compiler/GHC/Tc/Module.hs +++ b/compiler/GHC/Tc/Module.hs @@ -382,7 +382,7 @@ tcRnImports hsc_env import_decls -- modules batch (@--make@) compiled before this one, but -- which are not below this one. ; (home_insts, home_fam_insts) = hptInstancesBelow hsc_env (moduleName this_mod) - (S.fromList (eltsUFM dep_mods)) + (S.fromList (nonDetEltsUFM dep_mods)) } ; -- Record boot-file info in the EPS, so that it's diff --git a/compiler/GHC/Types/Name/Env.hs b/compiler/GHC/Types/Name/Env.hs index 4182f2c27a..b71aa122ee 100644 --- a/compiler/GHC/Types/Name/Env.hs +++ b/compiler/GHC/Types/Name/Env.hs @@ -119,7 +119,7 @@ anyNameEnv :: (elt -> Bool) -> NameEnv elt -> Bool mapNameEnv :: (elt1 -> elt2) -> NameEnv elt1 -> NameEnv elt2 disjointNameEnv :: NameEnv a -> NameEnv a -> Bool -nameEnvElts x = eltsUFM x +nameEnvElts x = nonDetEltsUFM x emptyNameEnv = emptyUFM isEmptyNameEnv = isNullUFM unitNameEnv x y = unitUFM x y diff --git a/compiler/GHC/Types/Name/Occurrence.hs b/compiler/GHC/Types/Name/Occurrence.hs index 4242f4c3dd..25f0b5e681 100644 --- a/compiler/GHC/Types/Name/Occurrence.hs +++ b/compiler/GHC/Types/Name/Occurrence.hs @@ -420,7 +420,7 @@ lookupOccEnv (A x) y = lookupUFM x y mkOccEnv l = A $ listToUFM l elemOccEnv x (A y) = elemUFM x y foldOccEnv a b (A c) = foldUFM a b c -occEnvElts (A x) = eltsUFM x +occEnvElts (A x) = nonDetEltsUFM x plusOccEnv (A x) (A y) = A $ plusUFM x y plusOccEnv_C f (A x) (A y) = A $ plusUFM_C f x y extendOccEnv_C f (A x) y z = A $ addToUFM_C f x y z diff --git a/compiler/GHC/Types/Name/Shape.hs b/compiler/GHC/Types/Name/Shape.hs index 7bb0fad289..6ea3ba3a9a 100644 --- a/compiler/GHC/Types/Name/Shape.hs +++ b/compiler/GHC/Types/Name/Shape.hs @@ -230,7 +230,7 @@ uAvailInfos flexi as1 as2 = -- pprTrace "uAvailInfos" (ppr as1 $$ ppr as2) $ n <- availNames a return (nameOccName n, a) in foldM (\subst (a1, a2) -> uAvailInfo flexi subst a1 a2) emptyNameEnv - (eltsUFM (intersectUFM_C (,) (mkOE as1) (mkOE as2))) + (nonDetEltsUFM (intersectUFM_C (,) (mkOE as1) (mkOE as2))) -- Edward: I have to say, this is pretty clever. -- | Unify two 'AvailInfo's, given an existing substitution @subst@, diff --git a/compiler/GHC/Types/Unique/FM.hs b/compiler/GHC/Types/Unique/FM.hs index 037ced49a6..46b8643f76 100644 --- a/compiler/GHC/Types/Unique/FM.hs +++ b/compiler/GHC/Types/Unique/FM.hs @@ -72,7 +72,7 @@ module GHC.Types.Unique.FM ( isNullUFM, lookupUFM, lookupUFM_Directly, lookupWithDefaultUFM, lookupWithDefaultUFM_Directly, - nonDetEltsUFM, eltsUFM, nonDetKeysUFM, + nonDetEltsUFM, nonDetKeysUFM, ufmToSet_Directly, nonDetUFMToList, ufmToIntMap, unsafeIntMapToUFM, unsafeCastUFMKey, @@ -369,9 +369,6 @@ lookupWithDefaultUFM (UFM m) v k = M.findWithDefault v (getKey $ getUnique k) m lookupWithDefaultUFM_Directly :: UniqFM key elt -> elt -> Unique -> elt lookupWithDefaultUFM_Directly (UFM m) v u = M.findWithDefault v (getKey u) m -eltsUFM :: UniqFM key elt -> [elt] -eltsUFM (UFM m) = M.elems m - ufmToSet_Directly :: UniqFM key elt -> S.IntSet ufmToSet_Directly (UFM m) = M.keysSet m diff --git a/compiler/GHC/Types/Unique/Map.hs b/compiler/GHC/Types/Unique/Map.hs index d31043353d..41765e1c7c 100644 --- a/compiler/GHC/Types/Unique/Map.hs +++ b/compiler/GHC/Types/Unique/Map.hs @@ -72,7 +72,7 @@ instance (Outputable k, Outputable a) => Outputable (UniqMap k a) where ppr (UniqMap m) = brackets $ fsep $ punctuate comma $ [ ppr k <+> text "->" <+> ppr v - | (k, v) <- eltsUFM m ] + | (k, v) <- nonDetEltsUFM m ] liftC :: (a -> a -> a) -> (k, a) -> (k, a) -> (k, a) liftC f (_, v) (k', v') = (k', f v v') |