diff options
author | Ben Gamari <ben@smart-cactus.org> | 2019-11-07 14:31:15 -0500 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-11-13 07:06:49 -0500 |
commit | 2d4f9ad89cb7e79c1f90983bf4898a5f4e3c7457 (patch) | |
tree | 9c73c3ae3db627e91910929488b9076aa771409d /compiler/ghci | |
parent | 535d0edc11e66a9a0bdfda676dd614833d86df68 (diff) | |
download | haskell-2d4f9ad89cb7e79c1f90983bf4898a5f4e3c7457.tar.gz |
Ensure that coreView/tcView are able to inline
Previously an import cycle between Type and TyCoRep meant that several
functions in TyCoRep ended up SOURCE import coreView. This is quite
unfortunate as coreView is intended to be fused into a larger pattern
match and not incur an extra call.
Fix this with a bit of restructuring:
* Move the functions in `TyCoRep` which depend upon things in `Type`
into `Type`
* Fold contents of `Kind` into `Type` and turn `Kind` into a simple
wrapper re-exporting kind-ish things from `Type`
* Clean up the redundant imports that popped up as a result
Closes #17441.
Metric Decrease:
T4334
Diffstat (limited to 'compiler/ghci')
-rw-r--r-- | compiler/ghci/ByteCodeGen.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/ghci/ByteCodeGen.hs b/compiler/ghci/ByteCodeGen.hs index b7b0d95217..fb60c21f9d 100644 --- a/compiler/ghci/ByteCodeGen.hs +++ b/compiler/ghci/ByteCodeGen.hs @@ -38,12 +38,12 @@ import PrimOp import CoreFVs import Type import RepType -import Kind ( isLiftedTypeKind ) import DataCon import TyCon import Util import VarSet import TysPrim +import TyCoPpr ( pprType ) import ErrUtils import Unique import FastString |