diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-01-03 15:53:43 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-01-18 16:12:50 -0500 |
| commit | 310424d05836ee8788c7c79f98243ef92330f5f1 (patch) | |
| tree | b40ca68ef5807c92dcce745081ac6bc4011f1d65 /compiler/Language | |
| parent | 18c797b80b938b648704f118dacbfe8655aaeea5 (diff) | |
| download | haskell-310424d05836ee8788c7c79f98243ef92330f5f1.tar.gz | |
Correct type of static forms in hsExprType
The simplest way to do this seemed to be to persist the whole type in
the extension field from the typechecker so that the few relevant places
* Desugaring can work out the return type by splitting this type rather
than calling `dsExpr` (slightly more efficient).
* hsExprType can just return the correct type.
* Zonking has to now zonk the type as well
The other option we considered was wiring in StaticPtr but that is
actually quite tricky because StaticPtr refers to StaticPtrInfo which
has field selectors (which we can't easily wire in).
Fixes #20150
Diffstat (limited to 'compiler/Language')
| -rw-r--r-- | compiler/Language/Haskell/Syntax/Expr.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/Language/Haskell/Syntax/Expr.hs b/compiler/Language/Haskell/Syntax/Expr.hs index e6ce12f8ae..0baaeaa148 100644 --- a/compiler/Language/Haskell/Syntax/Expr.hs +++ b/compiler/Language/Haskell/Syntax/Expr.hs @@ -637,7 +637,7 @@ data HsExpr p -- | - 'GHC.Parser.Annotation.AnnKeywordId' : 'GHC.Parser.Annotation.AnnStatic', -- For details on above see note [exact print annotations] in GHC.Parser.Annotation - | HsStatic (XStatic p) -- Free variables of the body + | HsStatic (XStatic p) -- Free variables of the body, and type after typechecking (LHsExpr p) -- Body --------------------------------------- |