summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-06-04 18:59:24 -0400
committerBen Gamari <ben@smart-cactus.org>2019-06-04 18:59:24 -0400
commit686bd33a05aa2b9ce726828e5756f97fc966cefd (patch)
tree715819bdf96e6837ddb4dd83a322804c4b4ce756
parent15752087bbad868bdaa00bf82bed408aea2b339a (diff)
downloadhaskell-686bd33a05aa2b9ce726828e5756f97fc966cefd.tar.gz
Fix ghc-in-ghci
-rw-r--r--compiler/main/GhcMake.hs12
1 files changed, 6 insertions, 6 deletions
diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs
index e74b84eb3a..03e0cb341a 100644
--- a/compiler/main/GhcMake.hs
+++ b/compiler/main/GhcMake.hs
@@ -2063,8 +2063,8 @@ downsweep hsc_env old_summaries excl_mods allow_dup_roots
-- and .o file locations to be temporary files.
-- See Note [-fno-code mode]
enableCodeGenForTH :: HscTarget
- -> NodeMap [Either ErrMsg ModSummary]
- -> IO (NodeMap [Either ErrMsg ModSummary])
+ -> NodeMap [Either ErrorMessages ModSummary]
+ -> IO (NodeMap [Either ErrorMessages ModSummary])
enableCodeGenForTH =
enableCodeGenWhen condition should_modify TFL_CurrentModule TFL_GhcSession
where
@@ -2083,8 +2083,8 @@ enableCodeGenForTH =
-- This is used used in order to load code that uses unboxed tuples
-- into GHCi while still allowing some code to be interpreted.
enableCodeGenForUnboxedTuples :: HscTarget
- -> NodeMap [Either ErrMsg ModSummary]
- -> IO (NodeMap [Either ErrMsg ModSummary])
+ -> NodeMap [Either ErrorMessages ModSummary]
+ -> IO (NodeMap [Either ErrorMessages ModSummary])
enableCodeGenForUnboxedTuples =
enableCodeGenWhen condition should_modify TFL_GhcSession TFL_CurrentModule
where
@@ -2106,8 +2106,8 @@ enableCodeGenWhen
-> TempFileLifetime
-> TempFileLifetime
-> HscTarget
- -> NodeMap [Either ErrMsg ModSummary]
- -> IO (NodeMap [Either ErrMsg ModSummary])
+ -> NodeMap [Either ErrorMessages ModSummary]
+ -> IO (NodeMap [Either ErrorMessages ModSummary])
enableCodeGenWhen condition should_modify staticLife dynLife target nodemap =
traverse (traverse (traverse enable_code_gen)) nodemap
where