diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2014-09-27 13:55:48 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-09-27 13:56:40 +0200 |
| commit | 51aa2fa3e65a960c1432dba9acc29db719964618 (patch) | |
| tree | 1709f95bc30866f4d21182fded4ad202a703bda3 /compiler/nativeGen/RegAlloc | |
| parent | b3aa6e486d158a2a5afbc463f06ad6d04c47b7fe (diff) | |
| download | haskell-51aa2fa3e65a960c1432dba9acc29db719964618.tar.gz | |
Stop exporting, and stop using, functions marked as deprecated
Don't export `getUs` and `getUniqueUs`. `UniqSM` has a `MonadUnique` instance:
instance MonadUnique UniqSM where
getUniqueSupplyM = getUs
getUniqueM = getUniqueUs
getUniquesM = getUniquesUs
Commandline-fu used:
git grep -l 'getUs\>' |
grep -v compiler/basicTypes/UniqSupply.lhs |
xargs sed -i 's/getUs/getUniqueSupplyM/g
git grep -l 'getUniqueUs\>' |
grep -v combiler/basicTypes/UniqSupply.lhs |
xargs sed -i 's/getUniqueUs/getUniqueM/g'
Follow up on b522d3a3f970a043397a0d6556ca555648e7a9c3
Reviewed By: austin, hvr
Differential Revision: https://phabricator.haskell.org/D220
Diffstat (limited to 'compiler/nativeGen/RegAlloc')
| -rw-r--r-- | compiler/nativeGen/RegAlloc/Graph/Spill.hs | 2 | ||||
| -rw-r--r-- | compiler/nativeGen/RegAlloc/Linear/Main.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/nativeGen/RegAlloc/Graph/Spill.hs b/compiler/nativeGen/RegAlloc/Graph/Spill.hs index 802046c519..7267ef8eae 100644 --- a/compiler/nativeGen/RegAlloc/Graph/Spill.hs +++ b/compiler/nativeGen/RegAlloc/Graph/Spill.hs @@ -67,7 +67,7 @@ regSpill platform code slotsFree regs $ zip (uniqSetToList regs) slots -- Grab the unique supply from the monad. - us <- getUs + us <- getUniqueSupplyM -- Run the spiller on all the blocks. let (code', state') = diff --git a/compiler/nativeGen/RegAlloc/Linear/Main.hs b/compiler/nativeGen/RegAlloc/Linear/Main.hs index fa47a17ac0..12dc8f0f31 100644 --- a/compiler/nativeGen/RegAlloc/Linear/Main.hs +++ b/compiler/nativeGen/RegAlloc/Linear/Main.hs @@ -231,7 +231,7 @@ linearRegAlloc' -> UniqSM ([NatBasicBlock instr], RegAllocStats, Int) linearRegAlloc' dflags initFreeRegs entry_ids block_live sccs - = do us <- getUs + = do us <- getUniqueSupplyM let (_, stack, stats, blocks) = runR dflags emptyBlockMap initFreeRegs emptyRegMap (emptyStackMap dflags) us $ linearRA_SCCs entry_ids block_live [] sccs |