diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/deSugar/Desugar.lhs | 7 | ||||
| -rw-r--r-- | compiler/main/HscMain.hs | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/compiler/deSugar/Desugar.lhs b/compiler/deSugar/Desugar.lhs index bb70aaac7e..b65304a118 100644 --- a/compiler/deSugar/Desugar.lhs +++ b/compiler/deSugar/Desugar.lhs @@ -92,12 +92,7 @@ deSugar hsc_env ; let export_set = availsToNameSet exports ; let target = hscTarget dflags ; let hpcInfo = emptyHpcInfo other_hpc_info - ; (msgs, mb_res) - <- case target of - HscNothing -> - return (emptyMessages, - Just ([], nilOL, [], [], NoStubs, hpcInfo, emptyModBreaks)) - _ -> do + ; (msgs, mb_res) <- do let want_ticks = gopt Opt_Hpc dflags || target == HscInterpreted diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs index d94fc7842f..2c2df87b7c 100644 --- a/compiler/main/HscMain.hs +++ b/compiler/main/HscMain.hs @@ -637,6 +637,7 @@ hscCompileOneShot hsc_env extCore_filename mod_summary src_changed compile mb_old_hash reason = runHsc hsc_env' $ do liftIO $ msg reason tc_result <- genericHscFrontend mod_summary + guts0 <- hscDesugar' (ms_location mod_summary) tc_result dflags <- getDynFlags case hscTarget dflags of HscNothing -> return HscNotGeneratingCode @@ -647,8 +648,7 @@ hscCompileOneShot hsc_env extCore_filename mod_summary src_changed liftIO $ hscWriteIface dflags iface changed mod_summary return HscUpdateBoot _ -> - do guts0 <- hscDesugar' (ms_location mod_summary) tc_result - guts <- hscSimplify' guts0 + do guts <- hscSimplify' guts0 (iface, changed, _details, cgguts) <- hscNormalIface' extCore_filename guts mb_old_hash liftIO $ hscWriteIface dflags iface changed mod_summary return $ HscRecomp cgguts mod_summary |