diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2015-01-05 16:57:01 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2015-01-05 17:00:05 +0000 |
| commit | 0b3f53fb8d86278ead96ea08bedd8990d3256dc4 (patch) | |
| tree | d3ae62380f95ab44b711a4d4a7b8eb9630746069 /compiler/cmm | |
| parent | d6c8da69ed75f0a046bfcf779e71a4ecd2dab106 (diff) | |
| download | haskell-wip/redundant-constraints.tar.gz | |
Remove redundant constraints in the compiler itself, found by -fwarn-redundant-constraintswip/redundant-constraints
Diffstat (limited to 'compiler/cmm')
| -rw-r--r-- | compiler/cmm/CmmExpr.hs | 8 | ||||
| -rw-r--r-- | compiler/cmm/Hoopl/Dataflow.hs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compiler/cmm/CmmExpr.hs b/compiler/cmm/CmmExpr.hs index 4d9bbf8915..aa5cef1ebb 100644 --- a/compiler/cmm/CmmExpr.hs +++ b/compiler/cmm/CmmExpr.hs @@ -280,15 +280,15 @@ type RegSet r = Set r type LocalRegSet = RegSet LocalReg type GlobalRegSet = RegSet GlobalReg -emptyRegSet :: Ord r => RegSet r -nullRegSet :: Ord r => RegSet r -> Bool +emptyRegSet :: RegSet r +nullRegSet :: RegSet r -> Bool elemRegSet :: Ord r => r -> RegSet r -> Bool extendRegSet :: Ord r => RegSet r -> r -> RegSet r deleteFromRegSet :: Ord r => RegSet r -> r -> RegSet r mkRegSet :: Ord r => [r] -> RegSet r minusRegSet, plusRegSet, timesRegSet :: Ord r => RegSet r -> RegSet r -> RegSet r -sizeRegSet :: Ord r => RegSet r -> Int -regSetToList :: Ord r => RegSet r -> [r] +sizeRegSet :: RegSet r -> Int +regSetToList :: RegSet r -> [r] emptyRegSet = Set.empty nullRegSet = Set.null diff --git a/compiler/cmm/Hoopl/Dataflow.hs b/compiler/cmm/Hoopl/Dataflow.hs index 4fbf42e607..29c7afedb4 100644 --- a/compiler/cmm/Hoopl/Dataflow.hs +++ b/compiler/cmm/Hoopl/Dataflow.hs @@ -763,7 +763,7 @@ normalizeGraph g = (mapGraphBlocks dropFact g, facts g) exitFacts (JustO (DBlock f b)) = mapSingleton (entryLabel b) f bodyFacts :: LabelMap (DBlock f n C C) -> FactBase f bodyFacts body = mapFoldWithKey f noFacts body - where f :: forall t a x. (NonLocal t) => Label -> DBlock a t C x -> LabelMap a -> LabelMap a + where f :: forall t a x. Label -> DBlock a t C x -> LabelMap a -> LabelMap a f lbl (DBlock f _) fb = mapInsert lbl f fb --- implementation of the constructors (boring) |