diff options
| author | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2021-04-06 15:51:38 +0300 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-05-23 18:53:13 -0400 |
| commit | d82d38239f232c3970a8641bb6d47d436e3cbc11 (patch) | |
| tree | 55b162143144486cddda1b2a2a7ca0b7eb373a1c /compiler/GHC/Iface/Ext | |
| parent | 82c6a9394b0457e77bc8b03e3594111b51508469 (diff) | |
| download | haskell-d82d38239f232c3970a8641bb6d47d436e3cbc11.tar.gz | |
Introduce Strict.Maybe, Strict.Pair (#19156)
This patch fixes a space leak related to the use of
Maybe in RealSrcSpan by introducing a strict variant
of Maybe.
In addition to that, it also introduces a strict pair
and uses the newly introduced strict data types in a few
other places (e.g. the lexer/parser state) to reduce
allocations.
Includes a regression test.
Diffstat (limited to 'compiler/GHC/Iface/Ext')
| -rw-r--r-- | compiler/GHC/Iface/Ext/Ast.hs | 3 | ||||
| -rw-r--r-- | compiler/GHC/Iface/Ext/Utils.hs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/GHC/Iface/Ext/Ast.hs b/compiler/GHC/Iface/Ext/Ast.hs index bbfd7294c5..c9cbd4b723 100644 --- a/compiler/GHC/Iface/Ext/Ast.hs +++ b/compiler/GHC/Iface/Ext/Ast.hs @@ -59,6 +59,7 @@ import GHC.Utils.Panic.Plain import GHC.Utils.Misc import GHC.Data.Maybe import GHC.Data.FastString +import qualified GHC.Data.Strict as Strict import GHC.Iface.Ext.Types import GHC.Iface.Ext.Utils @@ -352,7 +353,7 @@ enrichHie ts (hsGrp, imports, exports, _) ev_bs insts tcs = top_ev_asts :: [HieAST Type] <- do let l :: SrcSpanAnnA - l = noAnnSrcSpan (RealSrcSpan (realSrcLocSpan $ mkRealSrcLoc file 1 1) Nothing) + l = noAnnSrcSpan (RealSrcSpan (realSrcLocSpan $ mkRealSrcLoc file 1 1) Strict.Nothing) toHie $ EvBindContext ModuleScope Nothing $ L l (EvBinds ev_bs) diff --git a/compiler/GHC/Iface/Ext/Utils.hs b/compiler/GHC/Iface/Ext/Utils.hs index 0a9150f532..37252c43bc 100644 --- a/compiler/GHC/Iface/Ext/Utils.hs +++ b/compiler/GHC/Iface/Ext/Utils.hs @@ -26,6 +26,7 @@ import GHC.Core.Type import GHC.Types.Var import GHC.Types.Var.Env import GHC.Parser.Annotation +import qualified GHC.Data.Strict as Strict import GHC.Iface.Ext.Types @@ -546,7 +547,7 @@ combineScopes _ ModuleScope = ModuleScope combineScopes NoScope x = x combineScopes x NoScope = x combineScopes (LocalScope a) (LocalScope b) = - mkScope $ combineSrcSpans (RealSrcSpan a Nothing) (RealSrcSpan b Nothing) + mkScope $ combineSrcSpans (RealSrcSpan a Strict.Nothing) (RealSrcSpan b Strict.Nothing) mkSourcedNodeInfo :: NodeOrigin -> NodeInfo a -> SourcedNodeInfo a mkSourcedNodeInfo org ni = SourcedNodeInfo $ M.singleton org ni |