diff options
| author | David Feuer <david.feuer@gmail.com> | 2017-03-01 13:47:39 -0500 |
|---|---|---|
| committer | David Feuer <David.Feuer@gmail.com> | 2017-03-01 13:47:41 -0500 |
| commit | cbe569a56e2a82bb93a008beb56869d9a6a1d047 (patch) | |
| tree | 4143ecfabf7b171159c2980e545fe66e0118e1f0 /compiler/nativeGen/RegAlloc/Linear/Main.hs | |
| parent | 701256df88c61a2eee4cf00a59e61ef76a57b4b4 (diff) | |
| download | haskell-cbe569a56e2a82bb93a008beb56869d9a6a1d047.tar.gz | |
Upgrade UniqSet to a newtype
The fundamental problem with `type UniqSet = UniqFM` is that `UniqSet`
has a key invariant `UniqFM` does not. For example, `fmap` over
`UniqSet` will generally produce nonsense.
* Upgrade `UniqSet` from a type synonym to a newtype.
* Remove unused and shady `extendVarSet_C` and `addOneToUniqSet_C`.
* Use cached unique in `tyConsOfType` by replacing
`unitNameEnv (tyConName tc) tc` with `unitUniqSet tc`.
Reviewers: austin, hvr, goldfire, simonmar, niteria, bgamari
Reviewed By: niteria
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D3146
Diffstat (limited to 'compiler/nativeGen/RegAlloc/Linear/Main.hs')
| -rw-r--r-- | compiler/nativeGen/RegAlloc/Linear/Main.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/nativeGen/RegAlloc/Linear/Main.hs b/compiler/nativeGen/RegAlloc/Linear/Main.hs index 055129703b..b7721880c3 100644 --- a/compiler/nativeGen/RegAlloc/Linear/Main.hs +++ b/compiler/nativeGen/RegAlloc/Linear/Main.hs @@ -352,7 +352,7 @@ initBlock id block_live setFreeRegsR (frInitFreeRegs platform) Just live -> setFreeRegsR $ foldl' (flip $ frAllocateReg platform) (frInitFreeRegs platform) - [ r | RegReal r <- nonDetEltsUFM live ] + [ r | RegReal r <- nonDetEltsUniqSet live ] -- See Note [Unique Determinism and code generation] setAssigR emptyRegMap @@ -446,8 +446,8 @@ raInsn block_live new_instrs id (LiveInstr (Instr instr) (Just live)) return (new_instrs, []) _ -> genRaInsn block_live new_instrs id instr - (nonDetEltsUFM $ liveDieRead live) - (nonDetEltsUFM $ liveDieWrite live) + (nonDetEltsUniqSet $ liveDieRead live) + (nonDetEltsUniqSet $ liveDieWrite live) -- See Note [Unique Determinism and code generation] raInsn _ _ _ instr |