diff options
Diffstat (limited to 'compiler/cmm')
| -rw-r--r-- | compiler/cmm/CLabel.hs | 8 | ||||
| -rw-r--r-- | compiler/cmm/CmmInfo.hs | 2 | ||||
| -rw-r--r-- | compiler/cmm/CmmParse.y | 2 | ||||
| -rw-r--r-- | compiler/cmm/CmmPipeline.hs | 8 | ||||
| -rw-r--r-- | compiler/cmm/PprC.hs | 2 | ||||
| -rw-r--r-- | compiler/cmm/SMRep.lhs | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs index 04312321cc..259f31a1b8 100644 --- a/compiler/cmm/CLabel.hs +++ b/compiler/cmm/CLabel.hs @@ -819,7 +819,7 @@ labelDynamic :: DynFlags -> PackageId -> CLabel -> Bool labelDynamic dflags this_pkg lbl = case lbl of -- is the RTS in a DLL or not? - RtsLabel _ -> not (dopt Opt_Static dflags) && (this_pkg /= rtsPackageId) + RtsLabel _ -> not (gopt Opt_Static dflags) && (this_pkg /= rtsPackageId) IdLabel n _ _ -> isDllName dflags this_pkg n @@ -827,7 +827,7 @@ labelDynamic dflags this_pkg lbl = -- its own shared library. CmmLabel pkg _ _ | os == OSMinGW32 -> - not (dopt Opt_Static dflags) && (this_pkg /= pkg) + not (gopt Opt_Static dflags) && (this_pkg /= pkg) | otherwise -> True @@ -845,14 +845,14 @@ labelDynamic dflags this_pkg lbl = -- When compiling in the "dyn" way, each package is to be -- linked into its own DLL. ForeignLabelInPackage pkgId -> - (not (dopt Opt_Static dflags)) && (this_pkg /= pkgId) + (not (gopt Opt_Static dflags)) && (this_pkg /= pkgId) else -- On Mac OS X and on ELF platforms, false positives are OK, -- so we claim that all foreign imports come from dynamic -- libraries True - PlainModuleInitLabel m -> not (dopt Opt_Static dflags) && this_pkg /= (modulePackageId m) + PlainModuleInitLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m) -- Note that DynamicLinkerLabels do NOT require dynamic linking themselves. _ -> False diff --git a/compiler/cmm/CmmInfo.hs b/compiler/cmm/CmmInfo.hs index dec6b5d09d..e952c831ff 100644 --- a/compiler/cmm/CmmInfo.hs +++ b/compiler/cmm/CmmInfo.hs @@ -366,7 +366,7 @@ mkStdInfoTable dflags (type_descr, closure_descr) cl_type srt_len layout_lit where prof_info - | dopt Opt_SccProfilingOn dflags = [type_descr, closure_descr] + | gopt Opt_SccProfilingOn dflags = [type_descr, closure_descr] | otherwise = [] type_lit = packHalfWordsCLit dflags (toStgHalfWord dflags (fromIntegral cl_type)) srt_len diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index dadf42a5eb..46d1d72b0c 100644 --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -1018,7 +1018,7 @@ pushStackFrame fields body = do withUpdFrameOff new_updfr_off body profilingInfo dflags desc_str ty_str - = if not (dopt Opt_SccProfilingOn dflags) + = if not (gopt Opt_SccProfilingOn dflags) then NoProfilingInfo else ProfilingInfo (stringToWord8s desc_str) (stringToWord8s ty_str) diff --git a/compiler/cmm/CmmPipeline.hs b/compiler/cmm/CmmPipeline.hs index 06bbd00838..dec4008f74 100644 --- a/compiler/cmm/CmmPipeline.hs +++ b/compiler/cmm/CmmPipeline.hs @@ -85,7 +85,7 @@ cpsTop hsc_env proc = return call_pps let noncall_pps = proc_points `setDifference` call_pps - when (not (setNull noncall_pps) && dopt Opt_D_dump_cmmz dflags) $ + when (not (setNull noncall_pps) && gopt Opt_D_dump_cmmz dflags) $ pprTrace "Non-call proc points: " (ppr noncall_pps) $ return () ----------- Sink and inline assignments *before* stack layout ----------- @@ -163,7 +163,7 @@ cpsTop hsc_env proc = = mapM_ (dumpWith dflags flag name) condPass flag pass g dumpflag dumpname = - if dopt flag dflags + if gopt flag dflags then do g <- return $ pass g dump dumpflag dumpname g @@ -186,7 +186,7 @@ runUniqSM m = do dumpGraph :: DynFlags -> GeneralFlag -> String -> CmmGraph -> IO () dumpGraph dflags flag name g = do - when (dopt Opt_DoCmmLinting dflags) $ do_lint g + when (gopt Opt_DoCmmLinting dflags) $ do_lint g dumpWith dflags flag name g where do_lint g = case cmmLintGraph dflags g of @@ -201,6 +201,6 @@ dumpWith dflags flag txt g = do -- them into files." Also, -ddump-cmmz doesn't play nicely -- with -ddump-to-file, since the headers get omitted. dumpIfSet_dyn dflags flag txt (ppr g) - when (not (dopt flag dflags)) $ + when (not (gopt flag dflags)) $ dumpIfSet_dyn dflags Opt_D_dump_cmmz txt (ppr g) diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs index a2427df868..e07bd6459d 100644 --- a/compiler/cmm/PprC.hs +++ b/compiler/cmm/PprC.hs @@ -61,7 +61,7 @@ pprCs dflags cmms = pprCode CStyle (vcat $ map (\c -> split_marker $$ pprC c) cmms) where split_marker - | dopt Opt_SplitObjs dflags = ptext (sLit "__STG_SPLIT_MARKER") + | gopt Opt_SplitObjs dflags = ptext (sLit "__STG_SPLIT_MARKER") | otherwise = empty writeCs :: DynFlags -> Handle -> [RawCmmGroup] -> IO () diff --git a/compiler/cmm/SMRep.lhs b/compiler/cmm/SMRep.lhs index ac021df761..f39af7ce55 100644 --- a/compiler/cmm/SMRep.lhs +++ b/compiler/cmm/SMRep.lhs @@ -267,7 +267,7 @@ fixedHdrSize dflags = sTD_HDR_SIZE dflags + profHdrSize dflags -- (StgProfHeader in includes/rts/storage/Closures.h) profHdrSize :: DynFlags -> WordOff profHdrSize dflags - | dopt Opt_SccProfilingOn dflags = pROF_HDR_SIZE dflags + | gopt Opt_SccProfilingOn dflags = pROF_HDR_SIZE dflags | otherwise = 0 -- | The garbage collector requires that every closure is at least as |