Simon Peyton Jones pushed to branch wip/T27731 at Glasgow Haskell Compiler / GHC
Commits:
415136a0 by Simon Peyton Jones at 2026-09-17T11:20:17+01:00
More wibbles
Some renaming
And do insoluble implications before the less-serious constraints
- - - - -
8 changed files:
- compiler/GHC/Rename/Module.hs
- compiler/GHC/Tc/Errors.hs
- compiler/GHC/Tc/Errors/Ppr.hs
- compiler/GHC/Tc/Errors/Types.hs
- compiler/GHC/Tc/Instance/Family.hs
- compiler/GHC/Tc/Solver/Default.hs
- compiler/GHC/Tc/Types/Constraint.hs
- compiler/GHC/Tc/Utils/Monad.hs
Changes:
=====================================
compiler/GHC/Rename/Module.hs
=====================================
@@ -2517,8 +2517,8 @@ rnInjectivityAnn :: LHsQTyVars GhcRn -- ^ Type variables declared in
rnInjectivityAnn tvBndrs (L _ (TyVarSig _ resTv))
(L srcSpan (InjectivityAnn x injFrom injTo))
= do
- { (injDecl'@(L _ (InjectivityAnn _ injFrom' injTo')), noRnErrors)
- <- askNoErrs $
+ { (injDecl'@(L _ (InjectivityAnn _ injFrom' injTo')), rn_errors)
+ <- askErrsFound $
bindLocalNames (maybeToList (hsLTyVarName resTv)) $
-- The return type variable scopes over the injectivity annotation
-- e.g. type family F a = (r::*) | r -> a
@@ -2540,11 +2540,11 @@ rnInjectivityAnn tvBndrs (L _ (TyVarSig _ resTv))
-- if renaming of type variables ended with errors (eg. there were
-- not-in-scope variables) don't check the validity of injectivity
-- annotation. This gives better error messages.
- ; when (noRnErrors && not lhsValid) $
+ ; unless (rn_errors || lhsValid) $
addErrAt (getLocA injFrom) $
TcRnIncorrectTyVarOnLhsOfInjCond resName injFrom
- ; when (noRnErrors && not (Set.null rhsValid)) $
+ ; unless (rn_errors || Set.null rhsValid) $
do { let errorVars = Set.toList rhsValid
; addErrAt (locA srcSpan) $
TcRnUnknownTyVarsOnRhsOfInjCond errorVars } } }
@@ -2561,7 +2561,7 @@ rnInjectivityAnn tvBndrs (L _ (TyVarSig _ resTv))
-- this time we expect "result" to be reported not in scope by rnLTyVar.
rnInjectivityAnn _ _ (L srcSpan (InjectivityAnn x injFrom injTo)) =
setSrcSpanA srcSpan $ do
- (injDecl', _) <- askNoErrs $ do
+ (injDecl', _) <- askErrsFound $ do
injFrom' <- rnLTyVar injFrom
injTo' <- mapM rnLTyVar injTo
return $ L srcSpan (InjectivityAnn x (fmap greName injFrom') (fmap (fmap greName) injTo'))
=====================================
compiler/GHC/Tc/Errors.hs
=====================================
@@ -262,7 +262,7 @@ report_unsolved type_errors expr_holes
, cec_expr_holes = expr_holes
, cec_type_holes = type_holes
, cec_out_of_scope_holes = out_of_scope_holes
- , cec_suppress = False
+ , cec_outer_err = False
, cec_warn_redundant = warn_redundant
, cec_expand_syns = exp_syns
, cec_binds = binds_var }
@@ -317,26 +317,26 @@ we just switch off deferred type errors altogether. See #14605.
This is done by maybeSwitchOffDefer. It's also useful in one other
place: see Note [Wrapping failing kind equalities] in GHC.Tc.Solver.
-Note [cec_suppress: suppressing less-important error messages]
+Note [cec_outer_err: suppressing less-important error messages]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The cec_suppress flag says "don't report any less-important errors". Instead, just create
+The cec_outer_err flag says "don't report any less-important errors". Instead, just create
evidence bindings (as usual). It's used when more important errors have occurred
-(or will occur) eleswhere.
+(or will occur) elsewhere.
(SLIE0)
- * Note that `cec_suppress` does not affect more-important errors, namely the `report1`
+ * Note that `cec_outer_err` does not affect more-important errors, namely the `report1`
group in `reportWanteds`
- * But `cec_suppress` /does/ affect the less-important errors, namely the `report2` group.
+ * But `cec_outer_err` /does/ affect the less-important errors, namely the `report2` group.
To see this, look at the plumbing of cec suppress in `reportWanteds`
-(SLIE1) When we begin `reportAllUnsolved` we set `cec_suppress` if there are insoluble
+(SLIE1) When we begin `reportAllUnsolved` we set `cec_outer_err` if there are insoluble
wanteds /anywhere/ in the tree, via `insolubleWC`. That means we'll suppress all
less-important errors in favour of the more important (insolbule) ones
(SLIE2) But we need to take care: flags can turn errors into warnings, and we
don't want those warnings to suppress subsequent errors (including
suppressing the essential addTcEvBind for them: #15152). So in
- tryReporter we use askNoErrs to see if any error messages were
+ tryReporter we use askErrsFound to see if any error messages were
/actually/ produced; if not, we don't switch on suppression.
A consequence is that warnings never suppress warnings, so turning an
@@ -344,11 +344,11 @@ evidence bindings (as usual). It's used when more important errors have occurre
previously suppressed. (e.g. partial-sigs/should_fail/T14584)
(SLIE3) There is a tricky interaction between
- * `cec_suppress` (a global flag) and
+ * `cec_outer_err` (a global flag) and
* `ei_suppress` (a local, per-error-item flag),
see Note [ei_suppress: suppressing confusing errors]
- Suppose the global `cec_suppress` is True because of an insoluble constraint
+ Suppose the global `cec_outer_err` is True because of an insoluble constraint
arising from a superclass constraint of an unsolved dictionary `[W] d::C a`.
This constraint will have ei_suppress=True. We must not suppress that less-insoluble
constraint `[W] d::C a`, lest we get no error at all (#18851).
@@ -379,23 +379,27 @@ Which errors should be suppressed?
There are wrinkles
-(SCE3) In rare cases we may suppress /all/ errors. That is catastrophic: GHC proceeds
- to desugar and optimise the program, even though it is full of type errors (#22702,
- #22793), and/or we fail to bind evidence (#27731).
+(SCE3) In rare cases, `ei_suppress` may be True for /all/ errors in the Wanteds
+ of an implication. Then we may report no error at all. And if the entire
+ tree has this property (e.g. there is only one implication) we get
+ catastrophe: GHC proceeds to desugar and optimise the program, even though it
+ is full of type errors (#22702, #22793), and/or we fail to bind evidence
+ (#27731).
- If this happens, unless we are sure that an error will be reported some other way
- (details in the defn of `tidy_items` in `reportWanteds), we just un-suppress the lot,
- which is brutal but safe. It's a rare case.
+ Solution: if all the Wanted constraints of an implication have `ei_suppress` set,
+ just un-suppress all of them. Brutal but safe. It's a rare case.
How can it happen that there are /all/ errors are suppressed?
* See test T18851 for an example of how it is (just, barely) possible for the
/only/ errors to be superclass-of-Wanted constraints.
+
* Similarly #27731, which also involves a superclass-of-Wanted:
class (a ~ F b) => Ren a b
If we have a [W] Ren a b, we'll emit the superclass [W] a ~ F b, which will
rewrite the original class constraint to [W] Ren (F b) b. Now we have two
constraints: one has a non-empty rewriter set (SEC1) and one is a superclass of
a Wanted (SEC2).
+
* Also see Wrinkle (PER2) in Note [Prioritise Wanteds with empty
CoHoleSet] in GHC.Tc.Types.Constraint.
@@ -482,7 +486,7 @@ reportImplic ctxt implic@(Implic { ic_skols = tvs
, cec_encl = implic' : cec_encl ctxt
-- NO LONGER NEEDED
--- , cec_suppress = cec_suppress ctxt
+-- , cec_outer_err = cec_outer_err ctxt
-- Suppress inessential errors if there
-- are insolubles anywhere in the
-- tree rooted here, or we've come across
@@ -542,6 +546,26 @@ reportBadTelescope ctxt env (ForAllSkol telescope) skols
reportBadTelescope _ _ skol_info skols
= pprPanic "reportBadTelescope" (ppr skol_info $$ ppr skols)
+
+
+mkErrorItems :: SolverReportErrCtxt -> [Ct] -> TcM [ErrorItem]
+-- Turn each constraint into an ErrorItem
+-- Make sure that they aren't all suppressed via ei_suppress
+mkErrorItems ctxt cts
+ = do { items <- mapMaybeM mkErrorItem cts
+
+ -- Catch an awkward (and probably rare) case in which /all/ errors are
+ -- suppressed: see (SCE3) in Note [ei_suppress: suppressing confusing errors]
+ ; return (if need_to_unsuppress items
+ then map unsuppressErrorItem items
+ else items) }
+ where
+ need_to_unsuppress items
+ = not (cec_outer_err ctxt) -- Have not already reported an error
+ -- in an outer implication); see #21405
+ && not (any ignoreConstraint cts) -- No error is ignorable (is reported elsewhere)
+ && all ei_suppress items -- All errors are suppressed
+
-- | Makes an error item from a constraint, calculating whether or not the item
-- should be suppressed. See Note [Wanteds rewrite Wanteds: rewriter-sets]
-- in GHC.Tc.Types.Constraint. Returns Nothing if we should just ignore
@@ -573,9 +597,8 @@ mkErrorItem ct
, ei_suppress = suppressCtError ev }}
-- | Actually report this 'ErrorItem'.
--- NOT NEEDED ANY MORE
---unsuppressErrorItem :: ErrorItem -> ErrorItem
--- unsuppressErrorItem ei = ei { ei_suppress = False }
+unsuppressErrorItem :: ErrorItem -> ErrorItem
+unsuppressErrorItem ei = ei { ei_suppress = False }
-- | Should we completely ignore this constraint in error reporting?
-- It *must* be the case that any constraint for which this returns True
@@ -651,39 +674,20 @@ reportWanteds ctxt tc_lvl wc@(WC { wc_simple = simples, wc_impl = implics
| otherwise
= do { let tidy_cts = bagToList (mapBag (tidyCt env) simples)
tidy_errs = bagToList (mapBag (tidyDelayedError env) errs)
+ ; tidy_items <- mkErrorItems ctxt tidy_cts
- ; tidy_items1 <- mapMaybeM mkErrorItem tidy_cts
-
- -- Catch an awkward (and probably rare) case in which /all/ errors are
- -- suppressed: see (SCE3) in Note [ei_suppress: suppressing confusing errors]
--- ; errs_already <- ifErrsM (return True) (return False)
- ; let tidy_items
--- NO LONGER NEEDED
--- | not errs_already -- Have not already reported an error (perhaps
--- -- from an outer implication); see #21405
--- , not (any ignoreConstraint simples) -- No error is ignorable (is reported elsewhere)
--- , all ei_suppress tidy_items1 -- All errors are suppressed
--- = map unsuppressErrorItem tidy_items1
---
--- | otherwise
- = tidy_items1
-
- ; traceTc "reportWanteds 1" (vcat [ text "Simples =" <+> ppr simples
- , text "Suppress =" <+> ppr (cec_suppress ctxt)
+ ; traceTc "reportWanteds 1" (vcat [ text "Simples =" <+> ppr simples
+ , text "Suppress =" <+> ppr (cec_outer_err ctxt)
, text "tidy_cts =" <+> ppr tidy_cts
- , text "tidy_items1 =" <+> ppr tidy_items1
- , text "tidy_errs =" <+> ppr tidy_errs ])
+ , text "tidy_items =" <+> ppr tidy_items
+ , text "tidy_errs =" <+> ppr tidy_errs ])
; let (out_of_scope, other_holes, not_conc_errs, mult_co_errs)
= partition_errors tidy_errs
- -- Don't suppress out-of-scope errors
- -- See (SLIE0) in Note [cec_suppress: suppressing less-important error messages]
--- ctxt_for_scope_errs = ctxt { cec_suppress = False }
-
-- First, deal with any out-of-scope errors:
- ; (_, no_out_of_scope) <- askNoErrs $
- reportHoles ctxt tidy_items out_of_scope
+ ; (_, out_of_scope_errs) <- askErrsFound $
+ reportHoles ctxt tidy_items out_of_scope
-- Don't suppress holes or concreteness errors, ever
; reportHoles ctxt tidy_items other_holes
@@ -702,42 +706,49 @@ reportWanteds ctxt tc_lvl wc@(WC { wc_simple = simples, wc_impl = implics
-- or Int ~ t a (AppTy on one side)
--
-- First visible ones, then invisible ones; but all serious
- ; let suppress_insols = not no_out_of_scope
- -- Serious errors are not suppressed by cec_suppress,
- -- hence not including cec_suppress in suppress_insols
- -- See (SLIE0) in Note [cec_suppress: suppressing less-important
- -- error messages]
+ ; let suppress_insols = out_of_scope_errs
+ -- Serious errors are not suppressed by cec_outer_err,
+ -- hence not including cec_outer_err in suppress_insols
+ -- See (SLIE0) in Note [cec_outer_err: suppressing less-important
+ -- error messages]
(vis_items, invis_items)
= partition (isVisibleOrigin . errorItemOrigin) tidy_items
- ; (vis_items1, no_vis_serious_errs)
- <- askNoErrs $
+ ; (vis_items1, vis_serious_errs)
+ <- askErrsFound $
tryReporters ctxt suppress_insols serious_reporters vis_items
- ; let suppress_invis = suppress_insols || not no_vis_serious_errs
- ; (invis_items1, no_invis_serious_errs)
- <- askNoErrs $
+ ; let suppress_invis = suppress_insols || vis_serious_errs
+ ; (invis_items1, invis_serious_errs)
+ <- askErrsFound $
tryReporters ctxt suppress_invis serious_reporters invis_items
- -- Now take account of the inherited cec_suppress, and augment it
+ -- Now take account of the inherited cec_outer_err, and augment it
-- to suppress further errors if we have found any serious errors locally
- ; let suppress_rest = cec_suppress ctxt
+ ; let suppress_implics = cec_outer_err ctxt
|| suppress_invis
- || not no_invis_serious_errs
-
- -- Next, deal with the less-serious constraints
+ || invis_serious_errs
+ ctxt_for_implics = ctxt { cec_outer_err = suppress_implics }
+ (insol_implics, other_implics) = partitionBag insolubleImplic implics
+
+ -- Next, deal with the insoluble implications
+ ; (_, implic_errs)
+ <- askErrsFound $ mapBagM_ (reportImplic ctxt_for_implics) insol_implics
+
+ -- Finally, deal with the less-serious constraints,
+ -- both local and implications
+ -- suppressing if any errors have been reported so far
+ ; let suppress_rest = suppress_implics || implic_errs
+ ctxt_for_rest = ctxt { cec_outer_err = suppress_rest }
; leftovers <- tryReporters ctxt suppress_rest less_serious_reporters $
(vis_items1 ++ invis_items1)
+ ; mapBagM_ (reportImplic ctxt_for_rest) other_implics
+
+ -- Check that we have covered all the constraints
; massertPpr (null leftovers)
(text "The following unsolved Wanted constraints \
\have not been reported to the user:"
$$ ppr leftovers)
-
- ; let ctxt_for_rest = ctxt { cec_suppress = suppress_rest }
- ; mapBagM_ (reportImplic ctxt_for_rest) implics
- -- NB ctxt2: don't suppress inner insolubles if there's only a
- -- wanted insoluble here; but do suppress inner insolubles
- -- if there's a *given* insoluble here (= inaccessible code)
}
where
env = cec_tidy ctxt
@@ -758,7 +769,7 @@ reportWanteds ctxt tc_lvl wc@(WC { wc_simple = simples, wc_impl = implics
DE_Multiplicity mult_co loc
-> (es1, es2, es3, (mult_co, loc):es4)
- --serious_reporters: ones that should *not* be suppressed by cec_suppress,
+ --serious_reporters: ones that should *not* be suppressed by cec_outer_err,
-- (i.e. by an insoluble somewhere else in the tree)
serious_reporters
= [ -- We put implicit lifting errors first, because are solid errors
@@ -1054,7 +1065,7 @@ reportHoles :: SolverReportErrCtxt
-> [ErrorItem] -- Other (tidied) constraints
-> [Hole] -- Holes to report
-> TcM ()
--- Ignores cec_suppress
+-- Ignores cec_outer_err
reportHoles ctxt tidy_items holes
= do
diag_opts <- initDiagOpts <$> getDynFlags
@@ -1110,7 +1121,7 @@ zonkTidyTcLclEnvs tidy_env lcls = foldM go (tidy_env, emptyNameEnv) (concatMap c
return (tidy_env', extendNameEnv name_env name tidy_ty)
reportNotConcreteErrs :: SolverReportErrCtxt -> [NotConcreteError] -> TcM ()
--- Ignores cec_suppress
+-- Ignores cec_outer_err
reportNotConcreteErrs _ [] = return ()
reportNotConcreteErrs ctxt errs@(err0:_)
= do { msg <- mkErrorReport (ctLocEnv (nce_loc err0)) diag (Just ctxt) [] []
@@ -1311,7 +1322,7 @@ reportGroup mk_err ctxt items
; err <- mk_err items
; traceTc "About to maybeReportErr" $
vcat [ text "Constraint:" <+> ppr items
- , text "cec_suppress =" <+> ppr (cec_suppress ctxt)
+ , text "cec_outer_err =" <+> ppr (cec_outer_err ctxt)
, text "cec_defer_type_errors =" <+> ppr (cec_defer_type_errors ctxt) ]
; maybeReportError ctxt items err
@@ -1360,9 +1371,9 @@ maybeReportError ctxt items@(item1:|_) (SolverReport { sr_important_msg = import
-- T @X1 T1 ~ T @X2 T2 gives two insolubles: X1~X2 and T1~T2 (KindVType, T17380, T22332b)
--
-- | any ei_insoluble items
--- = False -- Don't suppress insolubles even if cec_suppress is True
+-- = False -- Don't suppress insolubles even if cec_outer_err is True
- | cec_suppress ctxt
+ | cec_outer_err ctxt
= True -- Some earlier error has occurred, so suppress this diagnostic
| all ei_suppress items
@@ -1431,7 +1442,7 @@ mkErrorTerm ct_loc ty ctxt msg supp hints
tryReporters :: SolverReportErrCtxt
-> Bool -- Suppress errors if this is True
- -- (over-riding cec_suppress)
+ -- (over-riding cec_outer_err)
-> [ReporterSpec]
-> [ErrorItem]
-> TcM [ErrorItem]
@@ -1442,8 +1453,8 @@ tryReporters ctxt suppress reporters items
; traceTc "tryReporters }" (ppr items')
; return items' }
where
- -- Use `suppress` to set the `cec_supress` flag for these items
- ctxt_w_suppress = ctxt { cec_suppress = suppress }
+ -- Use `suppress` to set the `cec_outer_err` flag for these items
+ ctxt_w_suppress = ctxt { cec_outer_err = suppress }
go [] items = return items
go (r:rs) items = do { items' <- tryReporter ctxt_w_suppress r items
; go rs items' }
@@ -1490,7 +1501,7 @@ mkErrorReport tcl_env msg mb_ctxt supp hints
{- Note [Always warn with -fdefer-type-errors]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
When -fdefer-type-errors is on we warn about *all* type errors, even
-if cec_suppress is on. This can lead to a lot more warnings than you
+if cec_outer_err is on. This can lead to a lot more warnings than you
would get errors without -fdefer-type-errors, but if we suppress any of
them you might get a runtime error that wasn't warned about at compile
time.
@@ -1550,8 +1561,8 @@ mkIrredErr ctxt items
{- Note [Constructing Hole Errors]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Whether or not 'mkHoleError' returns an error is not influenced by cec_suppress. In other terms,
-these "hole" errors are /not/ suppressed by cec_suppress. We want to see them!
+Whether or not 'mkHoleError' returns an error is not influenced by cec_outer_err. In other terms,
+these "hole" errors are /not/ suppressed by cec_outer_err. We want to see them!
There are two cases to consider:
=====================================
compiler/GHC/Tc/Errors/Ppr.hs
=====================================
@@ -4085,7 +4085,7 @@ instance Outputable SolverReportErrCtxt where
, cec_out_of_scope_holes = osh
, cec_warn_redundant = wr
, cec_expand_syns = es
- , cec_suppress = sup })
+ , cec_outer_err = sup })
= text "CEC" <+> braces (vcat
[ text "cec_binds" <+> equals <+> ppr bvar
, text "cec_defer_type_errors" <+> equals <+> ppr dte
@@ -4094,7 +4094,7 @@ instance Outputable SolverReportErrCtxt where
, text "cec_out_of_scope_holes" <+> equals <+> ppr osh
, text "cec_warn_redundant" <+> equals <+> ppr wr
, text "cec_expand_syns" <+> equals <+> ppr es
- , text "cec_suppress" <+> equals <+> ppr sup ])
+ , text "cec_outer_err" <+> equals <+> ppr sup ])
{- *********************************************************************
* *
=====================================
compiler/GHC/Tc/Errors/Types.hs
=====================================
@@ -5474,10 +5474,10 @@ data SolverReportErrCtxt
, cec_warn_redundant :: Bool -- ^ True <=> -Wredundant-constraints
, cec_expand_syns :: Bool -- ^ True <=> -fprint-expanded-synonyms
- , cec_suppress :: Bool -- ^ True <=> More important errors have occurred,
+ , cec_outer_err :: Bool -- ^ True <=> More important errors have been reported
-- so create bindings if need be, but
-- don't issue any more errors/warnings
- -- See Note [cec_suppress: suppressing less-important error messages]
+ -- See Note [cec_outer_err: suppressing less-important error messages]
}
----------------------------------------------------------------------------
@@ -5508,9 +5508,7 @@ data ErrorItem
, ei_insoluble :: Bool -- True if the constraint is definitely insoluble
-- Cache of `insolubleCt`
- , ei_suppress :: Bool -- Suppress because of
- -- Note [Wanteds rewrite Wanteds: rewriter-sets]
- -- in GHC.Tc.Constraint
+ , ei_suppress :: Bool -- See Note [ei_suppress: suppressing confusing errors]
}
instance Outputable ErrorItem where
=====================================
compiler/GHC/Tc/Instance/Family.hs
=====================================
@@ -618,16 +618,16 @@ addLocalFamInst (home_fie, my_fis) fam_inst
home_fie' = extendFamInstEnv home_fie fam_inst
-- Check for conflicting instance decls and injectivity violations
- ; ((), no_errs) <- askNoErrs $
+ ; ((), has_errs) <- askErrsFound $
do { checkForConflicts inst_envs fam_inst
; checkForInjectivityConflicts inst_envs fam_inst
; checkInjectiveEquation fam_inst
}
- ; if no_errs then
- return (home_fie', fam_inst : my_fis)
+ ; if has_errs then
+ return (home_fie, my_fis)
else
- return (home_fie, my_fis) }
+ return (home_fie', fam_inst : my_fis) }
{-
************************************************************************
=====================================
compiler/GHC/Tc/Solver/Default.hs
=====================================
@@ -998,7 +998,8 @@ last example above.
tryTypeClassDefaulting :: WantedConstraints -> TcS WantedConstraints
tryTypeClassDefaulting wc
- | isEmptyWC wc || insolubleWC wc -- See Note [Defaulting insolubles]
+ | isEmptyWC wc
+ -- || insolubleWC wc -- See Note [Defaulting insolubles]
= return wc
| otherwise -- See Note [When to do type-class defaulting]
= do { something_happened <- applyDefaultingRules wc
=====================================
compiler/GHC/Tc/Types/Constraint.hs
=====================================
@@ -1881,16 +1881,19 @@ approximateWCX include_non_quantifiable wc
float_implic :: Bool -> TcTyCoVarSet -> Implication
-> ApproxWC -> ApproxWC
- float_implic encl_eqs trapping_tvs imp
- = float_wc new_encl_eqs new_trapping_tvs (ic_wanted imp)
+ float_implic encl_eqs trapping_tvs
+ (Implic { ic_wanted = wc, ic_given_eqs = given_eqs
+ , ic_skols = skols, ic_status = status }) acc
+ | isInsolubleStatus status = acc
+ | otherwise = float_wc new_encl_eqs new_trapping_tvs wc acc
where
- new_trapping_tvs = trapping_tvs `extendVarSetList` ic_skols imp
- new_encl_eqs = encl_eqs || ic_given_eqs imp == MaybeGivenEqs
+ new_trapping_tvs = trapping_tvs `extendVarSetList` skols
+ new_encl_eqs = encl_eqs || given_eqs == MaybeGivenEqs
float_ct :: Bool -> TcTyCoVarSet -> Ct
-> ApproxWC -> ApproxWC
float_ct encl_eqs skol_tvs ct acc@(quant, no_quant)
- | isGivenCt ct = acc
+ | isGivenCt ct = acc
-- There can be (insoluble) Given constraints in wc_simple,
-- there so that we get error reports for unreachable code
-- See `given_insols` in GHC.Tc.Solver.Solve.solveImplication
=====================================
compiler/GHC/Tc/Utils/Monad.hs
=====================================
@@ -82,7 +82,7 @@ module GHC.Tc.Utils.Monad(
-- * Shared error message stuff: renamer and typechecker
recoverM, mapAndRecoverM, mapAndReportM, foldAndRecoverM,
attemptM, tryTc,
- askNoErrs, discardErrs,
+ askErrsFound, discardErrs,
tryTcDiscardingErrs,
tryTcDiscardingErrs',
checkNoErrs, whenNoErrs,
@@ -1443,8 +1443,8 @@ checkNoErrs :: TcM r -> TcM r
-- If so, it fails too.
-- Regardless, any errors generated by m are propagated to the enclosing context.
checkNoErrs main
- = do { (res, no_errs) <- askNoErrs main
- ; unless no_errs failM
+ = do { (res, errs_found) <- askErrsFound main
+ ; when errs_found failM
; return res }
-----------------------
@@ -1630,19 +1630,19 @@ capture_messages thing_inside
; return (res, msgs) }
-----------------------
--- (askNoErrs m) runs m
+-- (askErrsFound m) runs m
-- If m fails,
--- then (askNoErrs m) fails, propagating only
+-- then (askErrsFound m) fails, propagating only
-- insoluble constraints
--
-- If m succeeds with result r,
--- then (askNoErrs m) succeeds with result (r, b),
--- where b is True iff m generated no errors
+-- then (askErrsFound m) succeeds with result (r, b),
+-- where b is True iff m generated errors
--
-- Regardless of success or failure,
-- propagate any errors/warnings generated by m
-askNoErrs :: TcRn a -> TcRn (a, Bool)
-askNoErrs thing_inside
+askErrsFound :: TcRn a -> TcRn (a, Bool)
+askErrsFound thing_inside
= do { ((mb_res, lie), msgs) <- capture_messages $
capture_constraints $
tcTryM thing_inside
@@ -1655,7 +1655,7 @@ askNoErrs thing_inside
Just res -> do { emitConstraints lie
; let errs_found = errorsFound msgs
|| insolubleWC lie
- ; return (res, not errs_found) } }
+ ; return (res, errs_found) } }
-----------------------
tryCaptureConstraints :: TcM a -> TcM (Maybe a, WantedConstraints)
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/415136a0f37bea953d7bcc6ee2aeeaf…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/415136a0f37bea953d7bcc6ee2aeeaf…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
Zubin pushed new tag ghc-9.14.2-rc2 at Glasgow Haskell Compiler / GHC
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/ghc-9.14.2-rc2
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/fendor/has-field-hie] 2 commits: Add additional details to evidence bindings
by Hannes Siebenhandl (＠fendor) 17 Sep '26
by Hannes Siebenhandl (＠fendor) 17 Sep '26
17 Sep '26
Hannes Siebenhandl pushed to branch wip/fendor/has-field-hie at Glasgow Haskell Compiler / GHC
Commits:
047ccb45 by fendor at 2026-09-17T11:55:40+02:00
Add additional details to evidence bindings
Evidence bindings can be all sorts of things, such as tpe class
evidence, a record selector or other builtin constructs such as
`Typeable`.
For some special evidence binding dependencies, we can include
additional information for the user.
For example, when we have a record selector, we can say from which type
the record selector originates from.
- - - - -
6a08787c by fendor at 2026-09-17T11:55:40+02:00
Typeable test
- - - - -
8 changed files:
- compiler/GHC/Iface/Ext/Ast.hs
- compiler/GHC/Iface/Ext/Types.hs
- compiler/GHC/Iface/Ext/Utils.hs
- testsuite/tests/hiefile/should_run/HasFieldQueries.stdout
- + testsuite/tests/hiefile/should_run/HieTypeable.hs
- + testsuite/tests/hiefile/should_run/HieTypeable.stdout
- testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.stdout
- testsuite/tests/hiefile/should_run/all.T
Changes:
=====================================
compiler/GHC/Iface/Ext/Ast.hs
=====================================
@@ -32,7 +32,8 @@ import GHC.Types.Basic
import GHC.Types.UnresolvedImport ( isGeneratedImport )
import GHC.Types.FieldLabel
import GHC.Types.Avail ( Avails )
-import GHC.Types.Id ( isDataConId_maybe, isId )
+import GHC.Types.Id ( isDataConId_maybe, isId, idDetails )
+import GHC.Types.Id.Info ( IdDetails(..), recSelParentName )
import GHC.Types.Name ( Name, nameSrcSpan, nameUnique, wiredInNameTyThing_maybe, getName )
import GHC.Types.Name.Env ( NameEnv, emptyNameEnv, extendNameEnv, lookupNameEnv )
import GHC.Types.Name.Reader ( RecFieldInfo(..), WithUserRdr(..) )
@@ -689,7 +690,7 @@ instance ToHie (EvBindContext (LocatedA TcEvBinds)) where
where
go evbind = do
let evDeps = hieEvIdsOfTerm $ eb_rhs evbind
- depNames = EvBindDeps $ map varName evDeps
+ depNames = EvBindDeps $ map classifyEvBindDep evDeps
concatM $
[ toHie (C (EvidenceVarBind (EvLetBind depNames) (combineScopes sc (mkScope span)) sp)
(L span $ eb_lhs evbind))
@@ -697,6 +698,12 @@ instance ToHie (EvBindContext (LocatedA TcEvBinds)) where
]
toHie _ = pure []
+classifyEvBindDep :: EvId -> EvBindDep
+classifyEvBindDep evId =
+ case idDetails evId of
+ RecSelId{sel_tycon} -> RecordField (varName evId) (recSelParentName sel_tycon)
+ _ -> EvidenceVar (varName evId)
+
instance ToHie (LocatedA HsWrapper) where
toHie (L osp wrap)
= case wrap of
=====================================
compiler/GHC/Iface/Ext/Types.hs
=====================================
@@ -598,17 +598,79 @@ instance Outputable EvVarSource where
ppr (EvInstBind True cls) = text "bound due to a superclass of " <+> ppr cls
ppr (EvLetBind deps) = text "bound by a let, depending on:" <+> ppr deps
+-- | Evidence binding dependency with additional details.
+data EvBindDep
+ = EvidenceVar Name
+ -- ^ Evidence variable such as a type class constructor.
+ --
+ -- For example, @C:HasField@, @$dShow@ (dictionaries) or @$fCList@.
+ --
+ -- This is the default representation of a 'EvBindDep'.
+ | RecordField
+ -- ^ Evidence variable of a record selector.
+ --
+ -- This is for example generated with @-XOverloadedRecordDot@, where
+ -- the evidence includes a reference to which record selector is used
+ -- to implement @getField@.
+ Name
+ -- ^ 'Name' of the record selector
+ Name
+ -- ^ 'Name' of the parent type.
+ | TypeableEvidence
+ -- ^ Evidence of a @Typeable@ constraint.
+ Name
+ -- ^ Name of the type the evidence was generated for.
+ deriving (Eq, Ord)
+
+instance Outputable EvBindDep where
+ ppr = \ case
+ EvidenceVar n -> ppr n
+ RecordField sel parent -> ppr sel <+> text "of Record" <+> ppr parent
+ TypeableEvidence n -> ppr n <+> text "bound by Typeable"
+
+evBindDepName :: EvBindDep -> Name
+evBindDepName = \ case
+ EvidenceVar n -> n
+ RecordField selector _record -> selector
+ TypeableEvidence n -> n
+
+evBindDepHieName :: EvBindDep -> HieName
+evBindDepHieName = toHieName . evBindDepName
+
+instance Binary EvBindDep where
+ put_ bh = \ case
+ EvidenceVar n -> do
+ putByte bh 0
+ put_ bh n
+ RecordField n sel -> do
+ putByte bh 1
+ put_ bh n
+ put_ bh sel
+ TypeableEvidence n -> do
+ putByte bh 2
+ put_ bh n
+
+ get bh =
+ getByte bh >>= \ case
+ 0 -> EvidenceVar <$> get bh
+ 1 -> RecordField <$> get bh <*> get bh
+ 2 -> TypeableEvidence <$> get bh
+ t -> fail $ "EvBindDep: Unknown tag: " ++ show t
+
-- | Eq/Ord instances compare on the converted HieName,
-- as non-exported names may have different uniques after
-- a roundtrip
-newtype EvBindDeps = EvBindDeps { getEvBindDeps :: [Name] }
+newtype EvBindDeps = EvBindDeps { getEvBindDeps :: [EvBindDep] }
deriving Outputable
+evBindDepsNames :: EvBindDeps -> [Name]
+evBindDepsNames = map evBindDepName . getEvBindDeps
+
instance Eq EvBindDeps where
- (==) = coerce ((==) `on` map toHieName)
+ (==) = coerce ((==) `on` map evBindDepHieName)
instance Ord EvBindDeps where
- compare = coerce (compare `on` map toHieName)
+ compare = coerce (compare `on` map evBindDepHieName)
instance Binary EvBindDeps where
put_ bh (EvBindDeps xs) = put_ bh xs
=====================================
compiler/GHC/Iface/Ext/Utils.hs
=====================================
@@ -145,7 +145,7 @@ getEvidenceTree refmap var = go emptyNameSet var
det <- S.toList $ identInfo dets
case det of
EvidenceVarBind src@(EvLetBind (getEvBindDeps -> xs)) scp spn ->
- pure $ Just ((src,scp,spn),mapMaybe (go $ extendNameSet seen var) xs)
+ pure $ Just ((src,scp,spn),mapMaybe (go (extendNameSet seen var) . evBindDepName) xs)
EvidenceVarBind src scp spn -> pure $ Just ((src,scp,spn),[])
_ -> pure Nothing
pure $ Tree.Node (EvidenceInfo var sp typ (Just evdet)) children
@@ -390,7 +390,7 @@ definedInAsts asts n = case nameSrcSpan n of
getEvidenceBindDeps :: ContextInfo -> [Name]
getEvidenceBindDeps (EvidenceVarBind (EvLetBind xs) _ _) =
- getEvBindDeps xs
+ evBindDepsNames xs
getEvidenceBindDeps _ = []
isEvidenceBind :: ContextInfo -> Bool
=====================================
testsuite/tests/hiefile/should_run/HasFieldQueries.stdout
=====================================
@@ -4,7 +4,7 @@ At point (13,17), we found:
┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ field1]
+│ field1 of Record Thing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
@@ -31,7 +31,7 @@ At point (16,27), we found:
┌
│ $dHasField at HasFieldQueries.hs:16:1-32, of type: HasField "field1" Thing Char
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ field1]
+│ field1 of Record Thing]
│ with scope: LocalScope HasFieldQueries.hs:16:1-32
│ bound at: HasFieldQueries.hs:16:1-32
│ Defined at <no location info>
@@ -55,7 +55,7 @@ At point (23,17), we found:
┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "nested1" NestedThing Thing
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ nested1]
+│ nested1 of Record NestedThing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
@@ -87,7 +87,7 @@ At point (23,25), we found:
`- ┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
│ is an evidence variable bound by a let, depending on: [C:HasField,
- │ field1]
+ │ field1 of Record Thing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
@@ -176,7 +176,7 @@ At point (37,14), we found:
`- ┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
│ is an evidence variable bound by a let, depending on: [C:HasField,
- │ field1]
+ │ field1 of Record Thing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
@@ -200,7 +200,7 @@ At point (41,21), we found:
┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "nested1" NestedThing Thing
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ nested1]
+│ nested1 of Record NestedThing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
@@ -224,7 +224,7 @@ At point (41,30), we found:
┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ field1]
+│ field1 of Record Thing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
=====================================
testsuite/tests/hiefile/should_run/HieTypeable.hs
=====================================
@@ -0,0 +1,28 @@
+module Main where
+
+import Data.Dynamic
+import Data.Typeable
+import TestUtils
+
+data Thing = Thing {field1 :: Char, field2 :: Bool}
+ deriving (Show, Eq)
+
+castFromDynamic :: Dynamic -> Maybe Thing
+castFromDynamic d = fromDynamic d
+ -- ^ this is the point
+
+rep :: Thing -> TypeRep
+rep d = typeOf d
+ -- ^ this is the point
+
+points =
+ [ (11,21)
+ , (15,10)
+ ]
+
+main = do
+ (df, hf) <- readTestHie "HieTypeable.hie"
+ let refmap = generateReferencesMap $ getAsts $ hie_asts hf
+
+ traverse (explainEv df hf refmap) points
+ return ()
=====================================
testsuite/tests/hiefile/should_run/HieTypeable.stdout
=====================================
@@ -0,0 +1,30 @@
+==========================
+At point (11,21), we found:
+==========================
+┌
+│ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+│ is an evidence variable bound by a let, depending on: [$dTypeable]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+ │ is an evidence variable bound by a let, depending on: []
+ │ with scope: ModuleScope
+ │
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (15,10), we found:
+==========================
+┌
+│ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+│ is an evidence variable bound by a let, depending on: []
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+
=====================================
testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.stdout
=====================================
@@ -4,7 +4,7 @@ At point (23,16), we found:
┌
│ $dHasField at NoFieldSelectorQueries.hs:1:1, of type: HasField "a" A Int
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ a]
+│ a of Record A]
│ with scope: ModuleScope
│
│ Defined at <no location info>
@@ -47,7 +47,7 @@ At point (30,15), we found:
┌
│ $dHasField at NoFieldSelectorQueries.hs:30:1-17, of type: HasField "n" B A
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ n]
+│ n of Record B]
│ with scope: LocalScope NoFieldSelectorQueries.hs:30:1-17
│ bound at: NoFieldSelectorQueries.hs:30:1-17
│ Defined at <no location info>
@@ -71,7 +71,7 @@ At point (30,17), we found:
┌
│ $dHasField at NoFieldSelectorQueries.hs:30:1-17, of type: HasField "b" A Char
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ b]
+│ b of Record A]
│ with scope: LocalScope NoFieldSelectorQueries.hs:30:1-17
│ bound at: NoFieldSelectorQueries.hs:30:1-17
│ Defined at <no location info>
@@ -95,7 +95,7 @@ At point (33,16), we found:
┌
│ $dHasField at NoFieldSelectorQueries.hs:33:1-16, of type: HasField "c" C Float
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ c]
+│ c of Record C]
│ with scope: LocalScope NoFieldSelectorQueries.hs:33:1-16
│ bound at: NoFieldSelectorQueries.hs:33:1-16
│ Defined at <no location info>
@@ -119,7 +119,7 @@ At point (36,16), we found:
┌
│ $dHasField at NoFieldSelectorQueries.hs:36:1-16, of type: HasField "c" C Float
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ c]
+│ c of Record C]
│ with scope: LocalScope NoFieldSelectorQueries.hs:36:1-16
│ bound at: NoFieldSelectorQueries.hs:36:1-16
│ Defined at <no location info>
@@ -143,7 +143,7 @@ At point (40,23), we found:
┌
│ $dHasField at NoFieldSelectorQueries.hs:1:1, of type: HasField "c" C Float
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ c]
+│ c of Record C]
│ with scope: ModuleScope
│
│ Defined at <no location info>
@@ -167,7 +167,7 @@ At point (43,15), we found:
┌
│ $dHasField at NoFieldSelectorQueries.hs:43:1-15, of type: HasField "e" C Int
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ e]
+│ e of Record C]
│ with scope: LocalScope NoFieldSelectorQueries.hs:43:1-15
│ bound at: NoFieldSelectorQueries.hs:43:1-15
│ Defined at <no location info>
@@ -191,7 +191,7 @@ At point (46,15), we found:
┌
│ $dHasField at NoFieldSelectorQueries.hs:46:1-15, of type: HasField "e" C Int
│ is an evidence variable bound by a let, depending on: [C:HasField,
-│ e]
+│ e of Record C]
│ with scope: LocalScope NoFieldSelectorQueries.hs:46:1-15
│ bound at: NoFieldSelectorQueries.hs:46:1-15
│ Defined at <no location info>
=====================================
testsuite/tests/hiefile/should_run/all.T
=====================================
@@ -12,3 +12,4 @@ test('HieGadtConSigs', [extra_run_opts('"' + config.libdir + '"'), extra_files([
test('T25709', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
test('HasFieldQueries', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
test('NoFieldSelectorQueries', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
+test('HieTypeable', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/edb461ac99ab714f296e2ebf19fca8…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/edb461ac99ab714f296e2ebf19fca8…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/fendor/has-field-hie] 3 commits: Allow any `Id` to be used for HIE evidence
by Hannes Siebenhandl (＠fendor) 17 Sep '26
by Hannes Siebenhandl (＠fendor) 17 Sep '26
17 Sep '26
Hannes Siebenhandl pushed to branch wip/fendor/has-field-hie at Glasgow Haskell Compiler / GHC
Commits:
ca321a62 by fendor at 2026-09-17T11:49:20+02:00
Allow any `Id` to be used for HIE evidence
HIE evidence is used to show how a constraint has been solved and allows
users to go directly to the definition or introduction of a particular
evidence variable.
So far, we only looked at evidence introduced by type class variables,
but some evidence terms refer to other variables as well, such as record selectors.
Such evidence terms add additional details and source locations.
For generated evidence, such as `HasField` evidence to support
`-XRecordDotSyntax`, the type class evidence is lacking and doesn't
give us any usable source span pointing to the actual record selector.
See this example evidence:
$dHasField_aLw
= GHC.Internal.Records.C:HasField
@GHC.Internal.Types.Symbol
@GHC.Internal.Types.LiftedRep
@GHC.Internal.Types.LiftedRep
@"foo"
@Foo
@Int
(foo `cast` (<Foo -> Int>_R :: (Foo -> Int) ~R# (Foo -> Int)))
The free variables of this term are `{C:HasField, foo}`.
`foo` is the record selector from the type `Foo` and is crucial to guide
users how this evidence is constructed, as the evidence `HasField` is
not helpful.
During HIE generation, we now take any `Id` into account to provide
additional source spans to point to user to the definition site of the
record selector.
As a direct consequence, this allows HLS to implement a limited form of
`Goto Definition` for expressions of the form `x.foo`, where `x :: Foo`.
Capturing more `Id`s for evidence may have some side effects that are
somewhat tricky to predict, since the tests are quite lacking.
- - - - -
e99b2061 by fendor at 2026-09-17T11:49:32+02:00
Add additional details to evidence bindings
Evidence bindings can be all sorts of things, such as tpe class
evidence, a record selector or other builtin constructs such as
`Typeable`.
For some special evidence binding dependencies, we can include
additional information for the user.
For example, when we have a record selector, we can say from which type
the record selector originates from.
- - - - -
edb461ac by fendor at 2026-09-17T11:49:36+02:00
Typeable test
- - - - -
10 changed files:
- + changelog.d/record-dot-evidence
- compiler/GHC/Iface/Ext/Ast.hs
- compiler/GHC/Iface/Ext/Types.hs
- compiler/GHC/Iface/Ext/Utils.hs
- testsuite/tests/hiefile/should_run/HasFieldQueries.stdout
- + testsuite/tests/hiefile/should_run/HieTypeable.hs
- + testsuite/tests/hiefile/should_run/HieTypeable.stdout
- testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.stdout
- testsuite/tests/hiefile/should_run/RecordDotTypes.stdout
- testsuite/tests/hiefile/should_run/all.T
Changes:
=====================================
changelog.d/record-dot-evidence
=====================================
@@ -0,0 +1,12 @@
+section: compiler
+synopsis: Record selector functions as evidence for `HasField` constraints during .hie file generation.
+description: {
+ We record the record selector `foo` of an expression such as `f.foo` as evidence for
+ solving the constraint `HasField "foo" record ty`.
+
+ This allows us to point to the definition source location of the record selector `foo`, allowing
+ users to jump to definition using the evidence variables.
+}
+
+issues: #25418
+mrs: !16694
=====================================
compiler/GHC/Iface/Ext/Ast.hs
=====================================
@@ -23,7 +23,6 @@ import GHC.Core.DataCon ( dataConWrapperType )
import GHC.Core.Type ( Type, ForAllTyFlag(..) )
import GHC.Core.TyCon ( TyCon, tyConClass_maybe )
import GHC.Core.InstEnv
-import GHC.Core.Predicate ( isEvId )
import GHC.Hs
import GHC.Hs.Syn.Type
@@ -33,7 +32,7 @@ import GHC.Types.Basic
import GHC.Types.UnresolvedImport ( isGeneratedImport )
import GHC.Types.FieldLabel
import GHC.Types.Avail ( Avails )
-import GHC.Types.Id ( isDataConId_maybe )
+import GHC.Types.Id ( isDataConId_maybe, isId, idDetails )
import GHC.Types.Name ( Name, nameSrcSpan, nameUnique, wiredInNameTyThing_maybe, getName )
import GHC.Types.Name.Env ( NameEnv, emptyNameEnv, extendNameEnv, lookupNameEnv )
import GHC.Types.Name.Reader ( RecFieldInfo(..), WithUserRdr(..) )
@@ -682,7 +681,7 @@ instance ToHie (Context (Located (WithUserRdr Name))) where
hieEvIdsOfTerm :: EvTerm -> [EvId]
-- Returns only EvIds satisfying relevantEvId
-hieEvIdsOfTerm = runFVSelectiveList isEvId . evTermFVs
+hieEvIdsOfTerm = runFVSelectiveList isId . evTermFVs
instance ToHie (EvBindContext (LocatedA TcEvBinds)) where
toHie (EvBindContext sc sp (L span (EvBinds bs)))
=====================================
compiler/GHC/Iface/Ext/Types.hs
=====================================
@@ -598,17 +598,79 @@ instance Outputable EvVarSource where
ppr (EvInstBind True cls) = text "bound due to a superclass of " <+> ppr cls
ppr (EvLetBind deps) = text "bound by a let, depending on:" <+> ppr deps
+-- | Evidence binding dependency with additional details.
+data EvBindDep
+ = EvidenceVar Name
+ -- ^ Evidence variable such as a type class constructor.
+ --
+ -- For example, @C:HasField@, @$dShow@ (dictionaries) or @$fCList@.
+ --
+ -- This is the default representation of a 'EvBindDep'.
+ | RecordField
+ -- ^ Evidence variable of a record selector.
+ --
+ -- This is for example generated with @-XOverloadedRecordDot@, where
+ -- the evidence includes a reference to which record selector is used
+ -- to implement @getField@.
+ Name
+ -- ^ 'Name' of the record selector
+ Name
+ -- ^ 'Name' of the parent type.
+ | TypeableEvidence
+ -- ^ Evidence of a @Typeable@ constraint.
+ Name
+ -- ^ Name of the type the evidence was generated for.
+ deriving (Eq, Ord)
+
+instance Outputable EvBindDep where
+ ppr = \ case
+ EvidenceVar n -> ppr n
+ RecordField sel parent -> ppr sel <+> text "of Record" <+> ppr parent
+ TypeableEvidence n -> ppr n <+> text "bound by Typeable"
+
+evBindDepName :: EvBindDep -> Name
+evBindDepName = \ case
+ EvidenceVar n -> n
+ RecordField selector _record -> selector
+ TypeableEvidence n -> n
+
+evBindDepHieName :: EvBindDep -> HieName
+evBindDepHieName = toHieName . evBindDepName
+
+instance Binary EvBindDep where
+ put_ bh = \ case
+ EvidenceVar n -> do
+ putByte bh 0
+ put_ bh n
+ RecordField n sel -> do
+ putByte bh 1
+ put_ bh n
+ put_ bh sel
+ TypeableEvidence n -> do
+ putByte bh 2
+ put_ bh n
+
+ get bh =
+ getByte bh >>= \ case
+ 0 -> EvidenceVar <$> get bh
+ 1 -> RecordField <$> get bh <*> get bh
+ 2 -> TypeableEvidence <$> get bh
+ t -> fail $ "EvBindDep: Unknown tag: " ++ show t
+
-- | Eq/Ord instances compare on the converted HieName,
-- as non-exported names may have different uniques after
-- a roundtrip
-newtype EvBindDeps = EvBindDeps { getEvBindDeps :: [Name] }
+newtype EvBindDeps = EvBindDeps { getEvBindDeps :: [EvBindDep] }
deriving Outputable
+evBindDepsNames :: EvBindDeps -> [Name]
+evBindDepsNames = map evBindDepName . getEvBindDeps
+
instance Eq EvBindDeps where
- (==) = coerce ((==) `on` map toHieName)
+ (==) = coerce ((==) `on` map evBindDepHieName)
instance Ord EvBindDeps where
- compare = coerce (compare `on` map toHieName)
+ compare = coerce (compare `on` map evBindDepHieName)
instance Binary EvBindDeps where
put_ bh (EvBindDeps xs) = put_ bh xs
=====================================
compiler/GHC/Iface/Ext/Utils.hs
=====================================
@@ -145,7 +145,7 @@ getEvidenceTree refmap var = go emptyNameSet var
det <- S.toList $ identInfo dets
case det of
EvidenceVarBind src@(EvLetBind (getEvBindDeps -> xs)) scp spn ->
- pure $ Just ((src,scp,spn),mapMaybe (go $ extendNameSet seen var) xs)
+ pure $ Just ((src,scp,spn),mapMaybe (go (extendNameSet seen var) . evBindDepName) xs)
EvidenceVarBind src scp spn -> pure $ Just ((src,scp,spn),[])
_ -> pure Nothing
pure $ Tree.Node (EvidenceInfo var sp typ (Just evdet)) children
@@ -390,7 +390,7 @@ definedInAsts asts n = case nameSrcSpan n of
getEvidenceBindDeps :: ContextInfo -> [Name]
getEvidenceBindDeps (EvidenceVarBind (EvLetBind xs) _ _) =
- getEvBindDeps xs
+ evBindDepsNames xs
getEvidenceBindDeps _ = []
isEvidenceBind :: ContextInfo -> Bool
=====================================
testsuite/tests/hiefile/should_run/HasFieldQueries.stdout
=====================================
@@ -3,16 +3,23 @@ At point (13,17), we found:
==========================
┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ field1 of Record Thing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at HasFieldQueries.hs:9:21
└
==========================
@@ -23,16 +30,23 @@ At point (16,27), we found:
==========================
┌
│ $dHasField at HasFieldQueries.hs:16:1-32, of type: HasField "field1" Thing Char
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ field1 of Record Thing]
│ with scope: LocalScope HasFieldQueries.hs:16:1-32
│ bound at: HasFieldQueries.hs:16:1-32
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at HasFieldQueries.hs:9:21
└
==========================
@@ -40,16 +54,23 @@ At point (23,17), we found:
==========================
┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "nested1" NestedThing Thing
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ nested1 of Record NestedThing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ nested1 at HasFieldQueries.hs:1:1, of type: NestedThing -> Thing
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at HasFieldQueries.hs:20:34
└
==========================
@@ -65,16 +86,23 @@ At point (23,25), we found:
|
`- ┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
- │ is an evidence variable bound by a let, depending on: [C:HasField]
+ │ is an evidence variable bound by a let, depending on: [C:HasField,
+ │ field1 of Record Thing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
└
|
+ +- ┌
+ | │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ | │ is a usage of an external evidence variable
+ | │ Defined in `GHC.Internal.Records'
+ | └
+ |
`- ┌
- │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at HasFieldQueries.hs:9:21
└
==========================
@@ -147,16 +175,23 @@ At point (37,14), we found:
|
`- ┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
- │ is an evidence variable bound by a let, depending on: [C:HasField]
+ │ is an evidence variable bound by a let, depending on: [C:HasField,
+ │ field1 of Record Thing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
└
|
+ +- ┌
+ | │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ | │ is a usage of an external evidence variable
+ | │ Defined in `GHC.Internal.Records'
+ | └
+ |
`- ┌
- │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at HasFieldQueries.hs:9:21
└
==========================
@@ -164,16 +199,23 @@ At point (41,21), we found:
==========================
┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "nested1" NestedThing Thing
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ nested1 of Record NestedThing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ nested1 at HasFieldQueries.hs:1:1, of type: NestedThing -> Thing
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at HasFieldQueries.hs:20:34
└
==========================
@@ -181,15 +223,22 @@ At point (41,30), we found:
==========================
┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ field1 of Record Thing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at HasFieldQueries.hs:9:21
└
=====================================
testsuite/tests/hiefile/should_run/HieTypeable.hs
=====================================
@@ -0,0 +1,28 @@
+module Main where
+
+import Data.Dynamic
+import Data.Typeable
+import TestUtils
+
+data Thing = Thing {field1 :: Char, field2 :: Bool}
+ deriving (Show, Eq)
+
+castFromDynamic :: Dynamic -> Maybe Thing
+castFromDynamic d = fromDynamic d
+ -- ^ this is the point
+
+rep :: Thing -> TypeRep
+rep d = typeOf d
+ -- ^ this is the point
+
+points =
+ [ (11,21)
+ , (15,10)
+ ]
+
+main = do
+ (df, hf) <- readTestHie "HieTypeable.hie"
+ let refmap = generateReferencesMap $ getAsts $ hie_asts hf
+
+ traverse (explainEv df hf refmap) points
+ return ()
=====================================
testsuite/tests/hiefile/should_run/HieTypeable.stdout
=====================================
@@ -0,0 +1,30 @@
+==========================
+At point (11,21), we found:
+==========================
+┌
+│ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+│ is an evidence variable bound by a let, depending on: [$dTypeable]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+ │ is an evidence variable bound by a let, depending on: []
+ │ with scope: ModuleScope
+ │
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (15,10), we found:
+==========================
+┌
+│ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+│ is an evidence variable bound by a let, depending on: []
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+
=====================================
testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.stdout
=====================================
@@ -3,16 +3,23 @@ At point (23,16), we found:
==========================
┌
│ $dHasField at NoFieldSelectorQueries.hs:1:1, of type: HasField "a" A Int
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ a of Record A]
│ with scope: ModuleScope
│
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ a at NoFieldSelectorQueries.hs:1:1, of type: A -> Int
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at NoFieldSelectorQueries.hs:9:14
└
==========================
@@ -39,16 +46,23 @@ At point (30,15), we found:
==========================
┌
│ $dHasField at NoFieldSelectorQueries.hs:30:1-17, of type: HasField "n" B A
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ n of Record B]
│ with scope: LocalScope NoFieldSelectorQueries.hs:30:1-17
│ bound at: NoFieldSelectorQueries.hs:30:1-17
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ n at NoFieldSelectorQueries.hs:30:1-17, of type: B -> A
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at NoFieldSelectorQueries.hs:10:24
└
==========================
@@ -56,16 +70,23 @@ At point (30,17), we found:
==========================
┌
│ $dHasField at NoFieldSelectorQueries.hs:30:1-17, of type: HasField "b" A Char
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ b of Record A]
│ with scope: LocalScope NoFieldSelectorQueries.hs:30:1-17
│ bound at: NoFieldSelectorQueries.hs:30:1-17
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ b at NoFieldSelectorQueries.hs:30:1-17, of type: A -> Char
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at NoFieldSelectorQueries.hs:9:24
└
==========================
@@ -73,16 +94,23 @@ At point (33,16), we found:
==========================
┌
│ $dHasField at NoFieldSelectorQueries.hs:33:1-16, of type: HasField "c" C Float
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ c of Record C]
│ with scope: LocalScope NoFieldSelectorQueries.hs:33:1-16
│ bound at: NoFieldSelectorQueries.hs:33:1-16
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ c at NoFieldSelectorQueries.hs:1:1, of type: C -> Float
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at NoFieldSelectorQueries.hs:12:9
└
==========================
@@ -90,16 +118,23 @@ At point (36,16), we found:
==========================
┌
│ $dHasField at NoFieldSelectorQueries.hs:36:1-16, of type: HasField "c" C Float
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ c of Record C]
│ with scope: LocalScope NoFieldSelectorQueries.hs:36:1-16
│ bound at: NoFieldSelectorQueries.hs:36:1-16
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ c at NoFieldSelectorQueries.hs:1:1, of type: C -> Float
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at NoFieldSelectorQueries.hs:12:9
└
==========================
@@ -107,16 +142,23 @@ At point (40,23), we found:
==========================
┌
│ $dHasField at NoFieldSelectorQueries.hs:1:1, of type: HasField "c" C Float
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ c of Record C]
│ with scope: ModuleScope
│
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ c at NoFieldSelectorQueries.hs:1:1, of type: C -> Float
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at NoFieldSelectorQueries.hs:12:9
└
==========================
@@ -124,16 +166,23 @@ At point (43,15), we found:
==========================
┌
│ $dHasField at NoFieldSelectorQueries.hs:43:1-15, of type: HasField "e" C Int
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ e of Record C]
│ with scope: LocalScope NoFieldSelectorQueries.hs:43:1-15
│ bound at: NoFieldSelectorQueries.hs:43:1-15
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ e at NoFieldSelectorQueries.hs:43:1-15, of type: C -> Int
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at NoFieldSelectorQueries.hs:14:9
└
==========================
@@ -141,15 +190,22 @@ At point (46,15), we found:
==========================
┌
│ $dHasField at NoFieldSelectorQueries.hs:46:1-15, of type: HasField "e" C Int
-│ is an evidence variable bound by a let, depending on: [C:HasField]
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ e of Record C]
│ with scope: LocalScope NoFieldSelectorQueries.hs:46:1-15
│ bound at: NoFieldSelectorQueries.hs:46:1-15
│ Defined at <no location info>
└
|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
`- ┌
- │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ e at NoFieldSelectorQueries.hs:43:1-15, of type: C -> Int
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at NoFieldSelectorQueries.hs:14:9
└
=====================================
testsuite/tests/hiefile/should_run/RecordDotTypes.stdout
=====================================
@@ -1,9 +1,9 @@
At (22,6), got type: MyRecord
At (22,20), got type: MyRecord -> Integer
At (22,25), got type: MyRecord
-At (22,28), got type: MyChild -> String
-At (22,29), got type: MyChild -> String
-At (22,6) - (22,8), got type: String
+At (22,28), got type: MyChild -> [Char]
+At (22,29), got type: MyChild -> [Char]
+At (22,6) - (22,8), got type: [Char]
At (22,17) - (22,20), got type: Integer
At (22,25) - (22,27), got type: MyChild
-At (22,25) - (22,29), got type: String
+At (22,25) - (22,29), got type: [Char]
=====================================
testsuite/tests/hiefile/should_run/all.T
=====================================
@@ -12,3 +12,4 @@ test('HieGadtConSigs', [extra_run_opts('"' + config.libdir + '"'), extra_files([
test('T25709', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
test('HasFieldQueries', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
test('NoFieldSelectorQueries', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
+test('HieTypeable', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dece0fbb4d3d9ffc9021f5e8933e0a…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dece0fbb4d3d9ffc9021f5e8933e0a…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/fendor/has-field-hie] 4 commits: Record `FieldLabel` source span in AST node
by Hannes Siebenhandl (＠fendor) 17 Sep '26
by Hannes Siebenhandl (＠fendor) 17 Sep '26
17 Sep '26
Hannes Siebenhandl pushed to branch wip/fendor/has-field-hie at Glasgow Haskell Compiler / GHC
Commits:
450f1c53 by fendor at 2026-09-17T11:42:53+02:00
Record `FieldLabel` source span in AST node
We attach evidence variables based on the source span of the concrete
AST node in the HIE file.
The evidence for the `HasField` constraint has the source span of the
field selector, e.g. the AST node that gave rise to the `HasField`
constraint.
Since the AST node doesn't show up in the HIE file, the evidence for
`HasField` was also not recorded for the span. Thus, `getEvidenceTree`
wouldn't even list `HasField` as evidence, even in the perfectly normal
case of:
baz :: HasField "foo" f Int => f -> Int
baz f = f.foo
Requesting the evidence tree for `.foo` should point to the definition
of `baz`, but since we omitted the source span for the field selector `.foo`
from the AST node, the HIE file doesn't list it as evidence.
By using the source spans of the individual field selectors, there are two consequences:
* We can see the `HasField` evidence for record dot syntax at the field
selector span
* The reported type of `.foo` is `Foo -> Int` instead of just `Int`
The latter is a change of behaviour that is unfortunate but the right
behaviour, since there is now a source span for the whole expression
`x.foo`, one for `x` and one for the selector `.foo`.
If you query for the type at span `x.foo`, then the correct type `Int`
is shown, but in downstream tooling (such as HLS), such requests are not
possible in LSP. Thus, the behaviour changes.
- - - - -
5fe3c633 by fendor at 2026-09-17T11:43:34+02:00
Allow any `Id` to be used for HIE evidence
HIE evidence is used to show how a constraint has been solved and allows
users to go directly to the definition or introduction of a particular
evidence variable.
So far, we only looked at evidence introduced by type class variables,
but some evidence terms refer to other variables as well, such as record selectors.
Such evidence terms add additional details and source locations.
For generated evidence, such as `HasField` evidence to support
`-XRecordDotSyntax`, the type class evidence is lacking and doesn't
give us any usable source span pointing to the actual record selector.
See this example evidence:
$dHasField_aLw
= GHC.Internal.Records.C:HasField
@GHC.Internal.Types.Symbol
@GHC.Internal.Types.LiftedRep
@GHC.Internal.Types.LiftedRep
@"foo"
@Foo
@Int
(foo `cast` (<Foo -> Int>_R :: (Foo -> Int) ~R# (Foo -> Int)))
The free variables of this term are `{C:HasField, foo}`.
`foo` is the record selector from the type `Foo` and is crucial to guide
users how this evidence is constructed, as the evidence `HasField` is
not helpful.
During HIE generation, we now take any `Id` into account to provide
additional source spans to point to user to the definition site of the
record selector.
As a direct consequence, this allows HLS to implement a limited form of
`Goto Definition` for expressions of the form `x.foo`, where `x :: Foo`.
Capturing more `Id`s for evidence may have some side effects that are
somewhat tricky to predict, since the tests are quite lacking.
- - - - -
c1afd18a by fendor at 2026-09-17T11:44:34+02:00
Add additional details to evidence bindings
Evidence bindings can be all sorts of things, such as tpe class
evidence, a record selector or other builtin constructs such as
`Typeable`.
For some special evidence binding dependencies, we can include
additional information for the user.
For example, when we have a record selector, we can say from which type
the record selector originates from.
- - - - -
dece0fbb by fendor at 2026-09-17T11:44:37+02:00
Typeable test
- - - - -
12 changed files:
- + changelog.d/record-dot-evidence
- compiler/GHC/Iface/Ext/Ast.hs
- compiler/GHC/Iface/Ext/Types.hs
- compiler/GHC/Iface/Ext/Utils.hs
- compiler/GHC/Rename/Expr.hs
- testsuite/tests/hiefile/should_run/HasFieldQueries.stdout
- + testsuite/tests/hiefile/should_run/HieTypeable.hs
- + testsuite/tests/hiefile/should_run/HieTypeable.stdout
- testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.stdout
- testsuite/tests/hiefile/should_run/RecordDotTypes.stdout
- testsuite/tests/hiefile/should_run/T23492.stdout
- testsuite/tests/hiefile/should_run/all.T
Changes:
=====================================
changelog.d/record-dot-evidence
=====================================
@@ -0,0 +1,12 @@
+section: compiler
+synopsis: Record selector functions as evidence for `HasField` constraints during .hie file generation.
+description: {
+ We record the record selector `foo` of an expression such as `f.foo` as evidence for
+ solving the constraint `HasField "foo" record ty`.
+
+ This allows us to point to the definition source location of the record selector `foo`, allowing
+ users to jump to definition using the evidence variables.
+}
+
+issues: #25418
+mrs: !16694
=====================================
compiler/GHC/Iface/Ext/Ast.hs
=====================================
@@ -23,7 +23,6 @@ import GHC.Core.DataCon ( dataConWrapperType )
import GHC.Core.Type ( Type, ForAllTyFlag(..) )
import GHC.Core.TyCon ( TyCon, tyConClass_maybe )
import GHC.Core.InstEnv
-import GHC.Core.Predicate ( isEvId )
import GHC.Hs
import GHC.Hs.Syn.Type
@@ -33,7 +32,7 @@ import GHC.Types.Basic
import GHC.Types.UnresolvedImport ( isGeneratedImport )
import GHC.Types.FieldLabel
import GHC.Types.Avail ( Avails )
-import GHC.Types.Id ( isDataConId_maybe )
+import GHC.Types.Id ( isDataConId_maybe, isId, idDetails )
import GHC.Types.Name ( Name, nameSrcSpan, nameUnique, wiredInNameTyThing_maybe, getName )
import GHC.Types.Name.Env ( NameEnv, emptyNameEnv, extendNameEnv, lookupNameEnv )
import GHC.Types.Name.Reader ( RecFieldInfo(..), WithUserRdr(..) )
@@ -81,6 +80,7 @@ import Control.Applicative ( (<|>) )
import GHC.Types.TypeEnv ( TypeEnv )
import Control.Arrow ( second )
import Data.Traversable ( mapAccumR )
+import GHC.Types.Id.Info (IdDetails(..), recSelParentName)
{- Note [Updating HieAst for changes in the GHC AST]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -682,7 +682,7 @@ instance ToHie (Context (Located (WithUserRdr Name))) where
hieEvIdsOfTerm :: EvTerm -> [EvId]
-- Returns only EvIds satisfying relevantEvId
-hieEvIdsOfTerm = runFVSelectiveList isEvId . evTermFVs
+hieEvIdsOfTerm = runFVSelectiveList isId . evTermFVs
instance ToHie (EvBindContext (LocatedA TcEvBinds)) where
toHie (EvBindContext sc sp (L span (EvBinds bs)))
@@ -690,7 +690,7 @@ instance ToHie (EvBindContext (LocatedA TcEvBinds)) where
where
go evbind = do
let evDeps = hieEvIdsOfTerm $ eb_rhs evbind
- depNames = EvBindDeps $ map varName evDeps
+ depNames = EvBindDeps $ map classifyEvBindDep evDeps
concatM $
[ toHie (C (EvidenceVarBind (EvLetBind depNames) (combineScopes sc (mkScope span)) sp)
(L span $ eb_lhs evbind))
@@ -698,6 +698,12 @@ instance ToHie (EvBindContext (LocatedA TcEvBinds)) where
]
toHie _ = pure []
+classifyEvBindDep :: EvId -> EvBindDep
+classifyEvBindDep evId =
+ case idDetails evId of
+ RecSelId{sel_tycon} -> RecordField (varName evId) (recSelParentName sel_tycon)
+ _ -> EvidenceVar (varName evId)
+
instance ToHie (LocatedA HsWrapper) where
toHie (L osp wrap)
= case wrap of
=====================================
compiler/GHC/Iface/Ext/Types.hs
=====================================
@@ -598,17 +598,79 @@ instance Outputable EvVarSource where
ppr (EvInstBind True cls) = text "bound due to a superclass of " <+> ppr cls
ppr (EvLetBind deps) = text "bound by a let, depending on:" <+> ppr deps
+-- | Evidence binding dependency with additional details.
+data EvBindDep
+ = EvidenceVar Name
+ -- ^ Evidence variable such as a type class constructor.
+ --
+ -- For example, @C:HasField@, @$dShow@ (dictionaries) or @$fCList@.
+ --
+ -- This is the default representation of a 'EvBindDep'.
+ | RecordField
+ -- ^ Evidence variable of a record selector.
+ --
+ -- This is for example generated with @-XOverloadedRecordDot@, where
+ -- the evidence includes a reference to which record selector is used
+ -- to implement @getField@.
+ Name
+ -- ^ 'Name' of the record selector
+ Name
+ -- ^ 'Name' of the parent type.
+ | TypeableEvidence
+ -- ^ Evidence of a @Typeable@ constraint.
+ Name
+ -- ^ Name of the type the evidence was generated for.
+ deriving (Eq, Ord)
+
+instance Outputable EvBindDep where
+ ppr = \ case
+ EvidenceVar n -> ppr n
+ RecordField sel parent -> ppr sel <+> text "of Record" <+> ppr parent
+ TypeableEvidence n -> ppr n <+> text "bound by Typeable"
+
+evBindDepName :: EvBindDep -> Name
+evBindDepName = \ case
+ EvidenceVar n -> n
+ RecordField selector _record -> selector
+ TypeableEvidence n -> n
+
+evBindDepHieName :: EvBindDep -> HieName
+evBindDepHieName = toHieName . evBindDepName
+
+instance Binary EvBindDep where
+ put_ bh = \ case
+ EvidenceVar n -> do
+ putByte bh 0
+ put_ bh n
+ RecordField n sel -> do
+ putByte bh 1
+ put_ bh n
+ put_ bh sel
+ TypeableEvidence n -> do
+ putByte bh 2
+ put_ bh n
+
+ get bh =
+ getByte bh >>= \ case
+ 0 -> EvidenceVar <$> get bh
+ 1 -> RecordField <$> get bh <*> get bh
+ 2 -> TypeableEvidence <$> get bh
+ t -> fail $ "EvBindDep: Unknown tag: " ++ show t
+
-- | Eq/Ord instances compare on the converted HieName,
-- as non-exported names may have different uniques after
-- a roundtrip
-newtype EvBindDeps = EvBindDeps { getEvBindDeps :: [Name] }
+newtype EvBindDeps = EvBindDeps { getEvBindDeps :: [EvBindDep] }
deriving Outputable
+evBindDepsNames :: EvBindDeps -> [Name]
+evBindDepsNames = map evBindDepName . getEvBindDeps
+
instance Eq EvBindDeps where
- (==) = coerce ((==) `on` map toHieName)
+ (==) = coerce ((==) `on` map evBindDepHieName)
instance Ord EvBindDeps where
- compare = coerce (compare `on` map toHieName)
+ compare = coerce (compare `on` map evBindDepHieName)
instance Binary EvBindDeps where
put_ bh (EvBindDeps xs) = put_ bh xs
=====================================
compiler/GHC/Iface/Ext/Utils.hs
=====================================
@@ -145,7 +145,7 @@ getEvidenceTree refmap var = go emptyNameSet var
det <- S.toList $ identInfo dets
case det of
EvidenceVarBind src@(EvLetBind (getEvBindDeps -> xs)) scp spn ->
- pure $ Just ((src,scp,spn),mapMaybe (go $ extendNameSet seen var) xs)
+ pure $ Just ((src,scp,spn),mapMaybe (go (extendNameSet seen var) . evBindDepName) xs)
EvidenceVarBind src scp spn -> pure $ Just ((src,scp,spn),[])
_ -> pure Nothing
pure $ Tree.Node (EvidenceInfo var sp typ (Just evdet)) children
@@ -390,7 +390,7 @@ definedInAsts asts n = case nameSrcSpan n of
getEvidenceBindDeps :: ContextInfo -> [Name]
getEvidenceBindDeps (EvidenceVarBind (EvLetBind xs) _ _) =
- getEvBindDeps xs
+ evBindDepsNames xs
getEvidenceBindDeps _ = []
isEvidenceBind :: ContextInfo -> Bool
=====================================
compiler/GHC/Rename/Expr.hs
=====================================
@@ -422,7 +422,7 @@ rnExpr (HsGetField _ e f)
; let f' = rnDotFieldOcc <$> f
; return ( mkExpandedExpr
(HsGetField noExtField e f')
- (mkGetField getField e (fmap (unLoc . dfoLabel) f'))
+ (mkGetField getField e (dfoLabel $ unLoc f'))
, fv_e `plusFN` fv_getField ) }
rnExpr (HsProjection _ fs)
@@ -431,7 +431,7 @@ rnExpr (HsProjection _ fs)
; let fs' = NE.map rnDotFieldOcc fs
; return ( mkExpandedExpr
(HsProjection noExtField fs')
- (mkProjection getField circ $ NE.map (unLoc . dfoLabel) fs')
+ (mkProjection getField circ $ NE.map dfoLabel fs')
, unitFN circ `plusFN` fv_getField) }
------------------------------------------
@@ -2882,8 +2882,9 @@ rnHsIf p b1 b2
-- mkGetField arg field calculates a get_field @field arg expression.
-- e.g. z.x = mkGetField z x = get_field @x z
-mkGetField :: Name -> LHsExpr GhcRn -> LocatedAn NoEpAnns FieldLabelString -> HsExpr GhcRn
-mkGetField get_field arg field = unLoc (head $ mkGet get_field (arg :| []) field)
+mkGetField :: Name -> LHsExpr GhcRn -> XRec GhcRn FieldLabelString -> HsExpr GhcRn
+mkGetField get_field arg field =
+ HsApp noExtField (mkGetFieldExpr get_field field) arg
-- mkSetField a field b calculates a set_field @field expression.
-- e.g mkSetSetField a field b = set_field @"field" a b (read as "set field 'field' to a on b").
@@ -2902,14 +2903,16 @@ mkSet set_field acc (field, g) = wrapGenSpan (mkSetField set_field g field acc)
-- mkProjection fields calculates a projection.
-- e.g. .x = mkProjection [x] = getField @"x"
-- .x.y = mkProjection [.x, .y] = (.y) . (.x) = getField @"y" . getField @"x"
-mkProjection :: Name -> Name -> NonEmpty FieldLabelString -> HsExpr GhcRn
-mkProjection getFieldName circName (field :| fields) = foldl' f (proj field) fields
+mkProjection :: Name -> Name -> NonEmpty (XRec GhcRn FieldLabelString) -> HsExpr GhcRn
+mkProjection getFieldName circName (field :| fields) =
+ unLoc $ foldl' f (mkGetFieldExpr getFieldName field) fields
where
- f :: HsExpr GhcRn -> FieldLabelString -> HsExpr GhcRn
- f acc field = genHsApps circName $ map wrapGenSpan [proj field, acc]
+ f :: LHsExpr GhcRn -> XRec GhcRn FieldLabelString -> LHsExpr GhcRn
+ f acc field = wrapGenSpan $ genHsApps circName [mkGetFieldExpr getFieldName field, acc]
- proj :: FieldLabelString -> HsExpr GhcRn
- proj (FieldLabelString f) = genHsVar getFieldName `genAppType` genHsTyLit f
+mkGetFieldExpr :: Name -> XRec GhcRn FieldLabelString -> LHsExpr GhcRn
+mkGetFieldExpr getFieldName (L ann (FieldLabelString f)) =
+ wrapGenSpan' (getHasLoc ann) (genHsVar getFieldName `genAppType` genHsTyLit f)
-- mkProjUpdateSetField calculates functions representing dot notation record updates.
-- e.g. Suppose an update like foo.bar = 1.
=====================================
testsuite/tests/hiefile/should_run/HasFieldQueries.stdout
=====================================
@@ -1,27 +1,167 @@
==========================
At point (13,17), we found:
==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ field1 of Record Thing]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
==========================
At point (16,25), we found:
==========================
==========================
At point (16,27), we found:
==========================
+┌
+│ $dHasField at HasFieldQueries.hs:16:1-32, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ field1 of Record Thing]
+│ with scope: LocalScope HasFieldQueries.hs:16:1-32
+│ bound at: HasFieldQueries.hs:16:1-32
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
==========================
At point (23,17), we found:
==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "nested1" NestedThing Thing
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ nested1 of Record NestedThing]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ nested1 at HasFieldQueries.hs:1:1, of type: NestedThing -> Thing
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:20:34
+ └
+
==========================
At point (23,25), we found:
==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+ │ is an evidence variable bound by a let, depending on: [C:HasField,
+ │ field1 of Record Thing]
+ │ with scope: ModuleScope
+ │
+ │ Defined at <no location info>
+ └
+ |
+ +- ┌
+ | │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ | │ is a usage of an external evidence variable
+ | │ Defined in `GHC.Internal.Records'
+ | └
+ |
+ `- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
==========================
At point (27,20), we found:
==========================
+┌
+│ $dHasField at HasFieldQueries.hs:27:1-40, of type: HasField "nested1" r r
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: LocalScope HasFieldQueries.hs:27:1-40
+│ bound at: HasFieldQueries.hs:27:1-40
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:27:1-40, of type: HasField "nested1" r r
+ │ is an evidence variable bound by a type signature
+ │ with scope: LocalScope HasFieldQueries.hs:27:1-40
+ │ bound at: HasFieldQueries.hs:27:1-40
+ │ Defined at <no location info>
+ └
+
==========================
At point (27,28), we found:
==========================
+┌
+│ $dHasField at HasFieldQueries.hs:27:1-40, of type: HasField "field2" r Bool
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: LocalScope HasFieldQueries.hs:27:1-40
+│ bound at: HasFieldQueries.hs:27:1-40
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:27:1-40, of type: HasField "field2" r Bool
+ │ is an evidence variable bound by a type signature
+ │ with scope: LocalScope HasFieldQueries.hs:27:1-40
+ │ bound at: HasFieldQueries.hs:27:1-40
+ │ Defined at <no location info>
+ └
+
==========================
At point (33,22), we found:
==========================
+┌
+│ $dHasField at HasFieldQueries.hs:33:1-27, of type: HasField "field1" x Char
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: LocalScope HasFieldQueries.hs:33:1-27
+│ bound at: HasFieldQueries.hs:33:1-27
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:33:1-27, of type: HasField "field1" x Char
+ │ is an evidence variable bound by a HsWrapper
+ │ with scope: LocalScope HasFieldQueries.hs:33:1-27
+ │ bound at: HasFieldQueries.hs:33:1-27
+ │ Defined at <no location info>
+ └
+
==========================
At point (37,14), we found:
==========================
@@ -35,21 +175,70 @@ At point (37,14), we found:
|
`- ┌
│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
- │ is an evidence variable bound by a let, depending on: [C:HasField]
+ │ is an evidence variable bound by a let, depending on: [C:HasField,
+ │ field1 of Record Thing]
│ with scope: ModuleScope
│
│ Defined at <no location info>
└
|
+ +- ┌
+ | │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ | │ is a usage of an external evidence variable
+ | │ Defined in `GHC.Internal.Records'
+ | └
+ |
`- ┌
- │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
│ is a usage of an external evidence variable
- │ Defined in `GHC.Internal.Records'
+ │ Defined at HasFieldQueries.hs:9:21
└
==========================
At point (41,21), we found:
==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "nested1" NestedThing Thing
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ nested1 of Record NestedThing]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ nested1 at HasFieldQueries.hs:1:1, of type: NestedThing -> Thing
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:20:34
+ └
+
==========================
At point (41,30), we found:
==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ field1 of Record Thing]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
=====================================
testsuite/tests/hiefile/should_run/HieTypeable.hs
=====================================
@@ -0,0 +1,28 @@
+module Main where
+
+import Data.Dynamic
+import Data.Typeable
+import TestUtils
+
+data Thing = Thing {field1 :: Char, field2 :: Bool}
+ deriving (Show, Eq)
+
+castFromDynamic :: Dynamic -> Maybe Thing
+castFromDynamic d = fromDynamic d
+ -- ^ this is the point
+
+rep :: Thing -> TypeRep
+rep d = typeOf d
+ -- ^ this is the point
+
+points =
+ [ (11,21)
+ , (15,10)
+ ]
+
+main = do
+ (df, hf) <- readTestHie "HieTypeable.hie"
+ let refmap = generateReferencesMap $ getAsts $ hie_asts hf
+
+ traverse (explainEv df hf refmap) points
+ return ()
=====================================
testsuite/tests/hiefile/should_run/HieTypeable.stdout
=====================================
@@ -0,0 +1,30 @@
+==========================
+At point (11,21), we found:
+==========================
+┌
+│ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+│ is an evidence variable bound by a let, depending on: [$dTypeable]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+ │ is an evidence variable bound by a let, depending on: []
+ │ with scope: ModuleScope
+ │
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (15,10), we found:
+==========================
+┌
+│ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+│ is an evidence variable bound by a let, depending on: []
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+
=====================================
testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.stdout
=====================================
@@ -1,27 +1,211 @@
==========================
At point (23,16), we found:
==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:1:1, of type: HasField "a" A Int
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ a of Record A]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ a at NoFieldSelectorQueries.hs:1:1, of type: A -> Int
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:9:14
+ └
+
==========================
At point (27,19), we found:
==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:27:1-19, of type: HasField "a" r Int
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:27:1-19
+│ bound at: NoFieldSelectorQueries.hs:27:1-19
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at NoFieldSelectorQueries.hs:27:1-19, of type: HasField "a" r Int
+ │ is an evidence variable bound by a HsWrapper
+ │ with scope: LocalScope NoFieldSelectorQueries.hs:27:1-19
+ │ bound at: NoFieldSelectorQueries.hs:27:1-19
+ │ Defined at <no location info>
+ └
+
==========================
At point (30,15), we found:
==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:30:1-17, of type: HasField "n" B A
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ n of Record B]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:30:1-17
+│ bound at: NoFieldSelectorQueries.hs:30:1-17
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ n at NoFieldSelectorQueries.hs:30:1-17, of type: B -> A
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:10:24
+ └
+
==========================
At point (30,17), we found:
==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:30:1-17, of type: HasField "b" A Char
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ b of Record A]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:30:1-17
+│ bound at: NoFieldSelectorQueries.hs:30:1-17
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ b at NoFieldSelectorQueries.hs:30:1-17, of type: A -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:9:24
+ └
+
==========================
At point (33,16), we found:
==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:33:1-16, of type: HasField "c" C Float
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ c of Record C]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:33:1-16
+│ bound at: NoFieldSelectorQueries.hs:33:1-16
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ c at NoFieldSelectorQueries.hs:1:1, of type: C -> Float
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:12:9
+ └
+
==========================
At point (36,16), we found:
==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:36:1-16, of type: HasField "c" C Float
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ c of Record C]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:36:1-16
+│ bound at: NoFieldSelectorQueries.hs:36:1-16
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ c at NoFieldSelectorQueries.hs:1:1, of type: C -> Float
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:12:9
+ └
+
==========================
At point (40,23), we found:
==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:1:1, of type: HasField "c" C Float
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ c of Record C]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ c at NoFieldSelectorQueries.hs:1:1, of type: C -> Float
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:12:9
+ └
+
==========================
At point (43,15), we found:
==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:43:1-15, of type: HasField "e" C Int
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ e of Record C]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:43:1-15
+│ bound at: NoFieldSelectorQueries.hs:43:1-15
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ e at NoFieldSelectorQueries.hs:43:1-15, of type: C -> Int
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:14:9
+ └
+
==========================
At point (46,15), we found:
==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:46:1-15, of type: HasField "e" C Int
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ e of Record C]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:46:1-15
+│ bound at: NoFieldSelectorQueries.hs:46:1-15
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ e at NoFieldSelectorQueries.hs:43:1-15, of type: C -> Int
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:14:9
+ └
+
=====================================
testsuite/tests/hiefile/should_run/RecordDotTypes.stdout
=====================================
@@ -1,9 +1,9 @@
At (22,6), got type: MyRecord
-At (22,20), got type: Integer
+At (22,20), got type: MyRecord -> Integer
At (22,25), got type: MyRecord
-At (22,28), got type: String
-At (22,29), got type: String
-At (22,6) - (22,8), got type: String
+At (22,28), got type: MyChild -> [Char]
+At (22,29), got type: MyChild -> [Char]
+At (22,6) - (22,8), got type: [Char]
At (22,17) - (22,20), got type: Integer
At (22,25) - (22,27), got type: MyChild
-At (22,25) - (22,29), got type: String
+At (22,25) - (22,29), got type: [Char]
=====================================
testsuite/tests/hiefile/should_run/T23492.stdout
=====================================
@@ -4,4 +4,4 @@ PartialFieldSelector
At (18,7), got type: PartialFieldSelector -> Bool
At (23,7), got type: PartialFieldSelector
At (23,8), got type: PartialFieldSelector
-At (23,9), got type: Bool
+At (23,9), got type: PartialFieldSelector -> Bool
=====================================
testsuite/tests/hiefile/should_run/all.T
=====================================
@@ -12,3 +12,4 @@ test('HieGadtConSigs', [extra_run_opts('"' + config.libdir + '"'), extra_files([
test('T25709', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
test('HasFieldQueries', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
test('NoFieldSelectorQueries', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
+test('HieTypeable', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ce94ad34bc3f91a1c9cee8b311ac11…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ce94ad34bc3f91a1c9cee8b311ac11…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/fendor/has-field-hie] 3 commits: Add more .hie file tests for OverloadedRecordDot
by Hannes Siebenhandl (＠fendor) 17 Sep '26
by Hannes Siebenhandl (＠fendor) 17 Sep '26
17 Sep '26
Hannes Siebenhandl pushed to branch wip/fendor/has-field-hie at Glasgow Haskell Compiler / GHC
Commits:
fabdfe82 by fendor at 2026-09-17T11:29:46+02:00
Add more .hie file tests for OverloadedRecordDot
Add 'selectRange' function to get the type of a selection.
- - - - -
0ec259eb by fendor at 2026-09-17T11:32:11+02:00
Record `FieldLabel` source span in AST node
We attach evidence variables based on the source span of the concrete
AST node in the HIE file.
The evidence for the `HasField` constraint has the source span of the
field selector, e.g. the AST node that gave rise to the `HasField`
constraint.
Since the AST node doesn't show up in the HIE file, the evidence for
`HasField` was also not recorded for the span. Thus, `getEvidenceTree`
wouldn't even list `HasField` as evidence, even in the perfectly normal
case of:
baz :: HasField "foo" f Int => f -> Int
baz f = f.foo
Requesting the evidence tree for `.foo` should point to the definition
of `baz`, but since we omitted the source span for the field selector `.foo`
from the AST node, the HIE file doesn't list it as evidence.
By using the source spans of the individual field selectors, there are two consequences:
* We can see the `HasField` evidence for record dot syntax at the field
selector span
* The reported type of `.foo` is `Foo -> Int` instead of just `Int`
The latter is a change of behaviour that is unfortunate but the right
behaviour, since there is now a source span for the whole expression
`x.foo`, one for `x` and one for the selector `.foo`.
If you query for the type at span `x.foo`, then the correct type `Int`
is shown, but in downstream tooling (such as HLS), such requests are not
possible in LSP. Thus, the behaviour changes.
- - - - -
ce94ad34 by fendor at 2026-09-17T11:33:19+02:00
Typeable test
- - - - -
15 changed files:
- + changelog.d/record-dot-evidence
- compiler/GHC/Iface/Ext/Ast.hs
- compiler/GHC/Iface/Ext/Types.hs
- compiler/GHC/Iface/Ext/Utils.hs
- compiler/GHC/Rename/Expr.hs
- + testsuite/tests/hiefile/should_run/HasFieldQueries.hs
- + testsuite/tests/hiefile/should_run/HasFieldQueries.stdout
- + testsuite/tests/hiefile/should_run/HieTypeable.hs
- + testsuite/tests/hiefile/should_run/HieTypeable.stdout
- + testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.hs
- + testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.stdout
- testsuite/tests/hiefile/should_run/RecordDotTypes.hs
- testsuite/tests/hiefile/should_run/RecordDotTypes.stdout
- testsuite/tests/hiefile/should_run/T23492.stdout
- testsuite/tests/hiefile/should_run/all.T
Changes:
=====================================
changelog.d/record-dot-evidence
=====================================
@@ -0,0 +1,12 @@
+section: compiler
+synopsis: Record selector functions as evidence for `HasField` constraints during .hie file generation.
+description: {
+ We record the record selector `foo` of an expression such as `f.foo` as evidence for
+ solving the constraint `HasField "foo" record ty`.
+
+ This allows us to point to the definition source location of the record selector `foo`, allowing
+ users to jump to definition using the evidence variables.
+}
+
+issues: #25418
+mrs: !16694
=====================================
compiler/GHC/Iface/Ext/Ast.hs
=====================================
@@ -23,7 +23,6 @@ import GHC.Core.DataCon ( dataConWrapperType )
import GHC.Core.Type ( Type, ForAllTyFlag(..) )
import GHC.Core.TyCon ( TyCon, tyConClass_maybe )
import GHC.Core.InstEnv
-import GHC.Core.Predicate ( isEvId )
import GHC.Hs
import GHC.Hs.Syn.Type
@@ -33,7 +32,7 @@ import GHC.Types.Basic
import GHC.Types.UnresolvedImport ( isGeneratedImport )
import GHC.Types.FieldLabel
import GHC.Types.Avail ( Avails )
-import GHC.Types.Id ( isDataConId_maybe )
+import GHC.Types.Id ( isDataConId_maybe, isId, idDetails )
import GHC.Types.Name ( Name, nameSrcSpan, nameUnique, wiredInNameTyThing_maybe, getName )
import GHC.Types.Name.Env ( NameEnv, emptyNameEnv, extendNameEnv, lookupNameEnv )
import GHC.Types.Name.Reader ( RecFieldInfo(..), WithUserRdr(..) )
@@ -81,6 +80,7 @@ import Control.Applicative ( (<|>) )
import GHC.Types.TypeEnv ( TypeEnv )
import Control.Arrow ( second )
import Data.Traversable ( mapAccumR )
+import GHC.Types.Id.Info (IdDetails(..), recSelParentName)
{- Note [Updating HieAst for changes in the GHC AST]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -682,7 +682,7 @@ instance ToHie (Context (Located (WithUserRdr Name))) where
hieEvIdsOfTerm :: EvTerm -> [EvId]
-- Returns only EvIds satisfying relevantEvId
-hieEvIdsOfTerm = runFVSelectiveList isEvId . evTermFVs
+hieEvIdsOfTerm = runFVSelectiveList isId . evTermFVs
instance ToHie (EvBindContext (LocatedA TcEvBinds)) where
toHie (EvBindContext sc sp (L span (EvBinds bs)))
@@ -690,7 +690,7 @@ instance ToHie (EvBindContext (LocatedA TcEvBinds)) where
where
go evbind = do
let evDeps = hieEvIdsOfTerm $ eb_rhs evbind
- depNames = EvBindDeps $ map varName evDeps
+ depNames = EvBindDeps $ map classifyEvBindDep evDeps
concatM $
[ toHie (C (EvidenceVarBind (EvLetBind depNames) (combineScopes sc (mkScope span)) sp)
(L span $ eb_lhs evbind))
@@ -698,6 +698,12 @@ instance ToHie (EvBindContext (LocatedA TcEvBinds)) where
]
toHie _ = pure []
+classifyEvBindDep :: EvId -> EvBindDep
+classifyEvBindDep evId =
+ case idDetails evId of
+ RecSelId{sel_tycon} -> RecordField (varName evId) (recSelParentName sel_tycon)
+ _ -> EvidenceVar (varName evId)
+
instance ToHie (LocatedA HsWrapper) where
toHie (L osp wrap)
= case wrap of
=====================================
compiler/GHC/Iface/Ext/Types.hs
=====================================
@@ -598,17 +598,79 @@ instance Outputable EvVarSource where
ppr (EvInstBind True cls) = text "bound due to a superclass of " <+> ppr cls
ppr (EvLetBind deps) = text "bound by a let, depending on:" <+> ppr deps
+-- | Evidence binding dependency with additional details.
+data EvBindDep
+ = EvidenceVar Name
+ -- ^ Evidence variable such as a type class constructor.
+ --
+ -- For example, @C:HasField@, @$dShow@ (dictionaries) or @$fCList@.
+ --
+ -- This is the default representation of a 'EvBindDep'.
+ | RecordField
+ -- ^ Evidence variable of a record selector.
+ --
+ -- This is for example generated with @-XOverloadedRecordDot@, where
+ -- the evidence includes a reference to which record selector is used
+ -- to implement @getField@.
+ Name
+ -- ^ 'Name' of the record selector
+ Name
+ -- ^ 'Name' of the parent type.
+ | TypeableEvidence
+ -- ^ Evidence of a @Typeable@ constraint.
+ Name
+ -- ^ Name of the type the evidence was generated for.
+ deriving (Eq, Ord)
+
+instance Outputable EvBindDep where
+ ppr = \ case
+ EvidenceVar n -> ppr n
+ RecordField sel parent -> ppr sel <+> text "of Record" <+> ppr parent
+ TypeableEvidence n -> ppr n <+> text "bound by Typeable"
+
+evBindDepName :: EvBindDep -> Name
+evBindDepName = \ case
+ EvidenceVar n -> n
+ RecordField selector _record -> selector
+ TypeableEvidence n -> n
+
+evBindDepHieName :: EvBindDep -> HieName
+evBindDepHieName = toHieName . evBindDepName
+
+instance Binary EvBindDep where
+ put_ bh = \ case
+ EvidenceVar n -> do
+ putByte bh 0
+ put_ bh n
+ RecordField n sel -> do
+ putByte bh 1
+ put_ bh n
+ put_ bh sel
+ TypeableEvidence n -> do
+ putByte bh 2
+ put_ bh n
+
+ get bh =
+ getByte bh >>= \ case
+ 0 -> EvidenceVar <$> get bh
+ 1 -> RecordField <$> get bh <*> get bh
+ 2 -> TypeableEvidence <$> get bh
+ t -> fail $ "EvBindDep: Unknown tag: " ++ show t
+
-- | Eq/Ord instances compare on the converted HieName,
-- as non-exported names may have different uniques after
-- a roundtrip
-newtype EvBindDeps = EvBindDeps { getEvBindDeps :: [Name] }
+newtype EvBindDeps = EvBindDeps { getEvBindDeps :: [EvBindDep] }
deriving Outputable
+evBindDepsNames :: EvBindDeps -> [Name]
+evBindDepsNames = map evBindDepName . getEvBindDeps
+
instance Eq EvBindDeps where
- (==) = coerce ((==) `on` map toHieName)
+ (==) = coerce ((==) `on` map evBindDepHieName)
instance Ord EvBindDeps where
- compare = coerce (compare `on` map toHieName)
+ compare = coerce (compare `on` map evBindDepHieName)
instance Binary EvBindDeps where
put_ bh (EvBindDeps xs) = put_ bh xs
=====================================
compiler/GHC/Iface/Ext/Utils.hs
=====================================
@@ -82,15 +82,19 @@ resolveVisibility kind ty_args
foldType :: (HieType a -> a) -> HieTypeFix -> a
foldType f (Roll t) = f $ fmap (foldType f) t
-selectPoint :: HieFile -> (Int,Int) -> Maybe (HieAST Int)
-selectPoint hf (sl,sc) = getFirst $
+selectPoint :: HieFile -> (Int,Int) -> Maybe (HieAST TypeIndex)
+selectPoint hf p = selectRange hf p p
+
+selectRange :: HieFile -> (Int,Int) -> (Int,Int) -> Maybe (HieAST TypeIndex)
+selectRange hf (sl,sc) (el, ec) = getFirst $
flip foldMap (M.toList (getAsts $ hie_asts hf)) $ \(HiePath fs,ast) -> First $
case selectSmallestContaining (sp fs) ast of
Nothing -> Nothing
Just ast' -> Just ast'
where
sloc fs = mkRealSrcLoc fs sl sc
- sp fs = mkRealSrcSpan (sloc fs) (sloc fs)
+ eloc fs = mkRealSrcLoc fs el ec
+ sp fs = mkRealSrcSpan (sloc fs) (eloc fs)
findEvidenceUse :: NodeIdentifiers a -> [Name]
findEvidenceUse ni = [n | (Right n, dets) <- xs, any isEvidenceUse (identInfo dets)]
@@ -141,7 +145,7 @@ getEvidenceTree refmap var = go emptyNameSet var
det <- S.toList $ identInfo dets
case det of
EvidenceVarBind src@(EvLetBind (getEvBindDeps -> xs)) scp spn ->
- pure $ Just ((src,scp,spn),mapMaybe (go $ extendNameSet seen var) xs)
+ pure $ Just ((src,scp,spn),mapMaybe (go (extendNameSet seen var) . evBindDepName) xs)
EvidenceVarBind src scp spn -> pure $ Just ((src,scp,spn),[])
_ -> pure Nothing
pure $ Tree.Node (EvidenceInfo var sp typ (Just evdet)) children
@@ -386,7 +390,7 @@ definedInAsts asts n = case nameSrcSpan n of
getEvidenceBindDeps :: ContextInfo -> [Name]
getEvidenceBindDeps (EvidenceVarBind (EvLetBind xs) _ _) =
- getEvBindDeps xs
+ evBindDepsNames xs
getEvidenceBindDeps _ = []
isEvidenceBind :: ContextInfo -> Bool
=====================================
compiler/GHC/Rename/Expr.hs
=====================================
@@ -422,7 +422,7 @@ rnExpr (HsGetField _ e f)
; let f' = rnDotFieldOcc <$> f
; return ( mkExpandedExpr
(HsGetField noExtField e f')
- (mkGetField getField e (fmap (unLoc . dfoLabel) f'))
+ (mkGetField getField e (dfoLabel $ unLoc f'))
, fv_e `plusFN` fv_getField ) }
rnExpr (HsProjection _ fs)
@@ -431,7 +431,7 @@ rnExpr (HsProjection _ fs)
; let fs' = NE.map rnDotFieldOcc fs
; return ( mkExpandedExpr
(HsProjection noExtField fs')
- (mkProjection getField circ $ NE.map (unLoc . dfoLabel) fs')
+ (mkProjection getField circ $ NE.map dfoLabel fs')
, unitFN circ `plusFN` fv_getField) }
------------------------------------------
@@ -2882,8 +2882,9 @@ rnHsIf p b1 b2
-- mkGetField arg field calculates a get_field @field arg expression.
-- e.g. z.x = mkGetField z x = get_field @x z
-mkGetField :: Name -> LHsExpr GhcRn -> LocatedAn NoEpAnns FieldLabelString -> HsExpr GhcRn
-mkGetField get_field arg field = unLoc (head $ mkGet get_field (arg :| []) field)
+mkGetField :: Name -> LHsExpr GhcRn -> XRec GhcRn FieldLabelString -> HsExpr GhcRn
+mkGetField get_field arg field =
+ HsApp noExtField (mkGetFieldExpr get_field field) arg
-- mkSetField a field b calculates a set_field @field expression.
-- e.g mkSetSetField a field b = set_field @"field" a b (read as "set field 'field' to a on b").
@@ -2902,14 +2903,16 @@ mkSet set_field acc (field, g) = wrapGenSpan (mkSetField set_field g field acc)
-- mkProjection fields calculates a projection.
-- e.g. .x = mkProjection [x] = getField @"x"
-- .x.y = mkProjection [.x, .y] = (.y) . (.x) = getField @"y" . getField @"x"
-mkProjection :: Name -> Name -> NonEmpty FieldLabelString -> HsExpr GhcRn
-mkProjection getFieldName circName (field :| fields) = foldl' f (proj field) fields
+mkProjection :: Name -> Name -> NonEmpty (XRec GhcRn FieldLabelString) -> HsExpr GhcRn
+mkProjection getFieldName circName (field :| fields) =
+ unLoc $ foldl' f (mkGetFieldExpr getFieldName field) fields
where
- f :: HsExpr GhcRn -> FieldLabelString -> HsExpr GhcRn
- f acc field = genHsApps circName $ map wrapGenSpan [proj field, acc]
+ f :: LHsExpr GhcRn -> XRec GhcRn FieldLabelString -> LHsExpr GhcRn
+ f acc field = wrapGenSpan $ genHsApps circName [mkGetFieldExpr getFieldName field, acc]
- proj :: FieldLabelString -> HsExpr GhcRn
- proj (FieldLabelString f) = genHsVar getFieldName `genAppType` genHsTyLit f
+mkGetFieldExpr :: Name -> XRec GhcRn FieldLabelString -> LHsExpr GhcRn
+mkGetFieldExpr getFieldName (L ann (FieldLabelString f)) =
+ wrapGenSpan' (getHasLoc ann) (genHsVar getFieldName `genAppType` genHsTyLit f)
-- mkProjUpdateSetField calculates functions representing dot notation record updates.
-- e.g. Suppose an update like foo.bar = 1.
=====================================
testsuite/tests/hiefile/should_run/HasFieldQueries.hs
=====================================
@@ -0,0 +1,65 @@
+{-# LANGUAGE OverloadedRecordDot #-}
+module Main where
+
+import TestUtils
+import GHC.Records
+import GHC.TypeLits
+import Data.Tree
+
+data Thing = Thing {field1 :: Char, field2 :: Bool}
+ deriving (Show, Eq)
+
+foo :: Thing -> String
+foo t = show t.field1
+-- ^ this is the point
+
+testing2 (x :: Thing) = x.field1
+-- ^ this is the point
+-- ^ this is the point
+
+data NestedThing = NestedThing { nested1 :: Thing }
+
+nestedSig :: NestedThing -> Char
+nestedSig n = n.nested1.field1
+-- ^ this is the point
+-- ^ this is the point
+
+nestedNoSig n = n.nested1.field2 :: Bool
+-- ^ this is the point
+-- ^ this is the point
+
+
+withConstraint :: HasField "field1" x Char => x -> Char
+withConstraint x = x.field1
+-- ^ this is the point
+
+prefix :: Thing -> Char
+prefix x = (.field1) x
+-- ^ this is the point
+
+prefixNested :: NestedThing -> Char
+prefixNested x = (.nested1.field1) x
+-- ^ this is the point
+-- ^ this is the point
+
+
+points =
+ [ (13,17)
+ , (16,25)
+ , (16,27)
+ , (23,17)
+ , (23,25)
+ , (27,20)
+ , (27,28)
+ , (33,22)
+ , (37,14)
+ , (41,21)
+ , (41,30)
+ ]
+
+main = do
+ (df, hf) <- readTestHie "HasFieldQueries.hie"
+ let refmap = generateReferencesMap $ getAsts $ hie_asts hf
+
+ traverse (explainEv df hf refmap) points
+ return ()
=====================================
testsuite/tests/hiefile/should_run/HasFieldQueries.stdout
=====================================
@@ -0,0 +1,244 @@
+==========================
+At point (13,17), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ field1 of Record Thing]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
+==========================
+At point (16,25), we found:
+==========================
+==========================
+At point (16,27), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:16:1-32, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ field1 of Record Thing]
+│ with scope: LocalScope HasFieldQueries.hs:16:1-32
+│ bound at: HasFieldQueries.hs:16:1-32
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
+==========================
+At point (23,17), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "nested1" NestedThing Thing
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ nested1 of Record NestedThing]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ nested1 at HasFieldQueries.hs:1:1, of type: NestedThing -> Thing
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:20:34
+ └
+
+==========================
+At point (23,25), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+ │ is an evidence variable bound by a let, depending on: [C:HasField,
+ │ field1 of Record Thing]
+ │ with scope: ModuleScope
+ │
+ │ Defined at <no location info>
+ └
+ |
+ +- ┌
+ | │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ | │ is a usage of an external evidence variable
+ | │ Defined in `GHC.Internal.Records'
+ | └
+ |
+ `- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
+==========================
+At point (27,20), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:27:1-40, of type: HasField "nested1" r r
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: LocalScope HasFieldQueries.hs:27:1-40
+│ bound at: HasFieldQueries.hs:27:1-40
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:27:1-40, of type: HasField "nested1" r r
+ │ is an evidence variable bound by a type signature
+ │ with scope: LocalScope HasFieldQueries.hs:27:1-40
+ │ bound at: HasFieldQueries.hs:27:1-40
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (27,28), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:27:1-40, of type: HasField "field2" r Bool
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: LocalScope HasFieldQueries.hs:27:1-40
+│ bound at: HasFieldQueries.hs:27:1-40
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:27:1-40, of type: HasField "field2" r Bool
+ │ is an evidence variable bound by a type signature
+ │ with scope: LocalScope HasFieldQueries.hs:27:1-40
+ │ bound at: HasFieldQueries.hs:27:1-40
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (33,22), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:33:1-27, of type: HasField "field1" x Char
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: LocalScope HasFieldQueries.hs:33:1-27
+│ bound at: HasFieldQueries.hs:33:1-27
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:33:1-27, of type: HasField "field1" x Char
+ │ is an evidence variable bound by a HsWrapper
+ │ with scope: LocalScope HasFieldQueries.hs:33:1-27
+ │ bound at: HasFieldQueries.hs:33:1-27
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (37,14), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+ │ is an evidence variable bound by a let, depending on: [C:HasField,
+ │ field1 of Record Thing]
+ │ with scope: ModuleScope
+ │
+ │ Defined at <no location info>
+ └
+ |
+ +- ┌
+ | │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ | │ is a usage of an external evidence variable
+ | │ Defined in `GHC.Internal.Records'
+ | └
+ |
+ `- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
+==========================
+At point (41,21), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "nested1" NestedThing Thing
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ nested1 of Record NestedThing]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ nested1 at HasFieldQueries.hs:1:1, of type: NestedThing -> Thing
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:20:34
+ └
+
+==========================
+At point (41,30), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ field1 of Record Thing]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
=====================================
testsuite/tests/hiefile/should_run/HieTypeable.hs
=====================================
@@ -0,0 +1,28 @@
+module Main where
+
+import Data.Dynamic
+import Data.Typeable
+import TestUtils
+
+data Thing = Thing {field1 :: Char, field2 :: Bool}
+ deriving (Show, Eq)
+
+castFromDynamic :: Dynamic -> Maybe Thing
+castFromDynamic d = fromDynamic d
+ -- ^ this is the point
+
+rep :: Thing -> TypeRep
+rep d = typeOf d
+ -- ^ this is the point
+
+points =
+ [ (11,21)
+ , (15,10)
+ ]
+
+main = do
+ (df, hf) <- readTestHie "HieTypeable.hie"
+ let refmap = generateReferencesMap $ getAsts $ hie_asts hf
+
+ traverse (explainEv df hf refmap) points
+ return ()
=====================================
testsuite/tests/hiefile/should_run/HieTypeable.stdout
=====================================
@@ -0,0 +1,30 @@
+==========================
+At point (11,21), we found:
+==========================
+┌
+│ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+│ is an evidence variable bound by a let, depending on: [$dTypeable]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+ │ is an evidence variable bound by a let, depending on: []
+ │ with scope: ModuleScope
+ │
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (15,10), we found:
+==========================
+┌
+│ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+│ is an evidence variable bound by a let, depending on: []
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+
=====================================
testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.hs
=====================================
@@ -0,0 +1,67 @@
+{-# LANGUAGE NoFieldSelectors #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+module Main where
+
+import TestUtils
+import GHC.Records
+
+data A = A { a :: Int, b :: Char }
+data B = B { a :: Int, n :: A }
+data C
+ = C { c :: Float }
+ | D { c :: Float }
+ | E { e :: Int }
+
+valA = A { a = 1, b = 'b' }
+valB = B { a = 1, n = valA }
+valC = C { c = 1.0 }
+valD = D { c = 2.0 }
+valE = E { e = 1 }
+
+accessA :: Int
+accessA = valA.a
+-- ^ 1
+
+accessField :: HasField "a" r Int => r -> Int
+accessField r = r.a
+-- ^ 2
+
+nested = valB.n.b
+-- ^ ^
+-- 3 4
+multi1a = valC.c
+-- ^
+-- 5
+multi1b = valD.c
+-- ^
+-- 6
+multi1c :: C -> Float
+multi1c someC = someC.c -- Where does this point to?
+-- ^
+-- 7
+multi3 = valE.e
+-- ^
+-- 8
+multi4 = valD.e -- This is a run-time error, but where does it point to?
+-- ^
+-- 9
+
+points =
+ [ (23, 16)
+ , (27, 19)
+ , (30, 15)
+ , (30, 17)
+ , (33, 16)
+ , (36, 16)
+ , (40, 23)
+ , (43, 15)
+ , (46, 15)
+ ]
+
+main = do
+ (df, hf) <- readTestHie "NoFieldSelectorQueries.hie"
+ let refmap = generateReferencesMap $ getAsts $ hie_asts hf
+
+ traverse (explainEv df hf refmap) points
+ return ()
=====================================
testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.stdout
=====================================
@@ -0,0 +1,211 @@
+==========================
+At point (23,16), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:1:1, of type: HasField "a" A Int
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ a of Record A]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ a at NoFieldSelectorQueries.hs:1:1, of type: A -> Int
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:9:14
+ └
+
+==========================
+At point (27,19), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:27:1-19, of type: HasField "a" r Int
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:27:1-19
+│ bound at: NoFieldSelectorQueries.hs:27:1-19
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at NoFieldSelectorQueries.hs:27:1-19, of type: HasField "a" r Int
+ │ is an evidence variable bound by a HsWrapper
+ │ with scope: LocalScope NoFieldSelectorQueries.hs:27:1-19
+ │ bound at: NoFieldSelectorQueries.hs:27:1-19
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (30,15), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:30:1-17, of type: HasField "n" B A
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ n of Record B]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:30:1-17
+│ bound at: NoFieldSelectorQueries.hs:30:1-17
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ n at NoFieldSelectorQueries.hs:30:1-17, of type: B -> A
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:10:24
+ └
+
+==========================
+At point (30,17), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:30:1-17, of type: HasField "b" A Char
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ b of Record A]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:30:1-17
+│ bound at: NoFieldSelectorQueries.hs:30:1-17
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ b at NoFieldSelectorQueries.hs:30:1-17, of type: A -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:9:24
+ └
+
+==========================
+At point (33,16), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:33:1-16, of type: HasField "c" C Float
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ c of Record C]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:33:1-16
+│ bound at: NoFieldSelectorQueries.hs:33:1-16
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ c at NoFieldSelectorQueries.hs:1:1, of type: C -> Float
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:12:9
+ └
+
+==========================
+At point (36,16), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:36:1-16, of type: HasField "c" C Float
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ c of Record C]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:36:1-16
+│ bound at: NoFieldSelectorQueries.hs:36:1-16
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ c at NoFieldSelectorQueries.hs:1:1, of type: C -> Float
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:12:9
+ └
+
+==========================
+At point (40,23), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:1:1, of type: HasField "c" C Float
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ c of Record C]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ c at NoFieldSelectorQueries.hs:1:1, of type: C -> Float
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:12:9
+ └
+
+==========================
+At point (43,15), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:43:1-15, of type: HasField "e" C Int
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ e of Record C]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:43:1-15
+│ bound at: NoFieldSelectorQueries.hs:43:1-15
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ e at NoFieldSelectorQueries.hs:43:1-15, of type: C -> Int
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:14:9
+ └
+
+==========================
+At point (46,15), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:46:1-15, of type: HasField "e" C Int
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ e of Record C]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:46:1-15
+│ bound at: NoFieldSelectorQueries.hs:46:1-15
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ e at NoFieldSelectorQueries.hs:43:1-15, of type: C -> Int
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:14:9
+ └
+
=====================================
testsuite/tests/hiefile/should_run/RecordDotTypes.hs
=====================================
@@ -22,6 +22,11 @@ x = MyRecord { a = "Hello", b = 12, c = MyChild { z = "there" } }
y = x.a ++ show x.b ++ x.c.z
-- ^ ^ ^ ^^
-- 1 2 3 45
+-- ^-^ ^-^ ^-^
+-- 6 7 8
+-- ^---^
+-- 9
+
p1,p2,p3,p4 :: (Int,Int)
p1 = (22,6)
@@ -30,10 +35,19 @@ p3 = (22,25)
p4 = (22,28)
p5 = (22,29)
+r6 = (p1, (22, 8))
+r7 = ((22,17), p2)
+r8 = (p3, (22, 27))
+r9 = (p3, p5)
+
selectPoint' :: HieFile -> (Int,Int) -> HieAST Int
selectPoint' hf loc =
maybe (error "point not found") id $ selectPoint hf loc
+selectRange' :: HieFile -> ((Int,Int), (Int, Int)) -> HieAST Int
+selectRange' hf (s, e) =
+ maybe (error "range not found") id $ selectRange hf s e
+
main = do
(df, hf) <- readTestHie "RecordDotTypes.hie"
forM_ [p1,p2,p3,p4,p5] $ \point -> do
@@ -41,3 +55,11 @@ main = do
let types = concatMap nodeType $ getSourcedNodeInfo $ sourcedNodeInfo $ selectPoint' hf point
forM_ types $ \typ -> do
putStrLn (renderHieType df $ recoverFullType typ (hie_types hf))
+
+ forM_ [r6, r7, r8, r9] $ \range -> do
+ putStr $ "At " ++ showRange range ++ ", got type: "
+ let types = concatMap nodeType $ getSourcedNodeInfo $ sourcedNodeInfo $ selectRange' hf range
+ forM_ types $ \typ -> do
+ putStrLn (renderHieType df $ recoverFullType typ (hie_types hf))
+ where
+ showRange (p1, p2) = show p1 ++ " - " ++ show p2
=====================================
testsuite/tests/hiefile/should_run/RecordDotTypes.stdout
=====================================
@@ -1,5 +1,9 @@
At (22,6), got type: MyRecord
-At (22,20), got type: Integer
+At (22,20), got type: MyRecord -> Integer
At (22,25), got type: MyRecord
-At (22,28), got type: String
-At (22,29), got type: String
\ No newline at end of file
+At (22,28), got type: MyChild -> [Char]
+At (22,29), got type: MyChild -> [Char]
+At (22,6) - (22,8), got type: [Char]
+At (22,17) - (22,20), got type: Integer
+At (22,25) - (22,27), got type: MyChild
+At (22,25) - (22,29), got type: [Char]
=====================================
testsuite/tests/hiefile/should_run/T23492.stdout
=====================================
@@ -4,4 +4,4 @@ PartialFieldSelector
At (18,7), got type: PartialFieldSelector -> Bool
At (23,7), got type: PartialFieldSelector
At (23,8), got type: PartialFieldSelector
-At (23,9), got type: Bool
+At (23,9), got type: PartialFieldSelector -> Bool
=====================================
testsuite/tests/hiefile/should_run/all.T
=====================================
@@ -10,3 +10,6 @@ test('T23120', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUti
test('T24544', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
test('HieGadtConSigs', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
test('T25709', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
+test('HasFieldQueries', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
+test('NoFieldSelectorQueries', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
+test('HieTypeable', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/60018f321da594ab69733c61677e42…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/60018f321da594ab69733c61677e42…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][ghc-9.14] 70 commits: hadrian: fix bootstrapping with ghc-9.14
by Zubin (＠wz1000) 17 Sep '26
by Zubin (＠wz1000) 17 Sep '26
17 Sep '26
Zubin pushed to branch ghc-9.14 at Glasgow Haskell Compiler / GHC
Commits:
30decfbb by Cheng Shao at 2026-09-03T11:35:03+05:30
hadrian: fix bootstrapping with ghc-9.14
This patch fixes bootstrapping GHC with ghc-9.14, tested locally with
ghc-9.14.1 release as bootstrapping GHC.
(cherry picked from commit c72ddabfda05053d189cbb70063f151a6dd1d07a)
- - - - -
a446bd79 by Cheng Shao at 2026-09-03T11:35:04+05:30
rts: always use StgInt to represent cost center id
Currently cost center id is modeled as `Int` and it should be `StgInt`
uniformly in the RTS, hence this patch. Fixes #27524.
(cherry picked from commit ab9ab8952b1ff20ed8b092ff95d6a9f8d822c033)
- - - - -
66fd94be by Duncan Coutts at 2026-09-03T11:35:04+05:30
Eliminate STM_AWOKEN
It was used as nullary closure for the block_info.closure in the case of
a thread being awoken after an STM transaction.
However, while it was written, it was never read, so contributed nothing
to the behaviour. Furthermore, in the only place it was set (in
tryWakeupThread) the why_blocked was immediately overwritten by the
NotBlocked status, and the block_info was updated accordingly (by
appendToRunQueue).
So it didn't even serve a purpose of clarifying an intermediate state,
there really was no such intermediate state.
Cleaning this up will allow the BlockedOnSTM case to follow the same
pattern as the other why_blocked cases that do not use the block_info,
and in turn this reduces the number of different categories.
(cherry picked from commit 4d798b17c9b83f280c102ca7f96047bc0ad52df1)
- - - - -
f77dde75 by Zubin Duggal at 2026-09-03T11:35:05+05:30
hadrian: Fix links to remaining doc sites to not use the package hash for haddock links
In 07267f79d91169f474cacc8bcd38d76a6e97887d we changed hadrian to not include the package hash in the haddock
directory. This patch takes care of a few remaining links that were missed in that patch
Fixes #27671
(cherry picked from commit 1446bb039a635f2b836be19f062cbffa568fe4c5)
- - - - -
62d09dad by Zubin Duggal at 2026-09-03T11:35:06+05:30
DmdAnal: Fix maxDmdType
We need to eta expand the smaller DmdType using defaultArgDmd, like in lubDmdType.
Introduce zipDmdType as a common combinator to implement both maxDmdType and lubDmdType
uniformly.
fixes #27626
(cherry picked from commit e31885816b7c597ad89b05da64b21c5a241bf674)
- - - - -
6516ed5b by Rodrigo Mesquita at 2026-09-03T11:35:07+05:30
rts: refactor to reduce THREADED_RTS in MSG_UPD_TSO_FLAGS
- No behavior change in this commit (well, a small optimization here
makes us do less work if the target TSO owned by the curr. capability)
- Move all THREADED_RTS CPP needed into `updThreadFlag`
- Merge MSG_SET_TSO_FLAGS and MSG_UNSET_TSO_FLAGS into MSG_UPD_TSO_FLAGS
plus a `set` bool field in the MessageUpdTSOFlag struct
Towards #27729
(cherry picked from commit bb3241717c8ee46e31fbdb3cfaed9736ba7257ea)
- - - - -
80c21277 by Rodrigo Mesquita at 2026-09-03T11:35:07+05:30
rts: Fix race condition in MSG_UPD_TSO_FLAGS execution
The code for processing the MSG_UPD_TSO_FLAGS message was not taking
into consideration that the TSO's owner might have moved in between that
capability receiving the message (since it was its previous owner) and
starting to process its inbox (a point at which it was no longer the
owner)
Added Note [TSO owner may change in between Msg being sent and received]
to explain this race and the pattern used to fix this, where we just
forward the message to the new owner.
Fixes #27729
(cherry picked from commit ed99b7b7bed699f3f2047672be7709c6d22b6df7)
- - - - -
863d4a7c by Cheng Shao at 2026-09-03T11:42:06+05:30
ghci: fix bootstrapping with 9.12.3-rc1 and above
This patch fixes bootstrapping GHC with 9.12.3-rc1 and above. ghci
defines `Binary` instance for `HalfWord` in `ghc-heap`, which is a
proper `newtype` in 9.14 and starting from 9.12.3. Given we don't
build `ghc-heap` in stage0, we need to fix this predicate so that it
corresponds to the boot ghc versions that contain the right version of
`ghc-heap`.
(cherry picked from commit f8919262dc3034851fbefab86fe45dd7963ffed5)
- - - - -
3c59a6ce by Cheng Shao at 2026-09-03T11:42:45+05:30
Fix testsuite run for +ipe flavour transformer
This patch makes the +ipe flavour transformer pass the entire
testsuite:
- An RTS debug option `-DI` is added, the IPE trace information is now
only printed with `-DI`. The test cases that do require IPE trace
are now run with `-DI`.
- The testsuite config option `ghc_with_ipe` is added, enabled when
running the testsuite with `+ipe`, which skips a few tests that are
sensitive to eventlog output, allocation patterns etc that can fail
under `+ipe`.
This is the first step towards #26799.
Co-authored-by: Codex <codex(a)openai.com>
(cherry picked from commit 4c784f00a47871cdda7f6fd49728a8cf12152045)
- - - - -
fe3d06ae by Duncan Coutts at 2026-09-05T17:04:57+05:30
Fix errors in the documentation of the eventlog STOP_THREAD status codes
Fix the code for BlockedOnMsgThrowTo.
Document all the known historical warts.
Fixes issue #26867
(cherry picked from commit 10b4d3641f6fe7a7443bd621d62d1355a66f5a7c)
- - - - -
6041c2aa by Duncan Coutts at 2026-09-05T17:04:57+05:30
Document that eventlog thread stop code ThreadBlocked is no longer used
It has not been used since GHC 7.0.x (2011). In 7.2 all the BlockedOn*
codes were added, and these were and are used instead of ThreadBlocked.
(cherry picked from commit e1cece79a6c8e53796188acd543a8b565b18a3fb)
- - - - -
5d781adc by Duncan Coutts at 2026-09-05T17:04:57+05:30
Add a proper mapping to eventlog external thread stop status
That is the mapping from rts-internal codes, to the coes used in the
status field in the eventlog EVENT_STOP_THREAD event.
See issue #9003 for what goes wrong when we mess this up. In that
ticket, people note that we should really not require the internal
tso->why_blocked codes to leak into the external eventlog thread stop
codes. The same principle applies to the StgThreadReturnCode.
This change properly separates them, and explicitly maps between them
using a pair of (compact, constant) tables. These tables are pretty
small (with no alignment constraints) and will soon shrink so it seems
a sensible tradeoff.
We also introduce and use proper EVENT_STOP_THREAD constants in the
event log format header. Previously there was not specification in the
code for these (only in the docs): the values were encoded into the
conversion code.
This will allow us to renumber the internal why_blockd codes without
breaking the eventlog output.
(cherry picked from commit 795db1151237be5a3d0d2cdccb4c43309b587cdf)
- - - - -
5edbdaf0 by Duncan Coutts at 2026-09-05T17:04:57+05:30
Remove unused tso->block_info.wakeup member
Presumably it was used once, but not now.
(cherry picked from commit 6f1c8efa1b4c78273daca99f9dda0a7e3d771330)
- - - - -
68335668 by Duncan Coutts at 2026-09-05T17:04:57+05:30
Document StgTSOBlockInfo to say what cases use what members
In principle, tso->why_blocked is the tag for the StgTSOBlockInfo union,
so we should be able to say for each union member the why_blocked cases
that use that member.
(cherry picked from commit 740b88a980c4aa7f28fcf3aa89f7df8aea2813a9)
- - - - -
db985b1d by Duncan Coutts at 2026-09-05T17:04:57+05:30
Add a tso->block_info.mvar member and use it
in preference to the generic block_info.closure union member, with
casts.
The plan is that when we know what case we're in (via tso->why_blocked)
then we can always access the correct union member, and so we will only
need to access block_info.closure for generic cases where we don't know
or don't care.
(cherry picked from commit 5b92eae2638db71ff8725295ec2a8ca254c0720b)
- - - - -
08f71147 by Duncan Coutts at 2026-09-05T17:04:57+05:30
Add a tso->block_info.unused member and use it
in preference to the generic block_info.closure union member, with
casts.
The plan is that when we know what case we're in (via tso->why_blocked)
then we can always access the correct union member, and so we will only
need to access block_info.closure for generic cases where we don't know
or don't care.
(cherry picked from commit d931715fbea83ccd402d280965a5d096a9f72949)
- - - - -
54ea84e0 by Duncan Coutts at 2026-09-05T17:04:57+05:30
Avoid storing to tso->block_info.closure
In one case we can use a specific union member (.prev) instead. In
several cases the stores were in fact redundant because of subsequent
overwrites.
In scavengeTSO we replace setting tso->block_info.closure to a valid
closure, with an assertion that the block_info.unused is already set to
END_TSO_QUEUE which is a valid (static) closure.
(cherry picked from commit 47e28ebbb4e22ad2ddb27c3f4acc5df291276743)
- - - - -
e65235ff by Duncan Coutts at 2026-09-05T17:04:57+05:30
Renumber the tso->why_blocked constants
We can do this now because we have separated the internal values from
the external ones used in the eventlog.
This lets us put them back into a deliberate order and consolodate some
gaps.
More importantly, it is a prepation for a slightly more sophisticated
encoding.
(cherry picked from commit 96e4749d9f9b75e99d7b860325b92a5b3704e784)
- - - - -
bd345a3f by Duncan Coutts at 2026-09-05T17:04:57+05:30
Define constants for the existing stg_threadStatuszh return codes
The stg_threadStatuszh reuses the internal tso->why_blocked codes but
also extends them with a couple previously magic values. This is awkward
since we need to know what those magic values are so we don't
accidentally use those values to mean something else. By pulling a
definition up to where the why_blocked codes are defined we will be able
to avoid mistakenly assining those codes some meaning (or just changing
the BlockedThreadComplete, BlockedThreadKilled code if necessary).
(cherry picked from commit 8f62661c133338100803347084de3566e325e64c)
- - - - -
8e5bab1a by Duncan Coutts at 2026-09-05T17:04:57+05:30
Extend the tso->why_blocked encoding to indicate block_info closures
We use some bit tricks to cheaply and generically test if a
tso->why_blocked tag implies that the corresponding tso->block_info will
contain a non-trivial valid closure (i.e. not just block_info.unused set
to END_TSO_QUEUE).
In particular we arrange for most why_blocked values to naturally have a
distinguishing bit, but for the BlockedOn{Read,Write,Delay} cases, they
can come in either non-closure or closure forms. We allow an additional
bit to distinguish these cases. The non-closure forms are only from
legacy I/O managers: select and win32-legacy. So this extra bit
mechanism will be able to be retired once the legacy I/O managers are
themselves retired.
This means in a few places we need to untag the why_blocked value before
inspecting it, but in most places we do not.
(cherry picked from commit 42c69ae2d58310c703abaa4ec933973fa9b136d3)
- - - - -
abf3d259 by Duncan Coutts at 2026-09-05T17:04:57+05:30
Use BlockInfoForceNonClosure in the select I/O manager
(cherry picked from commit 7c64632b46ac660fc0779ae96d9a05d11537b743)
- - - - -
0038fe45 by Duncan Coutts at 2026-09-05T17:04:57+05:30
Use BlockInfoForceNonClosure in the win32-legacy I/O manager
for the BlockedOn{Read,Write} since these use the non-heap allocated
StgAsyncIOResult.
(cherry picked from commit 8fd7104a0d63208f8408a7e5cd185bd2020225c8)
- - - - -
820442e1 by Duncan Coutts at 2026-09-05T17:04:57+05:30
Enforce the why_blocked and block_info rules in checkTSO
We now check the cases wher IsBlockInfoClosure should hold, the cases
that are supposed to use block_info.unused == END_TSO_QUEUE, and which
cases are allowed to use BlockInfoForceNonClosure.
This partially enforces the use of why_blocked as a tag for the
block_info union. We could be stricter and check for the correct
expected info table for the closure cases.
(cherry picked from commit e0da603b8e24cfc633f29990be9ca7008f45b3c2)
- - - - -
f8cc6bb4 by Duncan Coutts at 2026-09-05T17:04:57+05:30
Use IsBlockInfoClosure to simplify several tests
In GC and generic traversal we need to know if we should look at the
block_info.closure or not. Now we can do just that using a cheap bit
test on the why_blocked tag.
This fixes issue 26717, where the problem was that some GC modes did not
know when to look at block_info.closure, because the poll I/O manager
uses a closure for BlockedOn{Read,Write} while the select I/O manager
uses a non-closure. Now this information is in the why_blocked tag
itself.
(cherry picked from commit 1dd0f381ab96d3f46e113c90858870e95bd3caba)
- - - - -
9715df03 by Duncan Coutts at 2026-09-05T17:04:57+05:30
Remove the now-unused scavengeTSOIOManager
The GC no longer has to delegate to the I/O manager, since it can use
IsBlockInfoClosure to decide things itself.
(cherry picked from commit 7a00ffbc311e6ee53e8b1b9181e37c3795a7b884)
- - - - -
2ab14436 by Duncan Coutts at 2026-09-05T17:04:57+05:30
Follow atomic access rules more consistently for tso->why_blocked
The rule is this:
store block_info *before* why_blocked
store why_blocked using store release
load why_blocked using load acquire
load block_info *after* why_blocked
This is a an atomic store release / load acquire pair and (if the reads
are in a separate thread to the writes, and the read receives the value
stored) then this guarantees a full "happens before" relationship of
these stores and loads.
In some cases, we do not need a full load acquire, because we don't read
the block_info at all and so do not need any ordering. In this case we
just need an atomic relaxed load.
This was being followed in most places, but not all. If there's good
reason in any case that we don't need atomic access, then we should
document that in a comment. In the absence of that I think it's easier
to follow the rule everywhere.
(cherry picked from commit 0874d965ef1fec847561418857e63c067b91b0b7)
- - - - -
75e63b6e by Duncan Coutts at 2026-09-05T17:04:57+05:30
Add a changelog entry
(cherry picked from commit 8f0bdbe138a2e1914cba7963b6931402f99c8710)
- - - - -
c1d2fdcc by Ben Gamari at 2026-09-05T17:04:57+05:30
base: Don't drop exception context in SomeException(toException)
For reasons that are lost to time, the implementation of [CLC #200]
that was merged inappropriately dropped `ExceptionContext` in the
`toException` implementation given to `SomeException`.
Fix this infelicity.
[CLC #200]: https://github.com/haskell/core-libraries-committee/issues/200
(cherry picked from commit 2ab02c579a9625438f5281a258051cb32ba40004)
- - - - -
d3d6c3aa by Vladislav Zavialov at 2026-09-05T17:04:57+05:30
Discard type arguments in tcPatToExpr (#27440, #27583)
The builder expression of an implicitly bidirectional pattern synonym must not
mention types written in the RHS:
* Invisible type arguments led to a panic (#27440)
* Required type arguments failed with out-of-scope variables (#27583)
Both are now discarded, following the precedent established by pattern
signatures (#9867).
Discarding type arguments takes some care: a type pattern cannot be told from a
value pattern by syntax alone, as the `type` keyword may be omitted. Consider:
data T a b c where
MkT :: forall a. forall b c -> a -> T a b c
pattern P :: x -> T x y z
pattern P x = MkT @a (type b) c x
In P's right-hand side, `@a` and `type b` are clearly type arguments, but what
about `c` and `x`? We can only tell by matching the patterns against MkT's
type. So tcPatToExpr now runs in TcM and matches the arguments against the
constructor's TyVarBinders using zipPatsBndrs, which is made public for this
purpose. The resulting builder is $bP x = MkT _ _ x.
See Note [Discarding types in the builder expression].
Test cases: T27440a T27440b T27440c T27440d T27440e
T27583a T27583b T27583c T27583d T27583e T27583f T27583g
Metric Increase: LinkableUsage02
Metric Decrease: T27336
Assisted-by: Claude Opus 5
(cherry picked from commit 4f98510802423dcd98fa62af77997189ee97a111)
- - - - -
869d6792 by sheaf at 2026-09-05T17:04:57+05:30
mkWpFun_FRR: fix ordering of coercion composition
When the subsumption machinery generates an eta-expansion, we must
perform a representation polymorphism check to ensure the lambda binder
it introduces has a fixed runtime representation.
This is done in GHC.Tc.Utils.mkWpFun_FRR.
This check involves composing quite a few coercions, arising from
representation-polymorphism checks on both the actual and expected
argument types. These coercions are then chained using HsWrapper
composition, <.>. The ordering of composition was incorrect, leading to
the Core Lint failure reported in #27639. This commit fixes that.
Fixes #27639
(cherry picked from commit eb1dcd4d98548b7bc64c323dc352ddbf149a91ec)
- - - - -
64ba5a42 by Vladislav Zavialov at 2026-09-05T17:04:58+05:30
Fix tcLookupId panic with RequiredTypeArguments and PatternSynonyms (#27586)
The arguments declared on the left-hand side of a pattern synonym are looked up
as term variables bound by its right-hand side. Prior to this patch, that lookup
panicked with RequiredTypeArguments:
data T a where
MkT :: forall a -> T a
pattern P :: Int -> T Int
pattern P x = MkT x
On the RHS, `x` looks like a term argument, so the renamer binds it in the term
namespace. Only during type checking does it turn out to be a type variable, so
the lookup on the LHS finds an ATyVar rather than an ATcId. As the lookup was
done with tcLookupId, it resulted in a panic.
Now the arguments are looked up with tcLookupPatSynArg, which reports an illegal
term-level use of `x`, just as an ordinary function definition `f (MkT x) = x`
does.
Test cases: T27586a T27586b T27586c
Assisted-by: Claude Opus 5
(cherry picked from commit b757727a78613e7437a713058c24b94e10697f47)
- - - - -
94c1ce13 by Zubin Duggal at 2026-09-05T17:04:58+05:30
ghc-internal: annotateSTM should use catchSTM# rather than catch#
A catch# frame inside a transaction breaks retry and async exception
delivery.
Fixes #27657
(cherry picked from commit fd22f71ee92595f4634206455d8eab111488d836)
- - - - -
0644c91c by fendor at 2026-09-05T17:04:58+05:30
GHCi: Fix order of `PackageDBFlag`s for interactive home unit
`PackageDBFlag`s are stored in reverse order of cli specification.
When sorting the `PackageDBFlag`s by longest common prefix, we need thus
to reverse the package db stacks before calculating the prefix.
We make sure to reverse the package db stack for the interactive home
unit to uphold that later specified package dbs overwrite earlier ones.
Resolved and adds regression test for #27640
(cherry picked from commit 06fde293f2e8c80db11f4d01fcdfc482c1128db5)
- - - - -
4ae61128 by Simon Peyton Jones at 2026-09-05T17:04:58+05:30
Never make an absent filler for a constraint type
mkAbsentFiller used isTerminatingType to decide, but that is not enough.
Consider
class Eq a => UC a where {}
let u :: UC Int -- UC Int is a "non-terminating type"
u = error "Absent"
let e :: Eq Int -- Eq Int is a "terminating type"
e = $p1UC u
We clearly must not make a filler for `e`, because we speculatively
evaluate it. But speculatively evaluating `e` forces `u`, so we must not
make one for `u` either.
Asking isDictTy instead is not enough either, because it does not catch a
constraint hidden behind an unreduced type family application:
type family F a :: Constraint
type instance F W = TC W
a :: F W => Int -> Int -- (F W) argument is absent
Oops! Entered absent arg Arg: irred
Type: F W
So play safe and use isPredTy: never make an absent filler for any
constraint-kinded type.
Fixes #27627
(cherry picked from commit 7bf546fc423e23cb649580016ee494efbfe144ab)
- - - - -
64deed29 by Zubin Duggal at 2026-09-05T17:04:58+05:30
Add tests for absent fillers at dictionary types
T27627 a unary class whose superclass is a non-unary class
T27627a ...whose superclass is a Constraint-kinded type family
T27627b ...whose superclass is a quantified constraint
T27627c a unary class applied to itself, (UC (UC (TC a)))
T27627e a (forall b. P b) dictionary that loops
(cherry picked from commit 5f474953d1880232b5e6c5741f08746e28cd25ab)
- - - - -
a99812b5 by Zubin Duggal at 2026-09-05T17:04:58+05:30
An abstract TyCon may hide a unary class
A class declared in an hs-boot file is an AbstractTyCon inside the
module loop, and compiling the real declaration may reveal it to be a
UnaryClassTyCon.
- isTerminatingType returned True for such AbstractTyCons
- IfaceToCore set the unary flag to False in the DFunId
So we could end up speculating bottom dictionaries because inside a module
loop we see an UnaryClassTyCon as an AbstractTyCon
Use isTerminatingTyCon, which returns False for an abstract TyCon.
The Bool in DFunId is now a cache for isTerminatingTyCon, set in
mkDFunIdDetails.
Fixes #27704
(cherry picked from commit cd5c6bcc0a59c7b4dc4627fdc7471dc7938d07c2)
- - - - -
5372f4e0 by Zubin Duggal at 2026-09-05T17:04:58+05:30
Specialise: don't replace dead args with absent fillers
specHeader decides an argument is dead by calling isDeadBinder on a binder of
the /optimised RHS/, then applies the filler to the /stable unfolding/
template instead. The two may differ, so the argument can be dead in
the RHS and not in the template.
The specialised function's unfolding then has an absent filler, and any call
site that inlines it evaluates the error thunk.
Dropping dead args in the specialiser is rarely worth it, to quote Simon,
"The later worker/wrapper pass will pick up the dead arg later if it is really dead. Keeps the specialiser simpler."
So instead of trying to check if the arg really is dead in the stable unfolding,
just drop the logic for dropping dead args in the specialiser altogeher.
Fixes #27703
(cherry picked from commit abfc224a27cf499390efc5fe1348301fefebb910)
- - - - -
ed00042b by Zubin Duggal at 2026-09-05T17:04:58+05:30
CorePrep: don't speculate a call across an hs-boot edge
We take care not to evaluate things that might be bottom, like a
looping dictionary group, but our analysis is defeated by boot files.
We only track recursion within a module, so two dictionaries that
depend on each other across a module loop each look non-recursive, and
we might speculate them.
Any recursion we cannot see must cross an hs-boot edge, so refuse to
speculate calls that cross one.
Fixes #27717
(cherry picked from commit 1557fd1cfb802d2608cb5b138eab664564f57fb7)
- - - - -
cbae9a67 by Cheng Shao at 2026-09-05T17:04:58+05:30
configure: bump LlvmMaxVersion to 23
This patch bumps `LlvmMaxVersion` to 23 to support LLVM 22.x releases.
(cherry picked from commit cc9cc6d5df7fb3845b1409fe708e1097896252a7)
- - - - -
1bdbfae8 by Cheng Shao at 2026-09-05T17:04:58+05:30
autoconf/ghc-toolchain: bump llvm upper bound to support llvm 23
This commit bumps llvm upper bound to support llvm 23.
(cherry picked from commit 56291fc550ec00784e46ec0c89ee65081090ae9f)
- - - - -
f920c42e by Cheng Shao at 2026-09-05T17:04:58+05:30
rts: fix compilation issues with clang 23
clang 23 has broadened `-Wall`/`-Wextra` ranges, exposing some minor
issues in the rts when building with validate flavours:
- Unused locals
- `#pragma GCC diagnostic pop` mismatch
This commit fixes those.
(cherry picked from commit 20eb3f415f9e04a003322d1a49d95e0aaf1029f2)
- - - - -
7b2c5057 by Cheng Shao at 2026-09-05T17:04:58+05:30
libffi: update to 3.7.1
Bumps libffi submodule.
(cherry picked from commit d7e36a486b224908b1e1f6e5d9eb04084819c805)
- - - - -
70df7c7a by Andreas Klebinger at 2026-09-05T17:04:58+05:30
cmm dumps: Add machop width info with -dppr-debug for infix ops.
(cherry picked from commit e9bbe8f924ec0b9d0772cf3d4f20aa6a25f28345)
- - - - -
877745f3 by Andreas Klebinger at 2026-09-05T17:04:58+05:30
CmmLint: Check for unsupported MachOp widths
machOpArgReps now maps MachOp + Width to a list of supported
argument widths or Nothing if the given operation is not supported
at the given width.
This allows us to check for nonsensical combinations like FloatToInt
at Word16.
Similarly we now check that every address is actually wordwidth.
(cherry picked from commit 86e3a9d8d0a85b5c80dad212cf3ec8fbf1ba72e6)
- - - - -
4037fda8 by Andreas Klebinger at 2026-09-05T17:04:58+05:30
arm64 ncg: The big subword truncation fix.
A set of slightly related fixes to arm subword handling:
Bitmask immediates:
Don't produce overflowing assembly literals.
There is still another bug here that causes us to miss some valid
literals but we will fix that later.
Improve subword truncation handling:
We now use a small set of helpers to truncate `Register` values rather
than truncating immediate `Reg` values which greatly simplifies the code
structure. This fixes a great many bugs to do with sign/zero extending subwords
or the lack thereof.
We now establish the invariant that subword values are zero-extended at
every site at which they come into "scope" of the ncg, and rely on the
invariant throughout rather than pessimistically inserting redundant
extensions in a hodgepodge manner at the use sites of these values.
This fixes at least the bugs described in issues #27533, #27430
#27537, #27538, #27539, and #27550. But likely more bugs yet not
found.
Subword ffi results:
Apply truncations when calling functions returning
subword values.
genCondJump:
Don't sign extend signed values in the input register as
it might map to a local variable, corrupting the value stored within.
Fix subword store/load instructions.:
We used to read those at 32bit width even for smaller values possibly
resulting in invalid memory access. Now we construct the suffix for
subword variants based on the instruction format for these.
(cherry picked from commit 13781cca5c24c2671d651fd2b13a561c7386fe3a)
- - - - -
d85ead2a by Andreas Klebinger at 2026-09-05T17:04:58+05:30
Add some test cases covering bugs in the arm ncg.
* Test for #27430 (subword ffi results)
* #27537 - subword conversions
* #27538 - subwords used in conditional
* #27533 - single byte read
(cherry picked from commit 94822c951c2a6f77c7766720e0d4ff7d4afb7290)
- - - - -
0be1741f by Andreas Klebinger at 2026-09-05T17:04:58+05:30
cmmLint: Lint against MO_FS_Truncate subword use.
(cherry picked from commit dd1ba88a70f47bead722e9dae8e91f9a617258aa)
- - - - -
c9fe6e61 by Zubin Duggal at 2026-09-05T17:08:44+05:30
Move HsStatic free-var test to typechecker
The renamer cannot tell free type variables from term variables, so
the warning fired on static forms mentioning a scoped type variable.
Don't do this.
Also correct the warning to say GHC 10.0 rather than 9.16.
Fixes #27664
- - - - -
c0a69e43 by fendor at 2026-09-05T17:08:44+05:30
Drop `preloadClosure` from `UnitState`
It is always hard-coded to the same value.
Backpack Unit instantiation isn't using it any more.
Allows us to simplify the API and get rid of `improveUnit`.
(cherry picked from commit fb5246adb7e10bd9ef07de314eaf98fbcfb729a1)
- - - - -
530b4c14 by fendor at 2026-09-05T17:08:44+05:30
Introduce global unit database cache
As a first step for better sharing of `UnitInfo` across `UnitEnv`,
we introduce a new datatype called `ExternalUnitDatabases`.
It primarily serves as an in-memory representation of *all*
`UnitDatabase`s across `UnitEnv`. This means, if multiple `HomeUnitEnv`s
depend on the same database, one way or another, we make sure that we
don't parse from disk every time.
Instead, we store the in-memory representation in `ExternalUnitDatabases`.
`ExternalUnitDatabaseCache` is the equivalent of `ExternalUnitState` in
the `UnitEnv`. It is a mutable variable wrapping `ExternalUnitDatabases`.
The mutable `ExternalUnitDatabaseCache` is used in `initUnits` to make
sure we don't parse the same unit database multiple times.
Almost by accident, we change the semantics of `initUnits` to honour
modifications to `packageDBFlags`.
The inability to change `packageDBFlags` while also reusing the already
parsed `UnitDatabase`s was reported in #26423 as a bug.
Hence, we think this behaviour change is warranted and acceptable,
especially since it comes with a breaking change to the `initUnits` API.
Add regression test for #26423
Closes #26423
(cherry picked from commit 5d0ab71ac1d01c2ef19bf3146adb7dac8733dca5)
- - - - -
01ad4c42 by fendor at 2026-09-05T17:08:44+05:30
Introduce UnitIndex for global external unit caching
`UnitInfo`s have been observed to cause a lot of memory usage in #27500.
Especially with multiple home units, as the same (external) units are
processed from scratch, even though most of the time we end up with
exactly the same `UnitInfo`.
We introduce a `UnitEnv` global cache that allows us to store external
unit information that is used across all `HomeUnitEnv`s.
The most important change in this commit is the introduction of the `UnitIndex`.
It stores a global mapping of `UnitId` -> `UnitInfo`, and `initUnits`
always uses the cached `UnitInfo` entry to populate each
`HomeUnitEnv`'s `UnitState`.
This allows us to ensure the following property:
> Each `UnitInfo` should be alive exactly once in GHC.
All `UnitState`s should reference 'UnitInfo's stored in the 'UnitIndex'.
This ensured by calling 'initUnits' with the 'UnitIndex'.
In addition, the `ExternalUnitDatabases` may also hold a reference
to each on-disk representation of `UnitInfo`.
This means, we impose an hard upper bound on the number of `UnitInfo`s
alive in the GHC session:
> The number of alive `UnitInfo`s closure objects must be the
> sum of all loaded unit database times two.
We add performance regression tests that make sure the number of live
`UnitInfo` cannot exceed this threshold.
Closes #27500
-------------------------
Metric Decrease:
MultiComponentModules
MultiComponentModulesRecomp
MultiComponentModulesRecomp100
mhu-perf
LinkableUsage02
-------------------------
These metrics increases are especially notable, as we are not even
sharing anything big but merely the global package database with 50
entries.
It shows how careful sharing of `UnitInfo` can improve memory usage.
We expect this to be much more notable when the whole cabal package
database is shared across multiple home units.
`LinkableUsage02` metric decreases on unreg and i386 platform, only.
---
Technical details
To share the `UnitInfo`s correctly, it is important that we extract
the `WireMap` into the `UnitIndex`. At the moment of writing, `WireMap`
must be globally the same for all `HomeUnitEnv`s.
This is important, as we could otherwise not cache the "fully-resolved"
`UnitInfo`, as we don't change the `UnitId` or `unitAbiHash` when
resolving wired-in units. Thus, there could be ambiguities, when the
`WireMap` is not the same for all `UnitState`s across the `UnitEnv`.
We consider a `UnitInfo` fully-resolved, if wired-in units have been
updated, the `UnitInfo` has been validated and variables in the unit
config, such as `${pkgroot}` have been resolved.
Updating the wired-in units requires the `WireMap` to be globally the
same.
(cherry picked from commit 6cce494a7ec43953c7a949e0d8ce712abfe73da7)
- - - - -
0a4461cf by fendor at 2026-09-05T17:08:44+05:30
Reuse the UnitIndexCache after initialising multiple home units
(cherry picked from commit 024c4d04a98f7e27b3dcb93f9b038f9b6b5a1ad9)
- - - - -
6db2f312 by Andreas Klebinger at 2026-09-05T17:08:44+05:30
Specialise: Stop looping on recursive dictionaries in interestingDict
interestingDict now doesn't look through loopbreaker unfoldings.
Doing so would cause infinite loops on certain dictionaries.
Fixes #27705.
(cherry picked from commit 578bd18509f0d2aeb004231a197f7f3898f86a2a)
- - - - -
879cb156 by Zubin Duggal at 2026-09-05T17:08:44+05:30
hadrian: constrain splitmix to keep building on Debian 9
- - - - -
0214fea4 by Zubin Duggal at 2026-09-05T17:08:44+05:30
Bump file-io submodule to 0.1.6
- - - - -
ddb4069b by Zubin Duggal at 2026-09-05T17:08:44+05:30
Bump haskeline submodule to 0.8.5.0
- - - - -
1ae612e4 by Zubin Duggal at 2026-09-05T17:08:44+05:30
Bump os-string submodule to 2.0.10
- - - - -
2b053def by Zubin Duggal at 2026-09-05T17:08:44+05:30
Bump directory submodule to 1.3.11.0
- - - - -
5d61a09a by Brian McKenna at 2026-09-15T11:40:21+05:30
Strip ticks when desugaring bool guards
The special `considerAccessible` pattern was broken when compiling
with debug info. Compiling with debug info wraps expressions with
`SourceNote` ticks, which broke the internals of the
`desugarBoolGuard` function. Ticks are now ignored within this
function.
Fixes #27360
(cherry picked from commit d43a7b7ad90047f1445c88d796ee7b15a0a605d7)
- - - - -
9b378798 by Brian McKenna at 2026-09-15T11:40:43+05:30
Ignore ticks in the pattern-match term oracle
The term-oracle in the pattern-match checker is keyed by a canonical
form of the scrutinee, computed by `makeDictsCoherent`. That canonical
form was tick-sensitive: two occurrences of an otherwise identical
expression that happened to carry different ticks were treated as
distinct values, breaking long-distance information.
This shows up in practice under `-finfo-table-map`, because the
desugarer wraps every record-selector use site in a `SourceNote`
carrying that site's span. For example:
data Box = Box { unBox :: Maybe Int }
f b = case unBox b of
Nothing -> 0
Just _ -> let Just x = unBox b in x
The two `unBox b` expressionss carry different SourceNote spans, the
pattern-match checker sees them as different, the long-distance
information from the outer `Just _` branch never reaches the
let-pattern, and `Just x = unBox b` is wrongly reported as
non-exhaustive.
We now strip all ticks in `makeDictsCoherent`. This is documented as
Wrinkle (UD1) of Note [Unique dictionaries in the TmOracle CoreMap].
Fixes #27314
(cherry picked from commit b388d0934c0933c1cdb47226489634e229239d0a)
- - - - -
dc9736e2 by Duncan Coutts at 2026-09-15T11:40:43+05:30
Fix failing test GcStaticPointers for non-moving GC
Minor mistake in asserting something before checking for that same
thing.
Specifically, Bdescr asserts HEAP_ALLOCED_GC, but Bdescr was being used
prior to a guard that checks HEAP_ALLOCED_GC. The solution is just to
move the use of Bdescr after the guard.
Thanks to Simon Jakobi for identifying the problem.
(cherry picked from commit 42918646169c7c5ba61912b39b5f5147bf1d255c)
- - - - -
26b4579d by Luite Stegeman at 2026-09-15T11:40:43+05:30
rts: fix ctoi_tuple_spill_words getting out of sync
Fix a few places that were not updating ctoi_tuple_spill_words
correctly, leading to corruption/crashes when dealing with large
unboxed tuples in bytecode:
- captureContinuationAndAbort
- findRetryFrameHelper/findAtomicallyFrameHelper
- interpretBCO bci_BRK_FUN
fixes #27633
(cherry picked from commit 192be0b6b861725613a9be5cb1587fb8cdf68bd3)
- - - - -
d83131b0 by Luite Stegeman at 2026-09-15T11:41:19+05:30
rts: Fix missing memory barrier in eval_thunk_selector (#27477)
unchain_thunk_selectors() was missing an ACQUIRE_LOAD for the
indirectee, leading to segfaults and corruption during GC on
weakly-ordered architectures.
Fixes #27477
(cherry picked from commit 06eee015be4e361fe9cb33e8a608ab2ea1386b52)
- - - - -
8189a970 by Cheng Shao at 2026-09-15T15:33:07+05:30
libffi: update to 3.8.0
Bumps libffi submodule.
(cherry picked from commit 0bc6b06990a4107171e03b21c2141d7a2aced6cf)
- - - - -
648af8f0 by Luite Stegeman at 2026-09-16T09:53:32+05:30
rts: handle large CONSTR closures in compacting GC
The function update_fwd_large in the compacting GC could run into
an unexpected object with the following error:
internal error: update_fwd_large: unknown/strange object 1
Closure type 1 is CONSTR. This patch adds cases for CONSTR and
CONSTR_NOCAF.
This is the same problem as #27434 (large AP closures, fixed by
cca0d58963), which missed this case.
Fixes #27649
(cherry picked from commit 749d2448eb56367046b2de890f1bf89a856ce53f)
- - - - -
0a6498db by Luite Stegeman at 2026-09-16T09:53:37+05:30
testsuite: fix T27434 test with compacting GC
Ensure that the interpreter is actually run with the compacting GC
(cherry picked from commit 177d615518a44dde595f3166f56ec604e0675b3b)
- - - - -
051e50cf by Luite Stegeman at 2026-09-16T09:53:44+05:30
rts: initialise the stack frame header for mask_frame and apply_mask_frame
We must leave the stack in consistent state before jumping to
mask_frame or apply_mask_frame because they may result. Failing
to do so could lead to a crash if there were waiting exceptions.
Fixes #27651
(cherry picked from commit 5796aa637cca079854fc7e84e7e0fa497aacab3c)
- - - - -
06fafb03 by Simon Peyton Jones at 2026-09-16T09:59:17+05:30
Re-introduce the "weird SpecDict" case
In this commit
commit f80375dd4945350a1d784e436975b48b9c736eaf
Author: Simon Peyton Jones <simon.peytonjones(a)gmail.com>
Date: Sun Jun 29 15:26:58 2025 +0100
Refactor of Specialise.hs
I removed a test for a dictionary with unbound type variables. This
turned out to be wrong; see #27629.
So this MR re-introduces it.
(cherry picked from commit 2486cc92cea451fd6528292252a8f384e3b34dcb)
- - - - -
a878ad4f by Luite Stegeman at 2026-09-16T09:59:17+05:30
rts: make stg_threadLabelzh return a valid pointer for unlabeled threads.
This fixes a segfault in the GC caused by stg_threadLabelzh returning
a 0 pointer in a GC pointer field.
stg_threadLabelzh returns a tuple of type (# Int#, ByteArray# #). If a
thread has no label, the second field is unused. We must still return
a valid heap object pointer.
Instead of returning 0, we now return stg_DEAD_SLOT_closure.
fixes #27618
(cherry picked from commit 809294f14cf6939b249d93af92c0ae174dda5b4a)
- - - - -
9033629c by Zubin Duggal at 2026-09-16T09:59:17+05:30
Prepare 9.14.2-rc2
-------------------------
Metric Decrease:
T4029
-------------------------
- - - - -
294 changed files:
- .gitlab/ci.sh
- + changelog.d/T27629
- + changelog.d/fix-compacting-gc-constr-27649
- + changelog.d/fix-control0-mask-trampoline
- + changelog.d/fix-threadlabel-segfault-27618
- compiler/GHC.hs
- compiler/GHC/Cmm/Expr.hs
- compiler/GHC/Cmm/Lint.hs
- compiler/GHC/Cmm/MachOp.hs
- compiler/GHC/Cmm/Parser.y
- compiler/GHC/CmmToAsm/AArch64/CodeGen.hs
- compiler/GHC/CmmToAsm/AArch64/Instr.hs
- compiler/GHC/CmmToAsm/AArch64/Ppr.hs
- compiler/GHC/Core.hs
- compiler/GHC/Core/Opt/Specialise.hs
- compiler/GHC/Core/Opt/WorkWrap/Utils.hs
- compiler/GHC/Core/TyCon.hs
- compiler/GHC/Core/Type.hs
- compiler/GHC/Core/Utils.hs
- compiler/GHC/CoreToStg/Prep.hs
- compiler/GHC/Driver/Backpack.hs
- compiler/GHC/Driver/Env.hs
- compiler/GHC/Driver/Main.hs
- compiler/GHC/Driver/Session/Units.hs
- compiler/GHC/HsToCore/Pmc/Desugar.hs
- compiler/GHC/HsToCore/Pmc/Solver.hs
- compiler/GHC/Iface/Load.hs
- compiler/GHC/Iface/Recomp.hs
- compiler/GHC/IfaceToCore.hs
- compiler/GHC/Rename/Expr.hs
- compiler/GHC/Tc/Errors/Ppr.hs
- compiler/GHC/Tc/Gen/Expr.hs
- compiler/GHC/Tc/Gen/Pat.hs
- compiler/GHC/Tc/TyCl/PatSyn.hs
- compiler/GHC/Tc/Utils/Unify.hs
- compiler/GHC/Types/Demand.hs
- compiler/GHC/Types/Id/Info.hs
- compiler/GHC/Types/Id/Make.hs
- compiler/GHC/Types/Literal.hs
- compiler/GHC/Types/Unique.hs
- compiler/GHC/Unit.hs
- compiler/GHC/Unit/Env.hs
- + compiler/GHC/Unit/External/Database.hs
- + compiler/GHC/Unit/External/Index.hs
- + compiler/GHC/Unit/External/ModuleOrigin.hs
- + compiler/GHC/Unit/External/Providers.hs
- + compiler/GHC/Unit/External/Query.hs
- + compiler/GHC/Unit/External/Substitution.hs
- + compiler/GHC/Unit/External/Validate.hs
- + compiler/GHC/Unit/External/Visibility.hs
- + compiler/GHC/Unit/External/Wired.hs
- compiler/GHC/Unit/Home/Graph.hs
- compiler/GHC/Unit/Info.hs
- compiler/GHC/Unit/State.hs
- compiler/GHC/Unit/Types.hs
- compiler/ghc.cabal.in
- configure.ac
- docs/index.html.in
- docs/users_guide/9.14.2-notes.rst
- docs/users_guide/eventlog-formats.rst
- docs/users_guide/ghc_config.py.in
- docs/users_guide/runtime_control.rst
- ghc/GHCi/UI.hs
- hadrian/cabal.project
- hadrian/src/Flavour.hs
- hadrian/src/Rules/Generate.hs
- libffi-tarballs
- libraries/base/changelog.md
- libraries/directory
- libraries/file-io
- libraries/ghc-compact/tests/all.T
- libraries/ghc-heap/GHC/Exts/Heap/FFIClosures_ProfilingDisabled.hsc
- libraries/ghc-heap/GHC/Exts/Heap/FFIClosures_ProfilingEnabled.hsc
- libraries/ghc-internal/src/GHC/Internal/Conc/Sync.hs
- libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs
- libraries/ghc-internal/src/GHC/Internal/STM.hs
- libraries/ghc-internal/tests/backtraces/all.T
- libraries/ghci/GHCi/Message.hs
- libraries/haskeline
- libraries/os-string
- rts/CloneStack.c
- rts/Continuation.c
- rts/ContinuationOps.cmm
- rts/IOManager.c
- rts/IOManager.h
- rts/Interpreter.c
- rts/Messages.c
- rts/PrimOps.cmm
- rts/ProfHeap.c
- rts/Profiling.c
- rts/RaiseAsync.c
- rts/RaiseAsync.h
- rts/RtsFlags.c
- rts/STM.c
- rts/Schedule.c
- rts/StgMiscClosures.cmm
- rts/Threads.c
- rts/Threads.h
- rts/Trace.c
- rts/Trace.h
- rts/TraverseHeap.c
- rts/eventlog/EventLog.c
- rts/eventlog/EventLog.h
- rts/include/Cmm.h
- rts/include/rts/Constants.h
- rts/include/rts/EventLogFormat.h
- rts/include/rts/Flags.h
- rts/include/rts/storage/Closures.h
- rts/include/rts/storage/TSO.h
- rts/include/stg/MiscClosures.h
- rts/posix/Select.c
- rts/prim/atomic.c
- rts/sm/Compact.c
- rts/sm/Evac.c
- rts/sm/NonMovingMark.c
- rts/sm/Sanity.c
- rts/sm/Scav.c
- rts/win32/AsyncMIO.c
- testsuite/driver/testglobals.py
- testsuite/driver/testlib.py
- + testsuite/tests/bytecode/T27633/Obj.hs
- + testsuite/tests/bytecode/T27633/T27633a.hs
- + testsuite/tests/bytecode/T27633/T27633a.stdout
- + testsuite/tests/bytecode/T27633/T27633b.hs
- + testsuite/tests/bytecode/T27633/T27633b.stdout
- + testsuite/tests/bytecode/T27633/all.T
- + testsuite/tests/codeGen/should_run/T27430.hs
- + testsuite/tests/codeGen/should_run/T27430.stdout
- + testsuite/tests/codeGen/should_run/T27430_c.c
- + testsuite/tests/codeGen/should_run/T27533.hs
- + testsuite/tests/codeGen/should_run/T27533.stdout
- + testsuite/tests/codeGen/should_run/T27533_cmm.cmm
- + testsuite/tests/codeGen/should_run/T27537.hs
- + testsuite/tests/codeGen/should_run/T27537.stdout
- + testsuite/tests/codeGen/should_run/T27538.hs
- + testsuite/tests/codeGen/should_run/T27538.stdout
- testsuite/tests/codeGen/should_run/all.T
- + testsuite/tests/concurrent/should_run/T27657a.hs
- + testsuite/tests/concurrent/should_run/T27657a.stdout
- + testsuite/tests/concurrent/should_run/T27657b.hs
- + testsuite/tests/concurrent/should_run/T27657b.stdout
- testsuite/tests/concurrent/should_run/all.T
- + testsuite/tests/core-to-stg/T27627/Callee.hs
- + testsuite/tests/core-to-stg/T27627/Caller.hs
- + testsuite/tests/core-to-stg/T27627/Main.hs
- + testsuite/tests/core-to-stg/T27627/T27627.stdout
- + testsuite/tests/core-to-stg/T27627/all.T
- + testsuite/tests/core-to-stg/T27627a/Callee.hs
- + testsuite/tests/core-to-stg/T27627a/Caller.hs
- + testsuite/tests/core-to-stg/T27627a/Main.hs
- + testsuite/tests/core-to-stg/T27627a/T27627a.stdout
- + testsuite/tests/core-to-stg/T27627a/all.T
- + testsuite/tests/core-to-stg/T27627b/Callee.hs
- + testsuite/tests/core-to-stg/T27627b/Caller.hs
- + testsuite/tests/core-to-stg/T27627b/Main.hs
- + testsuite/tests/core-to-stg/T27627b/T27627b.stdout
- + testsuite/tests/core-to-stg/T27627b/all.T
- + testsuite/tests/core-to-stg/T27627c/Callee.hs
- + testsuite/tests/core-to-stg/T27627c/Caller.hs
- + testsuite/tests/core-to-stg/T27627c/Main.hs
- + testsuite/tests/core-to-stg/T27627c/T27627c.stdout
- + testsuite/tests/core-to-stg/T27627c/all.T
- + testsuite/tests/core-to-stg/T27627e.hs
- + testsuite/tests/core-to-stg/T27627e.stdout
- + testsuite/tests/core-to-stg/T27627f/Callee.hs
- + testsuite/tests/core-to-stg/T27627f/Caller.hs
- + testsuite/tests/core-to-stg/T27627f/Inst.hs
- + testsuite/tests/core-to-stg/T27627f/Main.hs
- + testsuite/tests/core-to-stg/T27627f/T27627f.stdout
- + testsuite/tests/core-to-stg/T27627f/all.T
- + testsuite/tests/core-to-stg/T27704/Callee.hs
- + testsuite/tests/core-to-stg/T27704/Callee.hs-boot
- + testsuite/tests/core-to-stg/T27704/Main.hs
- + testsuite/tests/core-to-stg/T27704/Mid.hs
- + testsuite/tests/core-to-stg/T27704/T27704.stdout
- + testsuite/tests/core-to-stg/T27704/all.T
- + testsuite/tests/core-to-stg/T27704a/Callee.hs
- + testsuite/tests/core-to-stg/T27704a/Callee.hs-boot
- + testsuite/tests/core-to-stg/T27704a/Main.hs
- + testsuite/tests/core-to-stg/T27704a/Mid.hs
- + testsuite/tests/core-to-stg/T27704a/T27704a.stdout
- + testsuite/tests/core-to-stg/T27704a/all.T
- + testsuite/tests/core-to-stg/T27717/Callee.hs
- + testsuite/tests/core-to-stg/T27717/Callee.hs-boot
- + testsuite/tests/core-to-stg/T27717/Main.hs
- + testsuite/tests/core-to-stg/T27717/Mid.hs
- + testsuite/tests/core-to-stg/T27717/T27717.stdout
- + testsuite/tests/core-to-stg/T27717/Ty.hs
- + testsuite/tests/core-to-stg/T27717/all.T
- testsuite/tests/core-to-stg/all.T
- testsuite/tests/count-deps/CountDepsAst.stdout
- testsuite/tests/count-deps/CountDepsParser.stdout
- + testsuite/tests/dmdanal/should_run/M2.hs
- + testsuite/tests/dmdanal/should_run/T27626.hs
- + testsuite/tests/dmdanal/should_run/T27626.stdout
- testsuite/tests/dmdanal/should_run/all.T
- + testsuite/tests/driver/T26423/Hello.hs
- + testsuite/tests/driver/T26423/Makefile
- + testsuite/tests/driver/T26423/T26423.hs
- + testsuite/tests/driver/T26423/T26423.stderr
- + testsuite/tests/driver/T26423/T26423.stdout
- + testsuite/tests/driver/T26423/all.T
- + testsuite/tests/driver/T26423/test/Test.hs
- + testsuite/tests/driver/T26423/test/test.pkg
- + testsuite/tests/driver/TUnitInfo/Foo.hs
- + testsuite/tests/driver/TUnitInfo/Makefile
- + testsuite/tests/driver/TUnitInfo/all.T
- + testsuite/tests/driver/TUnitInfo/genMhu.sh
- + testsuite/tests/driver/TUnitInfo/generic-unit-info-space-mhu.stdout
- + testsuite/tests/driver/TUnitInfo/generic-unit-info-space-single.stdout
- + testsuite/tests/driver/TUnitInfo/generic-unit-info-space.hs
- + testsuite/tests/driver/TUnitInfo/generic-unit-info-space.stdout
- testsuite/tests/ghc-e/should_fail/T9930fail.stderr
- testsuite/tests/ghc-e/should_run/ghc-e005.stderr
- + testsuite/tests/ghci.debugger/scripts/T27633c.hs
- + testsuite/tests/ghci.debugger/scripts/T27633c.script
- + testsuite/tests/ghci.debugger/scripts/T27633c.stdout
- + testsuite/tests/ghci.debugger/scripts/T27633c_obj.hs
- testsuite/tests/ghci.debugger/scripts/all.T
- + testsuite/tests/ghci/prog-mhu007/Makefile
- + testsuite/tests/ghci/prog-mhu007/a/A.hs
- + testsuite/tests/ghci/prog-mhu007/all.T
- + testsuite/tests/ghci/prog-mhu007/b/B.hs
- + testsuite/tests/ghci/prog-mhu007/prog-mhu007.script
- + testsuite/tests/ghci/prog-mhu007/prog-mhu007.stdout
- + testsuite/tests/ghci/prog-mhu007/testpkg-bar/Bar.hs
- + testsuite/tests/ghci/prog-mhu007/testpkg-bar/testpkg-bar.pkg
- + testsuite/tests/ghci/prog-mhu007/testpkg-foo/Foo.hs
- + testsuite/tests/ghci/prog-mhu007/testpkg-foo/testpkg-foo.pkg
- + testsuite/tests/ghci/prog-mhu007/unitA
- + testsuite/tests/ghci/prog-mhu007/unitB
- + testsuite/tests/patsyn/should_compile/T27440a.hs
- + testsuite/tests/patsyn/should_compile/T27440b.hs
- + testsuite/tests/patsyn/should_compile/T27440c.hs
- testsuite/tests/patsyn/should_compile/all.T
- + testsuite/tests/patsyn/should_fail/T27440d.hs
- + testsuite/tests/patsyn/should_fail/T27440d.stderr
- testsuite/tests/patsyn/should_fail/all.T
- + testsuite/tests/pmcheck/should_compile/T27314.hs
- + testsuite/tests/pmcheck/should_compile/T27360.hs
- testsuite/tests/pmcheck/should_compile/all.T
- + testsuite/tests/rep-poly/T27639.hs
- testsuite/tests/rep-poly/all.T
- testsuite/tests/rts/Makefile
- + testsuite/tests/rts/T27477.hs
- + testsuite/tests/rts/T27477.stdout
- + testsuite/tests/rts/T27618.hs
- + testsuite/tests/rts/T27618.stdout
- + testsuite/tests/rts/T27649.hs
- + testsuite/tests/rts/T27649.stdout
- testsuite/tests/rts/all.T
- + testsuite/tests/rts/continuations/T27651.hs
- + testsuite/tests/rts/continuations/T27651.stdout
- testsuite/tests/rts/continuations/all.T
- testsuite/tests/rts/ipe/all.T
- testsuite/tests/simplCore/should_compile/Makefile
- testsuite/tests/simplCore/should_compile/T17966.stderr
- + testsuite/tests/simplCore/should_compile/T27629.hs
- + testsuite/tests/simplCore/should_compile/T27629.stderr
- + testsuite/tests/simplCore/should_compile/T27629Plugin.hs
- testsuite/tests/simplCore/should_compile/T7785.stderr
- testsuite/tests/simplCore/should_compile/all.T
- testsuite/tests/simplCore/should_compile/spec004.hs
- testsuite/tests/simplCore/should_compile/spec004.stderr
- + testsuite/tests/simplCore/should_run/T27703/Lib.hs
- + testsuite/tests/simplCore/should_run/T27703/Main.hs
- + testsuite/tests/simplCore/should_run/T27703/T27703.stdout
- + testsuite/tests/simplCore/should_run/T27703/all.T
- + testsuite/tests/simplCore/should_run/T27705.hs
- + testsuite/tests/simplCore/should_run/T27705.stdout
- + testsuite/tests/simplCore/should_run/T27705_Inst.hs
- testsuite/tests/simplCore/should_run/all.T
- testsuite/tests/typecheck/should_compile/T26718.stderr
- + testsuite/tests/typecheck/should_compile/T27664.hs
- testsuite/tests/typecheck/should_compile/all.T
- + testsuite/tests/vdq-rta/should_compile/T27583a.hs
- + testsuite/tests/vdq-rta/should_compile/T27583b.hs
- + testsuite/tests/vdq-rta/should_compile/T27583c.hs
- + testsuite/tests/vdq-rta/should_compile/T27583d.hs
- + testsuite/tests/vdq-rta/should_compile/T27583e.hs
- + testsuite/tests/vdq-rta/should_compile/T27583g.hs
- testsuite/tests/vdq-rta/should_compile/all.T
- + testsuite/tests/vdq-rta/should_fail/T27440e.hs
- + testsuite/tests/vdq-rta/should_fail/T27440e.stderr
- + testsuite/tests/vdq-rta/should_fail/T27583f.hs
- + testsuite/tests/vdq-rta/should_fail/T27583f.stderr
- + testsuite/tests/vdq-rta/should_fail/T27586a.hs
- + testsuite/tests/vdq-rta/should_fail/T27586a.stderr
- + testsuite/tests/vdq-rta/should_fail/T27586b.hs
- + testsuite/tests/vdq-rta/should_fail/T27586b.stderr
- + testsuite/tests/vdq-rta/should_fail/T27586c.hs
- + testsuite/tests/vdq-rta/should_fail/T27586c.stderr
- testsuite/tests/vdq-rta/should_fail/all.T
- utils/haddock/haddock-api/src/Haddock.hs
The diff was not included because it is too large.
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/39bc70bd67c5e77a3e5f689be771ed…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/39bc70bd67c5e77a3e5f689be771ed…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/fendor/has-field-hie] 3 commits: Record `FieldLabel` source span in AST node
by Hannes Siebenhandl (＠fendor) 17 Sep '26
by Hannes Siebenhandl (＠fendor) 17 Sep '26
17 Sep '26
Hannes Siebenhandl pushed to branch wip/fendor/has-field-hie at Glasgow Haskell Compiler / GHC
Commits:
2471e698 by fendor at 2026-09-17T10:42:25+02:00
Record `FieldLabel` source span in AST node
We attach evidence variables based on the source span of the concrete
AST node in the HIE file.
The evidence for the `HasField` constraint has the source span of the
field selector, e.g. the AST node that gave rise to the `HasField`
constraint.
Since the AST node doesn't show up in the HIE file, the evidence for
`HasField` was also not recorded for the span. Thus, `getEvidenceTree`
wouldn't even list `HasField` as evidence, even in the perfectly normal
case of:
baz :: HasField "foo" f Int => f -> Int
baz f = f.foo
Requesting the evidence tree for `.foo` should point to the definition
of `baz`, but since we omitted the source span for the field selector `.foo`
from the AST node, the HIE file doesn't list it as evidence.
By using the source spans of the individual field selectors, there are two consequences:
* We can see the `HasField` evidence for record dot syntax at the field
selector span
* The reported type of `.foo` is `Foo -> Int` instead of just `Int`
The latter is a change of behaviour that is unfortunate but the right
behaviour, since there is now a source span for the whole expression
`x.foo`, one for `x` and one for the selector `.foo`.
If you query for the type at span `x.foo`, then the correct type `Int`
is shown, but in downstream tooling (such as HLS), such requests are not
possible in LSP. Thus, the behaviour changes.
- - - - -
37dfa7f0 by fendor at 2026-09-17T10:44:34+02:00
Add additional details to evidence bindings
Evidence bindings can be all sorts of things, such as type class
evidence, a record selector or other builtin constructs such as
`Typeable`.
For some special evidence binding dependencies, we can include
additional information for the user.
For example, when we have a record selector, we can say from which type
the record selector originates from.
- - - - -
60018f32 by fendor at 2026-09-17T10:44:35+02:00
Typeable test
- - - - -
15 changed files:
- + changelog.d/record-dot-evidence
- compiler/GHC/Iface/Ext/Ast.hs
- compiler/GHC/Iface/Ext/Types.hs
- compiler/GHC/Iface/Ext/Utils.hs
- compiler/GHC/Rename/Expr.hs
- + testsuite/tests/hiefile/should_run/HasFieldQueries.hs
- + testsuite/tests/hiefile/should_run/HasFieldQueries.stdout
- + testsuite/tests/hiefile/should_run/HieTypeable.hs
- + testsuite/tests/hiefile/should_run/HieTypeable.stdout
- + testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.hs
- + testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.stdout
- testsuite/tests/hiefile/should_run/RecordDotTypes.hs
- testsuite/tests/hiefile/should_run/RecordDotTypes.stdout
- testsuite/tests/hiefile/should_run/T23492.stdout
- testsuite/tests/hiefile/should_run/all.T
Changes:
=====================================
changelog.d/record-dot-evidence
=====================================
@@ -0,0 +1,12 @@
+section: compiler
+synopsis: Record selector functions as evidence for `HasField` constraints during .hie file generation.
+description: {
+ We record the record selector `foo` of an expression such as `f.foo` as evidence for
+ solving the constraint `HasField "foo" record ty`.
+
+ This allows us to point to the definition source location of the record selector `foo`, allowing
+ users to jump to definition using the evidence variables.
+}
+
+issues: #25418
+mrs: !16694
=====================================
compiler/GHC/Iface/Ext/Ast.hs
=====================================
@@ -23,7 +23,6 @@ import GHC.Core.DataCon ( dataConWrapperType )
import GHC.Core.Type ( Type, ForAllTyFlag(..) )
import GHC.Core.TyCon ( TyCon, tyConClass_maybe )
import GHC.Core.InstEnv
-import GHC.Core.Predicate ( isEvId )
import GHC.Hs
import GHC.Hs.Syn.Type
@@ -33,7 +32,7 @@ import GHC.Types.Basic
import GHC.Types.UnresolvedImport ( isGeneratedImport )
import GHC.Types.FieldLabel
import GHC.Types.Avail ( Avails )
-import GHC.Types.Id ( isDataConId_maybe )
+import GHC.Types.Id ( isDataConId_maybe, isId, idDetails )
import GHC.Types.Name ( Name, nameSrcSpan, nameUnique, wiredInNameTyThing_maybe, getName )
import GHC.Types.Name.Env ( NameEnv, emptyNameEnv, extendNameEnv, lookupNameEnv )
import GHC.Types.Name.Reader ( RecFieldInfo(..), WithUserRdr(..) )
@@ -81,6 +80,7 @@ import Control.Applicative ( (<|>) )
import GHC.Types.TypeEnv ( TypeEnv )
import Control.Arrow ( second )
import Data.Traversable ( mapAccumR )
+import GHC.Types.Id.Info (IdDetails(..), recSelParentName)
{- Note [Updating HieAst for changes in the GHC AST]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -682,7 +682,7 @@ instance ToHie (Context (Located (WithUserRdr Name))) where
hieEvIdsOfTerm :: EvTerm -> [EvId]
-- Returns only EvIds satisfying relevantEvId
-hieEvIdsOfTerm = runFVSelectiveList isEvId . evTermFVs
+hieEvIdsOfTerm = runFVSelectiveList isId . evTermFVs
instance ToHie (EvBindContext (LocatedA TcEvBinds)) where
toHie (EvBindContext sc sp (L span (EvBinds bs)))
@@ -690,7 +690,7 @@ instance ToHie (EvBindContext (LocatedA TcEvBinds)) where
where
go evbind = do
let evDeps = hieEvIdsOfTerm $ eb_rhs evbind
- depNames = EvBindDeps $ map varName evDeps
+ depNames = EvBindDeps $ map classifyEvBindDep evDeps
concatM $
[ toHie (C (EvidenceVarBind (EvLetBind depNames) (combineScopes sc (mkScope span)) sp)
(L span $ eb_lhs evbind))
@@ -698,6 +698,12 @@ instance ToHie (EvBindContext (LocatedA TcEvBinds)) where
]
toHie _ = pure []
+classifyEvBindDep :: EvId -> EvBindDep
+classifyEvBindDep evId =
+ case idDetails evId of
+ RecSelId{sel_tycon} -> RecordField (varName evId) (recSelParentName sel_tycon)
+ _ -> EvidenceVar (varName evId)
+
instance ToHie (LocatedA HsWrapper) where
toHie (L osp wrap)
= case wrap of
=====================================
compiler/GHC/Iface/Ext/Types.hs
=====================================
@@ -598,17 +598,79 @@ instance Outputable EvVarSource where
ppr (EvInstBind True cls) = text "bound due to a superclass of " <+> ppr cls
ppr (EvLetBind deps) = text "bound by a let, depending on:" <+> ppr deps
+-- | Evidence binding dependency with additional details.
+data EvBindDep
+ = EvidenceVar Name
+ -- ^ Evidence variable such as a type class constructor.
+ --
+ -- For example, @C:HasField@, @$dShow@ (dictionaries) or @$fCList@.
+ --
+ -- This is the default representation of a 'EvBindDep'.
+ | RecordField
+ -- ^ Evidence variable of a record selector.
+ --
+ -- This is for example generated with @-XOverloadedRecordDot@, where
+ -- the evidence includes a reference to which record selector is used
+ -- to implement @getField@.
+ Name
+ -- ^ 'Name' of the record selector
+ Name
+ -- ^ 'Name' of the parent type.
+ | TypeableEvidence
+ -- ^ Evidence of a @Typeable@ constraint.
+ Name
+ -- ^ Name of the type the evidence was generated for.
+ deriving (Eq, Ord)
+
+instance Outputable EvBindDep where
+ ppr = \ case
+ EvidenceVar n -> ppr n
+ RecordField sel parent -> ppr sel <+> text "of Record" <+> ppr parent
+ TypeableEvidence n -> ppr n <+> text "bound by Typeable"
+
+evBindDepName :: EvBindDep -> Name
+evBindDepName = \ case
+ EvidenceVar n -> n
+ RecordField selector _record -> selector
+ TypeableEvidence n -> n
+
+evBindDepHieName :: EvBindDep -> HieName
+evBindDepHieName = toHieName . evBindDepName
+
+instance Binary EvBindDep where
+ put_ bh = \ case
+ EvidenceVar n -> do
+ putByte bh 0
+ put_ bh n
+ RecordField n sel -> do
+ putByte bh 1
+ put_ bh n
+ put_ bh sel
+ TypeableEvidence n -> do
+ putByte bh 2
+ put_ bh n
+
+ get bh =
+ getByte bh >>= \ case
+ 0 -> EvidenceVar <$> get bh
+ 1 -> RecordField <$> get bh <*> get bh
+ 2 -> TypeableEvidence <$> get bh
+ t -> fail $ "EvBindDep: Unknown tag: " ++ show t
+
-- | Eq/Ord instances compare on the converted HieName,
-- as non-exported names may have different uniques after
-- a roundtrip
-newtype EvBindDeps = EvBindDeps { getEvBindDeps :: [Name] }
+newtype EvBindDeps = EvBindDeps { getEvBindDeps :: [EvBindDep] }
deriving Outputable
+evBindDepsNames :: EvBindDeps -> [Name]
+evBindDepsNames = map evBindDepName . getEvBindDeps
+
instance Eq EvBindDeps where
- (==) = coerce ((==) `on` map toHieName)
+ (==) = coerce ((==) `on` map evBindDepHieName)
instance Ord EvBindDeps where
- compare = coerce (compare `on` map toHieName)
+ compare = coerce (compare `on` map evBindDepHieName)
instance Binary EvBindDeps where
put_ bh (EvBindDeps xs) = put_ bh xs
=====================================
compiler/GHC/Iface/Ext/Utils.hs
=====================================
@@ -82,15 +82,19 @@ resolveVisibility kind ty_args
foldType :: (HieType a -> a) -> HieTypeFix -> a
foldType f (Roll t) = f $ fmap (foldType f) t
-selectPoint :: HieFile -> (Int,Int) -> Maybe (HieAST Int)
-selectPoint hf (sl,sc) = getFirst $
+selectPoint :: HieFile -> (Int,Int) -> Maybe (HieAST TypeIndex)
+selectPoint hf p = selectRange hf p p
+
+selectRange :: HieFile -> (Int,Int) -> (Int,Int) -> Maybe (HieAST TypeIndex)
+selectRange hf (sl,sc) (el, ec) = getFirst $
flip foldMap (M.toList (getAsts $ hie_asts hf)) $ \(HiePath fs,ast) -> First $
case selectSmallestContaining (sp fs) ast of
Nothing -> Nothing
Just ast' -> Just ast'
where
sloc fs = mkRealSrcLoc fs sl sc
- sp fs = mkRealSrcSpan (sloc fs) (sloc fs)
+ eloc fs = mkRealSrcLoc fs el ec
+ sp fs = mkRealSrcSpan (sloc fs) (eloc fs)
findEvidenceUse :: NodeIdentifiers a -> [Name]
findEvidenceUse ni = [n | (Right n, dets) <- xs, any isEvidenceUse (identInfo dets)]
@@ -141,7 +145,7 @@ getEvidenceTree refmap var = go emptyNameSet var
det <- S.toList $ identInfo dets
case det of
EvidenceVarBind src@(EvLetBind (getEvBindDeps -> xs)) scp spn ->
- pure $ Just ((src,scp,spn),mapMaybe (go $ extendNameSet seen var) xs)
+ pure $ Just ((src,scp,spn),mapMaybe (go (extendNameSet seen var) . evBindDepName) xs)
EvidenceVarBind src scp spn -> pure $ Just ((src,scp,spn),[])
_ -> pure Nothing
pure $ Tree.Node (EvidenceInfo var sp typ (Just evdet)) children
@@ -386,7 +390,7 @@ definedInAsts asts n = case nameSrcSpan n of
getEvidenceBindDeps :: ContextInfo -> [Name]
getEvidenceBindDeps (EvidenceVarBind (EvLetBind xs) _ _) =
- getEvBindDeps xs
+ evBindDepsNames xs
getEvidenceBindDeps _ = []
isEvidenceBind :: ContextInfo -> Bool
=====================================
compiler/GHC/Rename/Expr.hs
=====================================
@@ -422,7 +422,7 @@ rnExpr (HsGetField _ e f)
; let f' = rnDotFieldOcc <$> f
; return ( mkExpandedExpr
(HsGetField noExtField e f')
- (mkGetField getField e (fmap (unLoc . dfoLabel) f'))
+ (mkGetField getField e (dfoLabel $ unLoc f'))
, fv_e `plusFN` fv_getField ) }
rnExpr (HsProjection _ fs)
@@ -431,7 +431,7 @@ rnExpr (HsProjection _ fs)
; let fs' = NE.map rnDotFieldOcc fs
; return ( mkExpandedExpr
(HsProjection noExtField fs')
- (mkProjection getField circ $ NE.map (unLoc . dfoLabel) fs')
+ (mkProjection getField circ $ NE.map dfoLabel fs')
, unitFN circ `plusFN` fv_getField) }
------------------------------------------
@@ -2882,8 +2882,9 @@ rnHsIf p b1 b2
-- mkGetField arg field calculates a get_field @field arg expression.
-- e.g. z.x = mkGetField z x = get_field @x z
-mkGetField :: Name -> LHsExpr GhcRn -> LocatedAn NoEpAnns FieldLabelString -> HsExpr GhcRn
-mkGetField get_field arg field = unLoc (head $ mkGet get_field (arg :| []) field)
+mkGetField :: Name -> LHsExpr GhcRn -> XRec GhcRn FieldLabelString -> HsExpr GhcRn
+mkGetField get_field arg field =
+ HsApp noExtField (mkGetFieldExpr get_field field) arg
-- mkSetField a field b calculates a set_field @field expression.
-- e.g mkSetSetField a field b = set_field @"field" a b (read as "set field 'field' to a on b").
@@ -2902,14 +2903,16 @@ mkSet set_field acc (field, g) = wrapGenSpan (mkSetField set_field g field acc)
-- mkProjection fields calculates a projection.
-- e.g. .x = mkProjection [x] = getField @"x"
-- .x.y = mkProjection [.x, .y] = (.y) . (.x) = getField @"y" . getField @"x"
-mkProjection :: Name -> Name -> NonEmpty FieldLabelString -> HsExpr GhcRn
-mkProjection getFieldName circName (field :| fields) = foldl' f (proj field) fields
+mkProjection :: Name -> Name -> NonEmpty (XRec GhcRn FieldLabelString) -> HsExpr GhcRn
+mkProjection getFieldName circName (field :| fields) =
+ unLoc $ foldl' f (mkGetFieldExpr getFieldName field) fields
where
- f :: HsExpr GhcRn -> FieldLabelString -> HsExpr GhcRn
- f acc field = genHsApps circName $ map wrapGenSpan [proj field, acc]
+ f :: LHsExpr GhcRn -> XRec GhcRn FieldLabelString -> LHsExpr GhcRn
+ f acc field = wrapGenSpan $ genHsApps circName [mkGetFieldExpr getFieldName field, acc]
- proj :: FieldLabelString -> HsExpr GhcRn
- proj (FieldLabelString f) = genHsVar getFieldName `genAppType` genHsTyLit f
+mkGetFieldExpr :: Name -> XRec GhcRn FieldLabelString -> LHsExpr GhcRn
+mkGetFieldExpr getFieldName (L ann (FieldLabelString f)) =
+ wrapGenSpan' (getHasLoc ann) (genHsVar getFieldName `genAppType` genHsTyLit f)
-- mkProjUpdateSetField calculates functions representing dot notation record updates.
-- e.g. Suppose an update like foo.bar = 1.
=====================================
testsuite/tests/hiefile/should_run/HasFieldQueries.hs
=====================================
@@ -0,0 +1,65 @@
+{-# LANGUAGE OverloadedRecordDot #-}
+module Main where
+
+import TestUtils
+import GHC.Records
+import GHC.TypeLits
+import Data.Tree
+
+data Thing = Thing {field1 :: Char, field2 :: Bool}
+ deriving (Show, Eq)
+
+foo :: Thing -> String
+foo t = show t.field1
+-- ^ this is the point
+
+testing2 (x :: Thing) = x.field1
+-- ^ this is the point
+-- ^ this is the point
+
+data NestedThing = NestedThing { nested1 :: Thing }
+
+nestedSig :: NestedThing -> Char
+nestedSig n = n.nested1.field1
+-- ^ this is the point
+-- ^ this is the point
+
+nestedNoSig n = n.nested1.field2 :: Bool
+-- ^ this is the point
+-- ^ this is the point
+
+
+withConstraint :: HasField "field1" x Char => x -> Char
+withConstraint x = x.field1
+-- ^ this is the point
+
+prefix :: Thing -> Char
+prefix x = (.field1) x
+-- ^ this is the point
+
+prefixNested :: NestedThing -> Char
+prefixNested x = (.nested1.field1) x
+-- ^ this is the point
+-- ^ this is the point
+
+
+points =
+ [ (13,17)
+ , (16,25)
+ , (16,27)
+ , (23,17)
+ , (23,25)
+ , (27,20)
+ , (27,28)
+ , (33,22)
+ , (37,14)
+ , (41,21)
+ , (41,30)
+ ]
+
+main = do
+ (df, hf) <- readTestHie "HasFieldQueries.hie"
+ let refmap = generateReferencesMap $ getAsts $ hie_asts hf
+
+ traverse (explainEv df hf refmap) points
+ return ()
=====================================
testsuite/tests/hiefile/should_run/HasFieldQueries.stdout
=====================================
@@ -0,0 +1,244 @@
+==========================
+At point (13,17), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ field1 of Record Thing]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
+==========================
+At point (16,25), we found:
+==========================
+==========================
+At point (16,27), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:16:1-32, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ field1 of Record Thing]
+│ with scope: LocalScope HasFieldQueries.hs:16:1-32
+│ bound at: HasFieldQueries.hs:16:1-32
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
+==========================
+At point (23,17), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "nested1" NestedThing Thing
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ nested1 of Record NestedThing]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ nested1 at HasFieldQueries.hs:1:1, of type: NestedThing -> Thing
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:20:34
+ └
+
+==========================
+At point (23,25), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+ │ is an evidence variable bound by a let, depending on: [C:HasField,
+ │ field1 of Record Thing]
+ │ with scope: ModuleScope
+ │
+ │ Defined at <no location info>
+ └
+ |
+ +- ┌
+ | │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ | │ is a usage of an external evidence variable
+ | │ Defined in `GHC.Internal.Records'
+ | └
+ |
+ `- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
+==========================
+At point (27,20), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:27:1-40, of type: HasField "nested1" r r
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: LocalScope HasFieldQueries.hs:27:1-40
+│ bound at: HasFieldQueries.hs:27:1-40
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:27:1-40, of type: HasField "nested1" r r
+ │ is an evidence variable bound by a type signature
+ │ with scope: LocalScope HasFieldQueries.hs:27:1-40
+ │ bound at: HasFieldQueries.hs:27:1-40
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (27,28), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:27:1-40, of type: HasField "field2" r Bool
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: LocalScope HasFieldQueries.hs:27:1-40
+│ bound at: HasFieldQueries.hs:27:1-40
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:27:1-40, of type: HasField "field2" r Bool
+ │ is an evidence variable bound by a type signature
+ │ with scope: LocalScope HasFieldQueries.hs:27:1-40
+ │ bound at: HasFieldQueries.hs:27:1-40
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (33,22), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:33:1-27, of type: HasField "field1" x Char
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: LocalScope HasFieldQueries.hs:33:1-27
+│ bound at: HasFieldQueries.hs:33:1-27
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:33:1-27, of type: HasField "field1" x Char
+ │ is an evidence variable bound by a HsWrapper
+ │ with scope: LocalScope HasFieldQueries.hs:33:1-27
+ │ bound at: HasFieldQueries.hs:33:1-27
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (37,14), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+ │ is an evidence variable bound by a let, depending on: [C:HasField,
+ │ field1 of Record Thing]
+ │ with scope: ModuleScope
+ │
+ │ Defined at <no location info>
+ └
+ |
+ +- ┌
+ | │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+ | │ is a usage of an external evidence variable
+ | │ Defined in `GHC.Internal.Records'
+ | └
+ |
+ `- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
+==========================
+At point (41,21), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "nested1" NestedThing Thing
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ nested1 of Record NestedThing]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ nested1 at HasFieldQueries.hs:1:1, of type: NestedThing -> Thing
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:20:34
+ └
+
+==========================
+At point (41,30), we found:
+==========================
+┌
+│ $dHasField at HasFieldQueries.hs:1:1, of type: HasField "field1" Thing Char
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ field1 of Record Thing]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at HasFieldQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ field1 at HasFieldQueries.hs:1:1, of type: Thing -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at HasFieldQueries.hs:9:21
+ └
+
=====================================
testsuite/tests/hiefile/should_run/HieTypeable.hs
=====================================
@@ -0,0 +1,28 @@
+module Main where
+
+import Data.Dynamic
+import Data.Typeable
+import TestUtils
+
+data Thing = Thing {field1 :: Char, field2 :: Bool}
+ deriving (Show, Eq)
+
+castFromDynamic :: Dynamic -> Maybe Thing
+castFromDynamic d = fromDynamic d
+ -- ^ this is the point
+
+rep :: Thing -> TypeRep
+rep d = typeOf d
+ -- ^ this is the point
+
+points =
+ [ (11,21)
+ , (15,10)
+ ]
+
+main = do
+ (df, hf) <- readTestHie "HieTypeable.hie"
+ let refmap = generateReferencesMap $ getAsts $ hie_asts hf
+
+ traverse (explainEv df hf refmap) points
+ return ()
=====================================
testsuite/tests/hiefile/should_run/HieTypeable.stdout
=====================================
@@ -0,0 +1,30 @@
+==========================
+At point (11,21), we found:
+==========================
+┌
+│ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+│ is an evidence variable bound by a let, depending on: [$dTypeable]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+ │ is an evidence variable bound by a let, depending on: []
+ │ with scope: ModuleScope
+ │
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (15,10), we found:
+==========================
+┌
+│ $dTypeable at HieTypeable.hs:1:1, of type: Typeable Thing
+│ is an evidence variable bound by a let, depending on: []
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+
=====================================
testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.hs
=====================================
@@ -0,0 +1,67 @@
+{-# LANGUAGE NoFieldSelectors #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+module Main where
+
+import TestUtils
+import GHC.Records
+
+data A = A { a :: Int, b :: Char }
+data B = B { a :: Int, n :: A }
+data C
+ = C { c :: Float }
+ | D { c :: Float }
+ | E { e :: Int }
+
+valA = A { a = 1, b = 'b' }
+valB = B { a = 1, n = valA }
+valC = C { c = 1.0 }
+valD = D { c = 2.0 }
+valE = E { e = 1 }
+
+accessA :: Int
+accessA = valA.a
+-- ^ 1
+
+accessField :: HasField "a" r Int => r -> Int
+accessField r = r.a
+-- ^ 2
+
+nested = valB.n.b
+-- ^ ^
+-- 3 4
+multi1a = valC.c
+-- ^
+-- 5
+multi1b = valD.c
+-- ^
+-- 6
+multi1c :: C -> Float
+multi1c someC = someC.c -- Where does this point to?
+-- ^
+-- 7
+multi3 = valE.e
+-- ^
+-- 8
+multi4 = valD.e -- This is a run-time error, but where does it point to?
+-- ^
+-- 9
+
+points =
+ [ (23, 16)
+ , (27, 19)
+ , (30, 15)
+ , (30, 17)
+ , (33, 16)
+ , (36, 16)
+ , (40, 23)
+ , (43, 15)
+ , (46, 15)
+ ]
+
+main = do
+ (df, hf) <- readTestHie "NoFieldSelectorQueries.hie"
+ let refmap = generateReferencesMap $ getAsts $ hie_asts hf
+
+ traverse (explainEv df hf refmap) points
+ return ()
=====================================
testsuite/tests/hiefile/should_run/NoFieldSelectorQueries.stdout
=====================================
@@ -0,0 +1,211 @@
+==========================
+At point (23,16), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:1:1, of type: HasField "a" A Int
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ a of Record A]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ a at NoFieldSelectorQueries.hs:1:1, of type: A -> Int
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:9:14
+ └
+
+==========================
+At point (27,19), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:27:1-19, of type: HasField "a" r Int
+│ is an evidence variable bound by a let, depending on: [$dHasField]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:27:1-19
+│ bound at: NoFieldSelectorQueries.hs:27:1-19
+│ Defined at <no location info>
+└
+|
+`- ┌
+ │ $dHasField at NoFieldSelectorQueries.hs:27:1-19, of type: HasField "a" r Int
+ │ is an evidence variable bound by a HsWrapper
+ │ with scope: LocalScope NoFieldSelectorQueries.hs:27:1-19
+ │ bound at: NoFieldSelectorQueries.hs:27:1-19
+ │ Defined at <no location info>
+ └
+
+==========================
+At point (30,15), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:30:1-17, of type: HasField "n" B A
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ n of Record B]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:30:1-17
+│ bound at: NoFieldSelectorQueries.hs:30:1-17
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ n at NoFieldSelectorQueries.hs:30:1-17, of type: B -> A
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:10:24
+ └
+
+==========================
+At point (30,17), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:30:1-17, of type: HasField "b" A Char
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ b of Record A]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:30:1-17
+│ bound at: NoFieldSelectorQueries.hs:30:1-17
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ b at NoFieldSelectorQueries.hs:30:1-17, of type: A -> Char
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:9:24
+ └
+
+==========================
+At point (33,16), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:33:1-16, of type: HasField "c" C Float
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ c of Record C]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:33:1-16
+│ bound at: NoFieldSelectorQueries.hs:33:1-16
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ c at NoFieldSelectorQueries.hs:1:1, of type: C -> Float
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:12:9
+ └
+
+==========================
+At point (36,16), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:36:1-16, of type: HasField "c" C Float
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ c of Record C]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:36:1-16
+│ bound at: NoFieldSelectorQueries.hs:36:1-16
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ c at NoFieldSelectorQueries.hs:1:1, of type: C -> Float
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:12:9
+ └
+
+==========================
+At point (40,23), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:1:1, of type: HasField "c" C Float
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ c of Record C]
+│ with scope: ModuleScope
+│
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ c at NoFieldSelectorQueries.hs:1:1, of type: C -> Float
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:12:9
+ └
+
+==========================
+At point (43,15), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:43:1-15, of type: HasField "e" C Int
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ e of Record C]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:43:1-15
+│ bound at: NoFieldSelectorQueries.hs:43:1-15
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ e at NoFieldSelectorQueries.hs:43:1-15, of type: C -> Int
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:14:9
+ └
+
+==========================
+At point (46,15), we found:
+==========================
+┌
+│ $dHasField at NoFieldSelectorQueries.hs:46:1-15, of type: HasField "e" C Int
+│ is an evidence variable bound by a let, depending on: [C:HasField,
+│ e of Record C]
+│ with scope: LocalScope NoFieldSelectorQueries.hs:46:1-15
+│ bound at: NoFieldSelectorQueries.hs:46:1-15
+│ Defined at <no location info>
+└
+|
++- ┌
+| │ C:HasField at NoFieldSelectorQueries.hs:1:1, of type: forall {k} (x :: k) r a. (r -> a) -> HasField x r a
+| │ is a usage of an external evidence variable
+| │ Defined in `GHC.Internal.Records'
+| └
+|
+`- ┌
+ │ e at NoFieldSelectorQueries.hs:43:1-15, of type: C -> Int
+ │ is a usage of an external evidence variable
+ │ Defined at NoFieldSelectorQueries.hs:14:9
+ └
+
=====================================
testsuite/tests/hiefile/should_run/RecordDotTypes.hs
=====================================
@@ -22,6 +22,11 @@ x = MyRecord { a = "Hello", b = 12, c = MyChild { z = "there" } }
y = x.a ++ show x.b ++ x.c.z
-- ^ ^ ^ ^^
-- 1 2 3 45
+-- ^-^ ^-^ ^-^
+-- 6 7 8
+-- ^---^
+-- 9
+
p1,p2,p3,p4 :: (Int,Int)
p1 = (22,6)
@@ -30,10 +35,19 @@ p3 = (22,25)
p4 = (22,28)
p5 = (22,29)
+r6 = (p1, (22, 8))
+r7 = ((22,17), p2)
+r8 = (p3, (22, 27))
+r9 = (p3, p5)
+
selectPoint' :: HieFile -> (Int,Int) -> HieAST Int
selectPoint' hf loc =
maybe (error "point not found") id $ selectPoint hf loc
+selectRange' :: HieFile -> ((Int,Int), (Int, Int)) -> HieAST Int
+selectRange' hf (s, e) =
+ maybe (error "range not found") id $ selectRange hf s e
+
main = do
(df, hf) <- readTestHie "RecordDotTypes.hie"
forM_ [p1,p2,p3,p4,p5] $ \point -> do
@@ -41,3 +55,11 @@ main = do
let types = concatMap nodeType $ getSourcedNodeInfo $ sourcedNodeInfo $ selectPoint' hf point
forM_ types $ \typ -> do
putStrLn (renderHieType df $ recoverFullType typ (hie_types hf))
+
+ forM_ [r6, r7, r8, r9] $ \range -> do
+ putStr $ "At " ++ showRange range ++ ", got type: "
+ let types = concatMap nodeType $ getSourcedNodeInfo $ sourcedNodeInfo $ selectRange' hf range
+ forM_ types $ \typ -> do
+ putStrLn (renderHieType df $ recoverFullType typ (hie_types hf))
+ where
+ showRange (p1, p2) = show p1 ++ " - " ++ show p2
=====================================
testsuite/tests/hiefile/should_run/RecordDotTypes.stdout
=====================================
@@ -1,5 +1,9 @@
At (22,6), got type: MyRecord
-At (22,20), got type: Integer
+At (22,20), got type: MyRecord -> Integer
At (22,25), got type: MyRecord
-At (22,28), got type: String
-At (22,29), got type: String
\ No newline at end of file
+At (22,28), got type: MyChild -> [Char]
+At (22,29), got type: MyChild -> [Char]
+At (22,6) - (22,8), got type: [Char]
+At (22,17) - (22,20), got type: Integer
+At (22,25) - (22,27), got type: MyChild
+At (22,25) - (22,29), got type: [Char]
=====================================
testsuite/tests/hiefile/should_run/T23492.stdout
=====================================
@@ -4,4 +4,4 @@ PartialFieldSelector
At (18,7), got type: PartialFieldSelector -> Bool
At (23,7), got type: PartialFieldSelector
At (23,8), got type: PartialFieldSelector
-At (23,9), got type: Bool
+At (23,9), got type: PartialFieldSelector -> Bool
=====================================
testsuite/tests/hiefile/should_run/all.T
=====================================
@@ -10,3 +10,6 @@ test('T23120', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUti
test('T24544', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
test('HieGadtConSigs', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
test('T25709', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
+test('HasFieldQueries', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
+test('NoFieldSelectorQueries', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
+test('HieTypeable', [extra_run_opts('"' + config.libdir + '"'), extra_files(['TestUtils.hs'])], compile_and_run, ['-package ghc -fwrite-ide-info'])
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/849373915a38eec2f17fdac452dfa5…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/849373915a38eec2f17fdac452dfa5…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][master] Fix the CompactionFailed documentation link to compact
by Marge Bot (＠marge-bot) 17 Sep '26
by Marge Bot (＠marge-bot) 17 Sep '26
17 Sep '26
Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
4cf7628a by Evgeny Malyshev at 2026-09-17T02:39:56-04:00
Fix the CompactionFailed documentation link to compact
The old Haddock reference links into base instead of ghc-compact.
Use an explicit URL because ghc-compact depends on base, not vice versa.
Fixes #27558
Assisted-By: OpenAI Codex
- - - - -
1 changed file:
- libraries/ghc-internal/src/GHC/Internal/IO/Exception.hs
Changes:
=====================================
libraries/ghc-internal/src/GHC/Internal/IO/Exception.hs
=====================================
@@ -141,7 +141,7 @@ allocationLimitExceeded = toException AllocationLimitExceeded
-- | Compaction found an object that cannot be compacted. Functions
-- cannot be compacted, nor can mutable objects or pinned objects.
--- See 'GHC.Compact.compact'.
+-- See [@compact@](https://hackage.haskell.org/package/ghc-compact/docs/GHC-Compact.html#v:compact).
--
-- @since base-4.10.0.0
newtype CompactionFailed = CompactionFailed String
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4cf7628aa66f56000c29aef93924b6b…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4cf7628aa66f56000c29aef93924b6b…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][master] 3 commits: Improvements to type/data family handling
by Marge Bot (＠marge-bot) 17 Sep '26
by Marge Bot (＠marge-bot) 17 Sep '26
17 Sep '26
Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
1b4a622f by sheaf at 2026-09-17T02:39:13-04:00
Improvements to type/data family handling
This commit makes several improvements to the treatment of type and data
families in GHC:
- We consistently use "type family" instead of "type synonym family"
to avoid a confusion with type synonyms. For example:
- OpenSynFamilyTyCon ==> OpenTypeFamilyTyCon
- ClosedSynFamilyTyCon => ClosedTypeFamilyTyCon
- Various functions that were specific to data families have been
renamed to make this clear. For example:
- tyConFamInst_maybe ==> tyConDataFamInst_maybe
- isFamInstTyCon ==> isDataFamInstTyCon
- 'FamTyConFlav' has been refactored so that all closed type families
share a single 'ClosedTypeFamilyTyCon' constructor.
The corresponding 'IfaceFamTyConFlav' type was updated similarly.
This is then used to tidy up the implementation of
GHC.Core.FamInstEnv.reduceTyFamApp_maybe.
- - - - -
c5aa9098 by sheaf at 2026-09-17T02:39:13-04:00
Small refactor of lookupFamInstEnv
This commit reworks the code for looking up family instances in
GHC.Core.FamInstEnv, reducing duplication a little bit.
No change in behaviour.
- - - - -
a3ad4588 by sheaf at 2026-09-17T02:39:14-04:00
Use a type family for boxing unboxed types
This commit overhauls the way in which unboxed types are boxed, as per
the updated Note [Boxing constructors] in GHC.Builtin.WiredIn.Types.Box.
The main change is to allow boxing to be parametrised by representation,
e.g. making 'Box ty' a valid type. We achieve this by implementing 'Box'
using a closed type family:
newtype Box (a :: TYPE r) = Box (BoxTF r)
type BoxTF :: RuntimeRep -> Type
type family BoxTF r where
BoxTF IntRep = BoxInt
BoxTF Int8Rep = BoxInt8
BoxTF WordRep = BoxWord
BoxTF LiftedRep = Any @Type
BoxTF (TupleRep [r1, r2]) = (BoxTF r1, BoxTF r2)
...
BoxTF (SumRep rs) = BoxSum rs
This new design solves the following problems:
- It allows boxing a type whose 'RuntimeRep' has not yet been
determined (e.g. because we only learn the 'RuntimeRep' after
constraint solving). That is, 'Box @r a' is a perfectly valid type
even if 'r' is an unfilled metavariable. This is a requirement
to fix #25065 (in which we need to box a type whose 'RuntimeRep'
is only filled in during constraint solving).
- It handles boxing of unboxed tuples and unboxed sums, via recursive
boxing. See Note [Boxing TupleRep and SumRep] in
GHC.Builtin.WiredIn.Types.Box.
'Box', 'BoxTF' and all of the boxing data constructors are defined in
a new 'ghc-internal' module, 'GHC.Internal.Box'. This module contains
nothing but wired-in declarations, and GHC never loads its interface on
account of a wired-in thing (GHC.Builtin.Modules.isWiredInOnlyModule);
see Note [Loading instances for wired-in things] in GHC.Iface.Load.
The individual boxing data constructors are deliberately left as an
internal implementation detail, and not exported. The intended API is
via the two new magic 'Id's:
box :: forall {r} (a :: TYPE r). a -> Box a
unbox :: forall {r} (a :: TYPE r). Box a -> a
exported from 'GHC.PrimOps' (in 'ghc-experimental'). The old boxing
data types (IntBox, WordBox, FloatBox, DoubleBox, DictBox) are no longer
exported from base (CLC proposal #421).
We use this new design to consistently desugar:
- parallel comprehensions (GHC.HsToCore.ListComp.{deListComp,dsMcStmt})
- then/group/using statements (GHC.HsToCore.ListComp.{dsTransStmt,dsMcStmt})
- recursive do blocks (mdo/rec) (GHC.HsToCore.Expr.dsDo)
- arrows (GHC.HsToCore.Arrows)
by consistently using 'box'/'unbox' to deal with unboxed types being put
into big tuples. We also adapt 'GHC.Tc.Gen.Match.{tcMcStmt,tcDoStmt}'
to create fresh /representation-polymorphic/ type variables for the
binders that we are going to put into a big tuple (previously, GHC only
allowed lifted types in that position).
These desugaring of box and unbox is explained in
Note [Desugaring box & unbox] in GHC.Core.Make.Box. Roughly speaking,
the desugaring looks like:
box @r @ty e ==> K e
unbox @r @ty e ==> case e of K x -> x
where 'K' is the boxing data constructor at RuntimeRep 'r'. It's
slightly more complicated than that in practice: we first need to
insert a cast (see Note [The canonical type of a RuntimeRep]) using the
new 'CanonicalProv' 'UnivCoProvenance', and unboxed tuples/sums need
recursive logic explained in Note [box/unbox for unboxed tuples and sums],
including a specific 'BoxSum' datatypes for unboxed sum (which also
needed a wired-in type-level list indexing type family (!!)).
The desugaring happens in two ways:
- Occurrences of 'box'/'unbox' emitted by the typechecker are
eliminated in the 'ds_app_var' case of GHC.HsToCore.Expr.
- Other code that needs to box/unbox emits the appropriate code inline.
This includes the big tuple machinery of GHC.Core.Make used by the
desugarer (GHC.HsToCore.{Utils,Binds,Arrows,ListComp}) as well as
the float-out pass (GHC.Core.Opt.SetLevels).
Core Lint checks that no occurrence of 'box'/'unbox' survives desugaring.
On the way, we overhaul the litany of big tuple functions by introducing
data BigTupleLayout = BoxedElements | BareElements
to distinguish the two kinds of "big tuples" that GHC routinely deals
with; for example 'mkBigCoreVarTupSolo' becomes 'mkBigCoreVarTup BareElements'.
All of this code is moved to the new module GHC.Core.Make.BigTuple.
Fixes #20864 #22336 #22473 #25065 #27331
-------------------------
Metric Decrease:
T9872a
-------------------------
- - - - -
103 changed files:
- + changelog.d/boxing-family
- + changelog.d/clc-421
- compiler/GHC/Builtin.hs
- compiler/GHC/Builtin/KnownKeys.hs
- compiler/GHC/Builtin/Modules.hs
- compiler/GHC/Builtin/Uniques.hs
- compiler/GHC/Builtin/WiredIn/Ids.hs
- compiler/GHC/Builtin/WiredIn/Prim.hs
- compiler/GHC/Builtin/WiredIn/TypeLits.hs
- compiler/GHC/Builtin/WiredIn/Types.hs
- + compiler/GHC/Builtin/WiredIn/Types/Box.hs
- compiler/GHC/Core/Coercion.hs
- compiler/GHC/Core/Coercion/Axiom.hs
- compiler/GHC/Core/DataCon.hs
- compiler/GHC/Core/FamInstEnv.hs
- compiler/GHC/Core/Lint.hs
- compiler/GHC/Core/Make.hs
- + compiler/GHC/Core/Make/BigTuple.hs
- + compiler/GHC/Core/Make/Box.hs
- compiler/GHC/Core/Opt/SetLevels.hs
- compiler/GHC/Core/TyCo/Ppr.hs
- compiler/GHC/Core/TyCo/Rep.hs
- compiler/GHC/Core/TyCon.hs
- compiler/GHC/Core/Type.hs
- compiler/GHC/CoreToStg.hs
- compiler/GHC/CoreToStg/AddImplicitBinds.hs
- compiler/GHC/Driver/Main/Compile.hs
- compiler/GHC/Driver/Main/Passes.hs
- compiler/GHC/Hs/Utils.hs
- compiler/GHC/HsToCore/Arrows.hs
- compiler/GHC/HsToCore/Binds.hs
- compiler/GHC/HsToCore/Expr.hs
- compiler/GHC/HsToCore/ListComp.hs
- compiler/GHC/HsToCore/Utils.hs
- compiler/GHC/Iface/Decl.hs
- compiler/GHC/Iface/Load.hs
- compiler/GHC/Iface/Rename.hs
- compiler/GHC/Iface/Syntax.hs
- compiler/GHC/Iface/Tidy.hs
- compiler/GHC/IfaceToCore.hs
- compiler/GHC/Stg/Lint.hs
- compiler/GHC/StgToJS/CodeGen.hs
- compiler/GHC/Tc/Deriv.hs
- compiler/GHC/Tc/Deriv/Generate.hs
- compiler/GHC/Tc/Deriv/Generics.hs
- compiler/GHC/Tc/Gen/HsType.hs
- compiler/GHC/Tc/Gen/Match.hs
- compiler/GHC/Tc/Gen/Pat.hs
- compiler/GHC/Tc/Gen/Splice.hs
- compiler/GHC/Tc/Instance/Family.hs
- compiler/GHC/Tc/Instance/Typeable.hs
- compiler/GHC/Tc/Module.hs
- compiler/GHC/Tc/Solver/Default.hs
- compiler/GHC/Tc/Solver/FunDeps.hs
- compiler/GHC/Tc/TyCl.hs
- compiler/GHC/Tc/TyCl/Instance.hs
- compiler/GHC/Tc/Utils/Backpack.hs
- compiler/GHC/Types/CompleteMatch.hs
- compiler/GHC/Types/Id.hs
- compiler/GHC/Types/Id/Info.hs
- compiler/GHC/Types/Id/Make.hs
- compiler/GHC/Types/TyThing.hs
- compiler/GHC/Types/TyThing/Ppr.hs
- compiler/GHC/Types/Unique.hs
- compiler/ghc.cabal.in
- libraries/base/src/GHC/Base.hs
- libraries/base/src/GHC/Exts.hs
- libraries/ghc-internal/ghc-internal.cabal.in
- libraries/ghc-internal/include/RtsIfaceSymbols.h
- + libraries/ghc-internal/src/GHC/Internal/Box.hs
- libraries/ghc-internal/src/GHC/Internal/Exts.hs
- libraries/ghc-internal/src/GHC/Internal/TypeNats.hs
- libraries/ghc-internal/src/GHC/Internal/Types.hs
- linters/lint-codes/LintCodes/Static.hs
- rts/Prelude.h
- rts/include/rts/RtsToHsIface.h
- rts/sm/Evac.c
- testsuite/tests/arrows/should_run/all.T
- + testsuite/tests/arrows/should_run/arrowrun005.hs
- + testsuite/tests/arrows/should_run/arrowrun005.stdout
- testsuite/tests/count-deps/CountDepsParser.stdout
- + testsuite/tests/deSugar/should_compile/T25065a.hs
- testsuite/tests/deSugar/should_compile/all.T
- + testsuite/tests/deSugar/should_run/T20864.hs
- + testsuite/tests/deSugar/should_run/T20864.stdout
- + testsuite/tests/deSugar/should_run/T25065b.hs
- + testsuite/tests/deSugar/should_run/T25065b.stdout
- testsuite/tests/deSugar/should_run/all.T
- + testsuite/tests/indexed-types/should_run/T27331.hs
- + testsuite/tests/indexed-types/should_run/T27331.stdout
- + testsuite/tests/indexed-types/should_run/T27331b.hs
- + testsuite/tests/indexed-types/should_run/T27331b.stdout
- + testsuite/tests/indexed-types/should_run/T27331b_Plugin.hs
- testsuite/tests/indexed-types/should_run/all.T
- testsuite/tests/interface-stability/base-exports.stdout
- testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs
- testsuite/tests/interface-stability/base-exports.stdout-mingw32
- testsuite/tests/interface-stability/ghc-experimental-exports.stdout
- testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32
- testsuite/tests/interface-stability/ghc-prim-exports.stdout
- testsuite/tests/interface-stability/ghc-prim-exports.stdout-mingw32
- testsuite/tests/linters/notes.stdout
- utils/haddock/haddock-api/src/Haddock/Convert.hs
The diff was not included because it is too large.
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e2d57026995cd8065004764f6ef3b1…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e2d57026995cd8065004764f6ef3b1…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0