diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-02-28 13:00:12 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-02-28 13:12:44 +0000 |
| commit | ce9f8051cf028e277fc50183ce26d8432644c1ea (patch) | |
| tree | 39fa15daab236337d8e0abb93f7f49278a087e57 /compiler/main | |
| parent | d3788e17430f05390ae59b31f62ebae19692b00f (diff) | |
| download | haskell-ce9f8051cf028e277fc50183ce26d8432644c1ea.tar.gz | |
Small refactoring: Don't pass redundant stop_phase to runPipeline
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index 3ece6e76ec..d6c46ee959 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -548,7 +548,7 @@ runPipeline stop_phase hsc_env0 (input_fn, mb_phase) ++ input_fn)) debugTraceMsg dflags 4 (text "Running the pipeline") - r <- runPipeline' start_phase stop_phase hsc_env env input_fn + r <- runPipeline' start_phase hsc_env env input_fn maybe_loc maybe_stub_o -- If we are compiling a Haskell module, and doing @@ -566,21 +566,20 @@ runPipeline stop_phase hsc_env0 (input_fn, mb_phase) Temporary -> Temporary env' = env { output_spec = output' } hsc_env' <- newHscEnv dflags' - _ <- runPipeline' start_phase stop_phase hsc_env' env' input_fn + _ <- runPipeline' start_phase hsc_env' env' input_fn maybe_loc maybe_stub_o return () return r runPipeline' :: Phase -- ^ When to start - -> Phase -- ^ When to stop -> HscEnv -- ^ Compilation environment -> PipeEnv -> FilePath -- ^ Input filename -> Maybe ModLocation -- ^ A ModLocation, if this is a Haskell module -> Maybe FilePath -- ^ stub object, if we have one -> IO (DynFlags, FilePath) -- ^ (final flags, output filename) -runPipeline' start_phase stop_phase hsc_env env input_fn +runPipeline' start_phase hsc_env env input_fn maybe_loc maybe_stub_o = do -- Execute the pipeline... @@ -599,8 +598,9 @@ runPipeline' start_phase stop_phase hsc_env env input_fn Temporary -> return (dflags, output_fn) output -> - do final_fn <- getOutputFilename stop_phase output (src_basename env) - dflags stop_phase maybe_loc + do let stopPhase = stop_phase env + final_fn <- getOutputFilename stopPhase output (src_basename env) + dflags stopPhase maybe_loc when (final_fn /= output_fn) $ do let msg = ("Copying `" ++ output_fn ++"' to `" ++ final_fn ++ "'") line_prag = Just ("{-# LINE 1 \"" ++ input_fn ++ "\" #-}\n") |