summaryrefslogtreecommitdiff
path: root/compiler/codeGen/CgCon.lhs
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2012-10-16 15:28:26 +0100
committerIan Lynagh <ian@well-typed.com>2012-10-16 16:08:38 +0100
commitcd33eefd0467ae7ee4d22f16fcaaccfd33f18cb5 (patch)
tree30fb18578f1c5c81fef7ccc6ec5879a41fd4e5c0 /compiler/codeGen/CgCon.lhs
parent6759e5a482d927870c90efe97b820d492785a6fd (diff)
downloadhaskell-cd33eefd0467ae7ee4d22f16fcaaccfd33f18cb5.tar.gz
Some alpha renaming
Mostly d -> g (matching DynFlag -> GeneralFlag). Also renamed if* to when*, matching the Haskell if/when names
Diffstat (limited to 'compiler/codeGen/CgCon.lhs')
-rw-r--r--compiler/codeGen/CgCon.lhs6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/codeGen/CgCon.lhs b/compiler/codeGen/CgCon.lhs
index 858de3a616..abb280ff11 100644
--- a/compiler/codeGen/CgCon.lhs
+++ b/compiler/codeGen/CgCon.lhs
@@ -185,7 +185,7 @@ because they don't support cross package data references well.
buildDynCon' dflags platform binder _ con [arg_amode]
| maybeIntLikeCon con
- , platformOS platform /= OSMinGW32 || not (dopt Opt_PIC dflags)
+ , platformOS platform /= OSMinGW32 || not (gopt Opt_PIC dflags)
, (_, CmmLit (CmmInt val _)) <- arg_amode
, let val_int = (fromIntegral val) :: Int
, val_int <= mAX_INTLIKE dflags && val_int >= mIN_INTLIKE dflags
@@ -197,7 +197,7 @@ buildDynCon' dflags platform binder _ con [arg_amode]
buildDynCon' dflags platform binder _ con [arg_amode]
| maybeCharLikeCon con
- , platformOS platform /= OSMinGW32 || not (dopt Opt_PIC dflags)
+ , platformOS platform /= OSMinGW32 || not (gopt Opt_PIC dflags)
, (_, CmmLit (CmmInt val _)) <- arg_amode
, let val_int = (fromIntegral val) :: Int
, val_int <= mAX_CHARLIKE dflags && val_int >= mIN_CHARLIKE dflags
@@ -324,7 +324,7 @@ cgReturnDataCon con amodes = do
if isUnboxedTupleCon con then returnUnboxedTuple amodes
-- when profiling we can't shortcut here, we have to enter the closure
-- for it to be marked as "used" for LDV profiling.
- else if dopt Opt_SccProfilingOn dflags then build_it_then (enter_it dflags)
+ else if gopt Opt_SccProfilingOn dflags then build_it_then (enter_it dflags)
else ASSERT( amodes `lengthIs` dataConRepRepArity con )
do { EndOfBlockInfo _ sequel <- getEndOfBlockInfo
; case sequel of