[commit: ghc] master: Dwarf: Rename binding to avoid shadowing ppr (a98815a)
git at git.haskell.org
git at git.haskell.org
Fri Sep 25 10:49:09 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/a98815a9f11ea467aa96033cb7839d2662a29efc/ghc
>---------------------------------------------------------------
commit a98815a9f11ea467aa96033cb7839d2662a29efc
Author: Ben Gamari <bgamari.foss at gmail.com>
Date: Fri Sep 25 12:51:01 2015 +0200
Dwarf: Rename binding to avoid shadowing ppr
Reviewers: austin
Reviewed By: austin
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1221
>---------------------------------------------------------------
a98815a9f11ea467aa96033cb7839d2662a29efc
compiler/nativeGen/Dwarf/Types.hs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/compiler/nativeGen/Dwarf/Types.hs b/compiler/nativeGen/Dwarf/Types.hs
index 17fbf3b..846f8dc 100644
--- a/compiler/nativeGen/Dwarf/Types.hs
+++ b/compiler/nativeGen/Dwarf/Types.hs
@@ -370,21 +370,21 @@ pprSetUnwind plat g (_, uw)
pprUnwindExpr :: Bool -> UnwindExpr -> SDoc
pprUnwindExpr spIsCFA expr
= sdocWithPlatform $ \plat ->
- let ppr (UwConst i)
+ let pprE (UwConst i)
| i >= 0 && i < 32 = pprByte (dW_OP_lit0 + fromIntegral i)
| otherwise = pprByte dW_OP_consts $$ pprLEBInt i -- lazy...
- ppr (UwReg Sp i) | spIsCFA
+ pprE (UwReg Sp i) | spIsCFA
= if i == 0
then pprByte dW_OP_call_frame_cfa
else ppr (UwPlus (UwReg Sp 0) (UwConst i))
- ppr (UwReg g i) = pprByte (dW_OP_breg0+dwarfGlobalRegNo plat g) $$
+ pprE (UwReg g i) = pprByte (dW_OP_breg0+dwarfGlobalRegNo plat g) $$
pprLEBInt i
- ppr (UwDeref u) = ppr u $$ pprByte dW_OP_deref
- ppr (UwPlus u1 u2) = ppr u1 $$ ppr u2 $$ pprByte dW_OP_plus
- ppr (UwMinus u1 u2) = ppr u1 $$ ppr u2 $$ pprByte dW_OP_minus
- ppr (UwTimes u1 u2) = ppr u1 $$ ppr u2 $$ pprByte dW_OP_mul
+ pprE (UwDeref u) = pprE u $$ pprByte dW_OP_deref
+ pprE (UwPlus u1 u2) = pprE u1 $$ pprE u2 $$ pprByte dW_OP_plus
+ pprE (UwMinus u1 u2) = pprE u1 $$ pprE u2 $$ pprByte dW_OP_minus
+ pprE (UwTimes u1 u2) = pprE u1 $$ pprE u2 $$ pprByte dW_OP_mul
in ptext (sLit "\t.byte 1f-.-1") $$
- ppr expr $$
+ pprE expr $$
ptext (sLit "1:")
-- | Generate code for re-setting the unwind information for a
More information about the ghc-commits
mailing list