diff options
| author | Luite Stegeman <stegeman@gmail.com> | 2021-01-22 00:09:17 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-03-20 07:49:15 -0400 |
| commit | 1f94e0f7601f8e22fdd81a47f130650265a44196 (patch) | |
| tree | d06d02317049b56763b2f1da27f71f3663efa5a0 /compiler/GHC/Core | |
| parent | 7de3532f0317032f75b76150c5d3a6f76178be04 (diff) | |
| download | haskell-1f94e0f7601f8e22fdd81a47f130650265a44196.tar.gz | |
Generate GHCi bytecode from STG instead of Core and support unboxed
tuples and sums.
fixes #1257
Diffstat (limited to 'compiler/GHC/Core')
| -rw-r--r-- | compiler/GHC/Core/Lint.hs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/compiler/GHC/Core/Lint.hs b/compiler/GHC/Core/Lint.hs index 7edc0d7a28..a3ea0bb1d3 100644 --- a/compiler/GHC/Core/Lint.hs +++ b/compiler/GHC/Core/Lint.hs @@ -17,6 +17,8 @@ module GHC.Core.Lint ( lintPassResult, lintInteractiveExpr, lintExpr, lintAnnots, lintAxioms, + interactiveInScope, + -- ** Debug output endPass, endPassIO, displayLintResults, dumpPassResult, @@ -379,7 +381,7 @@ lintPassResult hsc_env pass binds | not (gopt Opt_DoCoreLinting dflags) = return () | otherwise - = do { let warns_and_errs = lintCoreBindings dflags pass (interactiveInScope hsc_env) binds + = do { let warns_and_errs = lintCoreBindings dflags pass (interactiveInScope $ hsc_IC hsc_env) binds ; Err.showPass logger dflags ("Core Linted result of " ++ showPpr dflags pass) ; displayLintResults logger dflags (showLintWarnings pass) (ppr pass) (pprCoreBindings binds) warns_and_errs } @@ -432,7 +434,7 @@ lintInteractiveExpr :: SDoc -- ^ The source of the linted expression lintInteractiveExpr what hsc_env expr | not (gopt Opt_DoCoreLinting dflags) = return () - | Just err <- lintExpr dflags (interactiveInScope hsc_env) expr + | Just err <- lintExpr dflags (interactiveInScope $ hsc_IC hsc_env) expr = displayLintResults logger dflags False what (pprCoreExpr expr) (emptyBag, err) | otherwise = return () @@ -440,7 +442,7 @@ lintInteractiveExpr what hsc_env expr dflags = hsc_dflags hsc_env logger = hsc_logger hsc_env -interactiveInScope :: HscEnv -> [Var] +interactiveInScope :: InteractiveContext -> [Var] -- In GHCi we may lint expressions, or bindings arising from 'deriving' -- clauses, that mention variables bound in the interactive context. -- These are Local things (see Note [Interactively-bound Ids in GHCi] in GHC.Runtime.Context). @@ -452,11 +454,10 @@ interactiveInScope :: HscEnv -> [Var] -- so this is a (cheap) no-op. -- -- See #8215 for an example -interactiveInScope hsc_env +interactiveInScope ictxt = tyvars ++ ids where -- C.f. GHC.Tc.Module.setInteractiveContext, Desugar.deSugarExpr - ictxt = hsc_IC hsc_env (cls_insts, _fam_insts) = ic_instances ictxt te1 = mkTypeEnvWithImplicits (ic_tythings ictxt) te = extendTypeEnvWithIds te1 (map instanceDFunId cls_insts) |