[commit: ghc] wip/T15449, wip/T16188, wip/llvm-configure-opts: Comments only (616b2ef)
git at git.haskell.org
git at git.haskell.org
Sun Feb 10 21:31:04 UTC 2019
Repository : ssh://git@git.haskell.org/ghc
On branches: wip/T15449,wip/T16188,wip/llvm-configure-opts
Link : http://ghc.haskell.org/trac/ghc/changeset/616b2ef50d0a4c7cdcda97439936ea31b9a37d09/ghc
>---------------------------------------------------------------
commit 616b2ef50d0a4c7cdcda97439936ea31b9a37d09
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Fri Jan 18 17:12:13 2019 +0000
Comments only
>---------------------------------------------------------------
616b2ef50d0a4c7cdcda97439936ea31b9a37d09
compiler/typecheck/TcBinds.hs | 2 +-
compiler/typecheck/TcExpr.hs | 2 +-
compiler/typecheck/TcType.hs | 13 +++++++++----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/compiler/typecheck/TcBinds.hs b/compiler/typecheck/TcBinds.hs
index abdce58..05fe393 100644
--- a/compiler/typecheck/TcBinds.hs
+++ b/compiler/typecheck/TcBinds.hs
@@ -1267,7 +1267,7 @@ tcMonoBinds is_rec sig_fn no_gen
do { ((co_fn, matches'), rhs_ty)
<- tcInferInst $ \ exp_ty ->
-- tcInferInst: see TcUnify,
- -- Note [Deep instantiation of InferResult]
+ -- Note [Deep instantiation of InferResult] in TcUnify
tcExtendBinderStack [TcIdBndr_ExpType name exp_ty NotTopLevel] $
-- We extend the error context even for a non-recursive
-- function so that in type error messages we show the
diff --git a/compiler/typecheck/TcExpr.hs b/compiler/typecheck/TcExpr.hs
index 0e09008..b87f877 100644
--- a/compiler/typecheck/TcExpr.hs
+++ b/compiler/typecheck/TcExpr.hs
@@ -1274,7 +1274,7 @@ tcInferFun (L loc (HsRecFld _ f))
tcInferFun fun
= tcInferSigma fun
-- NB: tcInferSigma; see TcUnify
- -- Note [Deep instantiation of InferResult]
+ -- Note [Deep instantiation of InferResult] in TcUnify
----------------
diff --git a/compiler/typecheck/TcType.hs b/compiler/typecheck/TcType.hs
index b2c9b32..a7ba6b7 100644
--- a/compiler/typecheck/TcType.hs
+++ b/compiler/typecheck/TcType.hs
@@ -364,11 +364,16 @@ data ExpType = Check TcType
data InferResult
= IR { ir_uniq :: Unique -- For debugging only
+
, ir_lvl :: TcLevel -- See Note [TcLevel of ExpType] in TcMType
- , ir_inst :: Bool -- True <=> deeply instantiate before returning
- -- i.e. return a RhoType
- -- False <=> do not instantiate before returning
- -- i.e. return a SigmaType
+
+ , ir_inst :: Bool
+ -- True <=> deeply instantiate before returning
+ -- i.e. return a RhoType
+ -- False <=> do not instantiate before returning
+ -- i.e. return a SigmaType
+ -- See Note [Deep instantiation of InferResult] in TcUnify
+
, ir_ref :: IORef (Maybe TcType) }
-- The type that fills in this hole should be a Type,
-- that is, its kind should be (TYPE rr) for some rr
More information about the ghc-commits
mailing list