diff options
| author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2019-03-18 19:34:00 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-03-19 23:28:42 -0400 |
| commit | 1e26e60dd21c235678447ee903afbf15228e40de (patch) | |
| tree | 97a975d4ffae6f4c8f4fae34a186b2d4cd74eb03 /compiler | |
| parent | 6a47414f0cc6d538fbec7ca537ad36fbcc1a2480 (diff) | |
| download | haskell-1e26e60dd21c235678447ee903afbf15228e40de.tar.gz | |
Simplify monadic code
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 9 | ||||
| -rw-r--r-- | compiler/main/GHC.hs | 14 |
2 files changed, 10 insertions, 13 deletions
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index 5866568619..458a118912 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1283,12 +1283,11 @@ runPhase (RealPhase (As with_cpp)) input_fn dflags = do -- LLVM from version 3.0 onwards doesn't support the OS X system -- assembler, so we use clang as the assembler instead. (#5636) - let whichAsProg | hscTarget dflags == HscLlvm && - platformOS (targetPlatform dflags) == OSDarwin - = return SysTools.runClang - | otherwise = return SysTools.runAs + let as_prog | hscTarget dflags == HscLlvm && + platformOS (targetPlatform dflags) == OSDarwin + = SysTools.runClang + | otherwise = SysTools.runAs - as_prog <- whichAsProg let cmdline_include_paths = includePaths dflags let pic_c_flags = picCCOpts dflags diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs index 4e6e0f43c2..9fa8911d76 100644 --- a/compiler/main/GHC.hs +++ b/compiler/main/GHC.hs @@ -683,14 +683,12 @@ checkNewInteractiveDynFlags :: MonadIO m => DynFlags -> m DynFlags checkNewInteractiveDynFlags dflags0 = do -- We currently don't support use of StaticPointers in expressions entered on -- the REPL. See #12356. - dflags1 <- - if xopt LangExt.StaticPointers dflags0 - then do liftIO $ printOrThrowWarnings dflags0 $ listToBag - [mkPlainWarnMsg dflags0 interactiveSrcSpan - $ text "StaticPointers is not supported in GHCi interactive expressions."] - return $ xopt_unset dflags0 LangExt.StaticPointers - else return dflags0 - return dflags1 + if xopt LangExt.StaticPointers dflags0 + then do liftIO $ printOrThrowWarnings dflags0 $ listToBag + [mkPlainWarnMsg dflags0 interactiveSrcSpan + $ text "StaticPointers is not supported in GHCi interactive expressions."] + return $ xopt_unset dflags0 LangExt.StaticPointers + else return dflags0 -- %************************************************************************ |