- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/mangoiv/26616] compiler: refactor error reporting code for ExplicitLevelImports
by Magnus (＠MangoIV) 15 Jun '26

15 Jun '26

Magnus pushed to branch wip/mangoiv/26616 at Glasgow Haskell Compiler / GHC Commits: 7ffe1f5b by mangoiv at 2026-06-15T21:17:57+02:00 compiler: refactor error reporting code for ExplicitLevelImports Refactors error reporting code for ExplicitLevelImports to pass in a RdrName and a GlobalReaderElt to be able to report errors that are faithful to the source and to more precisely distinguish between names that are in scope from different qualifications. Fixes #27385 and #26616 - - - - - 25 changed files: - + changelog.d/26616 - compiler/GHC/Rename/Env.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Rename/Splice.hs-boot - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/Export.hs - compiler/GHC/Tc/Utils/Env.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Types/Name/Reader.hs - testsuite/tests/splice-imports/SI03.stderr - testsuite/tests/splice-imports/SI05.stderr - testsuite/tests/splice-imports/SI25.stderr - testsuite/tests/splice-imports/SI28.stderr - testsuite/tests/splice-imports/SI31.stderr - testsuite/tests/splice-imports/T26088.stderr - testsuite/tests/splice-imports/T26090.stderr - + testsuite/tests/splice-imports/T26616.hs - + testsuite/tests/splice-imports/T26616.stderr - testsuite/tests/splice-imports/all.T Changes: ===================================== changelog.d/26616 ===================================== @@ -0,0 +1,9 @@ +section: compiler +synopsis: Fix bugs with ExplcitLevelImports accepting incorrect qualified imports and reporting errors + incorrectly in the presence of qualified imports +description: When reporting errors, ExplcitLevelImports would sometimes report identifiers qualified at a + module they were not oringally actually be qualified at. It would also allow using *any* qualified import + to bring an identifier into scope, even if that qualified import was not imported at the correct level. + This MR fixes both issues by passing more information to the responsible error reporting code. +mrs: !16195 +issues: #26616 #27385 ===================================== compiler/GHC/Rename/Env.hs ===================================== @@ -12,9 +12,9 @@ module GHC.Rename.Env ( lookupLocatedTopBndrRnN, lookupTopBndrRn, - lookupLocatedOccRn, lookupLocatedOccRnConstr, lookupLocatedOccRnRecField, + lookupLocatedOccRn, lookupLocatedOccRnGre, lookupLocatedOccRnConstr, lookupLocatedOccRnRecField, lookupLocatedOccRnNone, - lookupOccRn, lookupOccRn_maybe, lookupSameOccRn_maybe, + lookupOccRn, lookupOccRnGre, lookupOccRn_maybe, lookupSameOccRn_maybe, lookupLocalOccRn_maybe, lookupInfoOccRn, lookupLocalOccThLvl_maybe, lookupLocalOccRn, lookupTypeOccRn, @@ -992,6 +992,11 @@ lookupLocatedOccRn :: WhatLooking -> TcRn (GenLocated (EpAnn ann) Name) lookupLocatedOccRn what = wrapLocMA (lookupOccRn what) +lookupLocatedOccRnGre :: WhatLooking + -> GenLocated (EpAnn ann) RdrName + -> TcRn (GenLocated (EpAnn ann) GlobalRdrElt) +lookupLocatedOccRnGre what = wrapLocMA (lookupOccRnGre what) + lookupLocatedOccRnConstr :: GenLocated (EpAnn ann) RdrName -> TcRn (GenLocated (EpAnn ann) Name) lookupLocatedOccRnConstr = wrapLocMA lookupOccRnConstr @@ -1019,11 +1024,14 @@ lookupLocalOccThLvl_maybe name -- | lookupOccRn looks up an occurrence of a RdrName, and uses its argument to -- determine what kind of suggestions should be displayed if it is not in scope lookupOccRn :: WhatLooking -> RdrName -> RnM Name -lookupOccRn which_suggest rdr_name +lookupOccRn which_suggest = fmap greName . lookupOccRnGre which_suggest + +lookupOccRnGre :: WhatLooking -> RdrName -> RnM GlobalRdrElt +lookupOccRnGre which_suggest rdr_name = do { mb_gre <- lookupOccRn_maybe rdr_name ; case mb_gre of - Just gre -> return $ greName gre - Nothing -> reportUnboundName which_suggest rdr_name } + Just gre -> return gre + Nothing -> mkUnboundGRERdr rdr_name <$ reportUnboundName which_suggest rdr_name } -- | Look up an occurrence of a 'RdrName'. -- @@ -1087,16 +1095,16 @@ lookupLocalOccRn rdr_name -- lookupTypeOccRn looks up an optionally promoted RdrName. -- Used for looking up type variables. -lookupTypeOccRn :: RdrName -> RnM Name +lookupTypeOccRn :: RdrName -> RnM (MayGRE GREInfo) -- see Note [Demotion] lookupTypeOccRn rdr_name = do { mb_gre <- lookupOccRn_maybe rdr_name ; case mb_gre of - Just gre -> return $ greName gre + Just gre -> return $ Right $! gre Nothing -> if occName rdr_name == occName eqTyCon_RDR -- See Note [eqTyCon (~) compatibility fallback] - then eqTyConName <$ addDiagnostic TcRnTypeEqualityOutOfScope - else lookup_demoted rdr_name } + then (Left $! eqTyConName) <$ addDiagnostic TcRnTypeEqualityOutOfScope + else Left <$!> lookup_demoted rdr_name } {- Note [eqTyCon (~) compatibility fallback] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== compiler/GHC/Rename/Expr.hs ===================================== @@ -1,7 +1,6 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE MonadComprehensions #-} {-# LANGUAGE MultiWayIf #-} -{-# LANGUAGE RecordWildCards #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE ViewPatterns #-} @@ -321,7 +320,7 @@ rnExpr (HsVar _ (L l v)) -- matching GRE and add a name clash error -- (see lookupGlobalOccRn_overloaded, called by lookupExprOccRn). -> do { let sel_name = flSelector $ recFieldLabel fld_info - ; checkThLocalNameNoLift (L (l2l l) (WithUserRdr v sel_name)) + ; checkThLocalNameNoLift (L l $ WithUserRdr v $ Right $! gre) ; return (XExpr (HsRecSelRn (FieldOcc v (L l sel_name))), unitFN sel_name) } | nm == nilDataConName @@ -332,7 +331,7 @@ rnExpr (HsVar _ (L l v)) -> rnExpr (ExplicitList noAnn []) | otherwise - -> do { res_expr <- checkThLocalNameWithLift (L (l2l l) (WithUserRdr v nm)) + -> do { res_expr <- checkThLocalNameWithLift (L (l2l l) (WithUserRdr v $ Right $! gre)) ; return (res_expr, unitFN nm) } }}} ===================================== compiler/GHC/Rename/HsType.hs ===================================== @@ -606,20 +606,21 @@ rnHsTyKi env tv@(HsTyVar _ ip (L loc rdr_name)) TcRnUnexpectedKindVar rdr_name -- Any type variable at the kind level is illegal without the use -- of PolyKinds (see #14710) - ; name <- rnTyVar env rdr_name + ; mgre <- rnTyVar env rdr_name ; this_mod <- getModule ; explicit_level_imports <- xoptM LangExt.ExplicitLevelImports - ; let loc_name_with_rdr = L loc $ WithUserRdr rdr_name name + ; let loc_mgre_with_rdr = L loc $ WithUserRdr rdr_name mgre + name = mgreName mgre ; if | explicit_level_imports -- See Note [Strict level checks with ExplicitLevelImports] - -> checkThLocalNameNoLift loc_name_with_rdr + -> checkThLocalNameNoLift loc_mgre_with_rdr | nameIsLocalOrFrom this_mod name - -> checkThLocalTyName name + -> checkThLocalTyName mgre | otherwise -> pure () - ; checkPromotedDataConName env tv Prefix ip name - ; return (HsTyVar noAnn ip loc_name_with_rdr, unitFN name) } + ; checkPromotedDataConName env tv Prefix ip $ mgreName mgre + ; return (HsTyVar noAnn ip $ fmap mgreName <$> loc_mgre_with_rdr, unitFN name) } rnHsTyKi env ty@(HsOpTy _ ty1 tyop ty2) = setSrcSpan (getLocA tyop) $ @@ -826,13 +827,13 @@ throw an error accordingly. -} -------------- -rnTyVar :: RnTyKiEnv -> RdrName -> RnM Name +rnTyVar :: RnTyKiEnv -> RdrName -> RnM (MayGRE GREInfo) rnTyVar env rdr_name - = do { name <- lookupTypeOccRn rdr_name - ; checkNamedWildCard env name - ; return name } + = do { mgre <- lookupTypeOccRn rdr_name + ; checkNamedWildCard env $ mgreName mgre + ; return mgre } -rnLTyVar :: LocatedN RdrName -> RnM (LocatedN Name) +rnLTyVar :: LocatedN RdrName -> RnM (LocatedN (MayGRE GREInfo)) -- Called externally; does not deal with wildcards rnLTyVar (L loc rdr_name) = do { tyvar <- lookupTypeOccRn rdr_name @@ -843,14 +844,15 @@ rnHsTyOp :: RnTyKiEnv -> HsType GhcPs -> LHsType GhcPs -> RnM (LHsType GhcRn, FreeNames) rnHsTyOp env overall_ty tyop | L l (HsTyVar ann prom (L loc op)) <- tyop - = do { op' <- rnTyVar env op + = do { opmgre <- rnTyVar env op + ; let opName = mgreName opmgre ; unlessXOptM LangExt.TypeOperators $ - if (op' `hasKey` eqTyConKey) -- See [eqTyCon (~) compatibility fallback] in GHC.Rename.Env + if opName `hasKey` eqTyConKey -- See [eqTyCon (~) compatibility fallback] in GHC.Rename.Env then addDiagnostic TcRnTypeEqualityRequiresOperators else addErr $ TcRnIllegalTypeOperator (ppr overall_ty) op - ; checkPromotedDataConName env overall_ty Infix prom op' - ; let tyop' = L l (HsTyVar ann prom (L loc (WithUserRdr op op'))) - ; return (tyop', unitFN op') } + ; checkPromotedDataConName env overall_ty Infix prom opName + ; let tyop' = L l (HsTyVar ann prom (L loc (WithUserRdr op opName))) + ; return (tyop', unitFN opName) } | otherwise = rnLHsTyKi env tyop ===================================== compiler/GHC/Rename/Module.hs ===================================== @@ -2491,8 +2491,8 @@ rnInjectivityAnn tvBndrs (L _ (TyVarSig _ resTv)) bindLocalNames (maybeToList (hsLTyVarName resTv)) $ -- The return type variable scopes over the injectivity annotation -- e.g. type family F a = (r::*) | r -> a - do { injFrom' <- rnLTyVar injFrom - ; injTo' <- mapM rnLTyVar injTo + do { injFrom' <- fmap mgreName <$> rnLTyVar injFrom + ; injTo' <- mapM (fmap (fmap mgreName) . rnLTyVar) injTo -- Note: srcSpan is unchanged, but typechecker gets -- confused, l2l call makes it happy ; return $ L (l2l srcSpan) (InjectivityAnn x injFrom' injTo') } @@ -2533,7 +2533,7 @@ rnInjectivityAnn _ _ (L srcSpan (InjectivityAnn x injFrom injTo)) = (injDecl', _) <- askNoErrs $ do injFrom' <- rnLTyVar injFrom injTo' <- mapM rnLTyVar injTo - return $ L srcSpan (InjectivityAnn x injFrom' injTo') + return $ L srcSpan (InjectivityAnn x (fmap mgreName injFrom') (fmap (fmap mgreName) injTo')) return $ injDecl' {- ===================================== compiler/GHC/Rename/Pat.hs ===================================== @@ -1296,7 +1296,8 @@ wrapSrcSpanTPRnM fn (L loc a) = do lookupTypeOccTPRnM :: RdrName -> TPRnM Name lookupTypeOccTPRnM rdr_name = liftRnFV $ do - name <- lookupTypeOccRn rdr_name + mgre <- lookupTypeOccRn rdr_name + let name = mgreName mgre pure (name, unitFN name) rn_lty_pat :: LHsType GhcPs -> TPRnM (LHsType GhcRn) ===================================== compiler/GHC/Rename/Splice.hs ===================================== @@ -1,5 +1,4 @@ {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE MultiWayIf #-} module GHC.Rename.Splice ( rnTopSpliceDecls, @@ -40,7 +39,7 @@ import GHC.Unit.Module import GHC.Types.SrcLoc import GHC.Rename.HsType ( rnLHsType ) -import Control.Monad ( unless, when ) +import Control.Monad ( unless, when, void ) import {-# SOURCE #-} GHC.Rename.Expr ( rnLExpr ) @@ -182,11 +181,13 @@ rnUntypedBracket e br_body rn_utbracket :: HsQuote GhcPs -> RnM (HsQuote GhcRn, FreeNames) rn_utbracket (VarBr _ is_value_name rdr_name) - = do { name <- lookupOccRn (if is_value_name then WL_Term else WL_Type) (unLoc rdr_name) - ; let res_name = L (l2l (locA rdr_name)) (WithUserRdr (unLoc rdr_name) name) - ; if is_value_name then checkThLocalNameNoLift res_name else checkThLocalTyName name - ; check_namespace is_value_name name - ; return (VarBr noExtField is_value_name (noLocA name), unitFN name) } + = do { gre <- lookupOccRnGre (if is_value_name then WL_Term else WL_Type) (unLoc rdr_name) + ; let mgre = Right $! gre + ; let res_name = L (l2l (locA rdr_name)) (WithUserRdr (unLoc rdr_name) mgre) + ; let name = greName gre + ; if is_value_name then checkThLocalNameNoLift res_name else checkThLocalTyName mgre + ; check_namespace is_value_name $ greName gre + ; return (VarBr noExtField is_value_name (fmap (mgreName . unwrapUserRdr) res_name), unitFN name) } rn_utbracket (ExpBr _ e) = do { (e', fvs) <- rnLExpr e ; return (ExpBr noExtField e', fvs) } @@ -431,10 +432,11 @@ rnUntypedSplice (HsUntypedSpliceExpr _ expr) flavour rnUntypedSplice (HsQuasiQuote _ quoter quote) flavour = do { -- Rename the quoter; akin to the HsVar case of rnExpr - ; quoter' <- lookupLocatedOccRn WL_TermVariable quoter - ; let res_name = WithUserRdr (unLoc quoter) <$> quoter' + ; quoter' <- lookupLocatedOccRnGre WL_TermVariable quoter + ; let res_name = WithUserRdr (unLoc quoter) . (Right $!) <$> quoter' ; checkThLocalNameNoLift res_name - ; return (HsQuasiQuote (HsQuasiQuoteExt flavour) quoter' quote, unitFN (unLoc quoter')) } + ; let loc_name = fmap greName quoter' + ; return (HsQuasiQuote (HsQuasiQuoteExt flavour) loc_name quote, unitFN (unLoc loc_name)) } --------------------- rnTypedSplice :: HsTypedSplice GhcPs -- Typed splice expression @@ -907,14 +909,14 @@ traceSplice (SpliceInfo { spliceDescription = sd, spliceSource = mb_src = vcat [ text "--" <+> ppr loc <> colon <+> text "Splicing" <+> text sd , gen ] -checkThLocalTyName :: Name -> RnM () -checkThLocalTyName name +checkThLocalTyName :: MayGRE w -> RnM () +checkThLocalTyName mgre | isUnboundName name -- Do not report two errors for = return () -- $(not_in_scope args) | otherwise = do { traceRn "checkThLocalTyName" (ppr name) - ; mb_local_use <- getCurrentAndBindLevel name + ; mb_local_use <- getCurrentAndBindLevel mgre ; case mb_local_use of { Nothing -> return () ; -- Not a locally-bound thing Just (top_lvl, bind_lvl, use_lvl) -> @@ -932,28 +934,29 @@ checkThLocalTyName name <+> ppr use_lvl) ; dflags <- getDynFlags ; checkCrossLevelLiftingTy dflags top_lvl bind_lvl use_lvl name } } } + where name = mgreName mgre -- | Check whether we are allowed to use a Name in this context (for TH purposes) -- In the case of a level incorrect program, attempt to fix it by using -- a Lift constraint. -checkThLocalNameWithLift :: LIdOccP GhcRn -> RnM (HsExpr GhcRn) +checkThLocalNameWithLift :: LocatedN (WithUserRdr (MayGRE GREInfo)) -> RnM (HsExpr GhcRn) checkThLocalNameWithLift = checkThLocalName True -- | Check whether we are allowed to use a Name in this context (for TH purposes) -- In the case of a level incorrect program, do not attempt to fix it by using -- a Lift constraint. -checkThLocalNameNoLift :: LIdOccP GhcRn -> RnM () -checkThLocalNameNoLift name = checkThLocalName False name >> return () +checkThLocalNameNoLift :: LocatedN (WithUserRdr (MayGRE GREInfo)) -> RnM () +checkThLocalNameNoLift = void . checkThLocalName False -- | Implementation of the level checks -- See Note [Template Haskell levels] -checkThLocalName :: Bool -> LIdOccP GhcRn -> RnM (HsExpr GhcRn) -checkThLocalName allow_lifting name_var +checkThLocalName :: Bool -> LocatedN (WithUserRdr (MayGRE GREInfo)) -> RnM (HsExpr GhcRn) +checkThLocalName allow_lifting mgre -- Exact and Orig names are not imported, so presumed available at all levels. -- whenever the user uses exact names, e.g. say @'mkNameG_v' "" "Foo" "bar"@, -- even though the 'mkNameG_v' here is essentially a quotation, we do not do -- level checks as we assume that the user was trying to bypass the level checks - | isExact (userRdrName (unLoc name_var)) || isOrig (userRdrName (unLoc name_var)) + | isExact rdr || isOrig rdr = return (HsVar noExtField name_var) | isUnboundName name -- Do not report two errors for = return (HsVar noExtField name_var) -- $(not_in_scope args) @@ -961,7 +964,7 @@ checkThLocalName allow_lifting name_var = return (HsVar noExtField name_var) | otherwise = do { - mb_local_use <- getCurrentAndBindLevel name + mb_local_use <- getCurrentAndBindLevel $ unwrap mgre ; case mb_local_use of { Nothing -> return (HsVar noExtField name_var) ; -- Not a locally-bound thing Just (top_lvl, bind_lvl, use_lvl) -> @@ -969,13 +972,12 @@ checkThLocalName allow_lifting name_var ; let is_local | Just mod <- nameModule_maybe name = mod == cur_mod | otherwise = True - ; traceRn "checkThLocalName" (ppr name <+> ppr bind_lvl <+> ppr use_lvl) ; dflags <- getDynFlags - ; env <- getGlobalRdrEnv - ; let mgre = lookupGRE_Name env name - ; checkCrossLevelLifting dflags (LevelCheckSplice name mgre) top_lvl is_local allow_lifting bind_lvl use_lvl name_var } } } - where - name = getName name_var + ; checkCrossLevelLifting dflags (LevelCheckSplice $ unLoc mgre) top_lvl is_local allow_lifting bind_lvl use_lvl name_var } } } + where rdr = userRdrName $ unLoc name_var + name_var = fmap mgreName <$> mgre + name = unwrap name_var + unwrap = unwrapUserRdr . unLoc -------------------------------------- checkCrossLevelLifting :: DynFlags @@ -1013,9 +1015,12 @@ checkCrossLevelLifting dflags reason top_lvl_flg is_local allow_lifting bind_lvl , any (\bind_idx -> use_lvl_idx == incThLevelIndex bind_idx) (Set.toList bind_lvl) , allow_lifting = do - let mgre = case reason of - LevelCheckSplice _ gre -> gre - _ -> Nothing + let mgre + | LevelCheckSplice rdr <- reason + , Right gre <- unwrapUserRdr rdr + = Just $! gre + | otherwise + = Nothing (splice_name :: Name) <- newLocalBndrRn (noLocA unqualSplice) let pend_splice :: HsImplicitLiftSplice pend_splice = HsImplicitLiftSplice bind_lvl use_lvl_idx mgre name_var ===================================== compiler/GHC/Rename/Splice.hs-boot ===================================== @@ -2,7 +2,7 @@ module GHC.Rename.Splice where import GHC.Hs import GHC.Tc.Utils.Monad -import GHC.Types.Name (Name) +import GHC.Types.Name.Reader (WithUserRdr, GREInfo) import GHC.Types.Name.Set @@ -15,6 +15,6 @@ rnSpliceDecl :: SpliceDecl GhcPs -> RnM (SpliceDecl GhcRn, FreeNames) rnTopSpliceDecls :: HsUntypedSplice GhcPs -> RnM ([LHsDecl GhcPs], FreeNames) -checkThLocalTyName :: Name -> RnM () +checkThLocalTyName :: MayGRE w -> RnM () -checkThLocalNameNoLift :: LIdOccP GhcRn -> RnM () +checkThLocalNameNoLift :: LocatedN (WithUserRdr (MayGRE GREInfo)) -> RnM () ===================================== compiler/GHC/Tc/Errors.hs ===================================== @@ -1188,8 +1188,13 @@ mkImplicitLiftingReporter ctxt mkImplicitLiftingError :: ErrorItem -> TcRnMessage mkImplicitLiftingError item = case errorItemOrigin item of - ImplicitLiftOrigin (HsImplicitLiftSplice bound used gre name) -> - TcRnBadlyLevelled (LevelCheckSplice (getName name) gre) bound used (Just item) (cec_defer_type_errors ctxt) + ImplicitLiftOrigin (HsImplicitLiftSplice bound used mgre loc_name) -> + TcRnBadlyLevelled + (LevelCheckSplice $ maybe (Left $! getName loc_name) (Right $!) mgre <$ unLoc loc_name) + bound + used + (Just item) + (cec_defer_type_errors ctxt) _ -> pprPanic "mkImplicitLiftingError" (ppr item) mkGivenErrorReporter :: Reporter ===================================== compiler/GHC/Tc/Errors/Ppr.hs ===================================== @@ -3465,12 +3465,16 @@ pprTcRnBadlyLevelled reason bind_lvls use_lvl lift_attempt = mkDecorated $ (text "No instance for:" <+> quotes (ppr (errorItemPred item))) | Just item <- [lift_attempt] ] ++ - [ vcat (text "Available from the imports:" : ppr_imports (gre_imp gre)) - | LevelCheckSplice _ (Just gre) <- [reason] + [ ppr_imports (gre_imp gre) + | LevelCheckSplice (unwrapUserRdr -> Right gre) <- [reason] , not (isEmptyBag (gre_imp gre)) ] where - ppr_imports :: Bag ImportSpec -> [SDoc] - ppr_imports = map ((bullet <+>) . ppr ) . bagToList + ppr_imports :: Bag ImportSpec -> SDoc + ppr_imports bag + | [imp] <- impspecs = pprImpSpec imp + | otherwise = vcat $ text "Available from the imports:" : map ((bullet <+>) . pprImpSpec) impspecs + where impspecs = bagToList bag + pprImpSpec imp = ppr imp note :: SDoc -> SDoc note note = "Note" <> colon <+> note <> dot @@ -6250,8 +6254,8 @@ pprLevelCheckReason :: LevelCheckReason -> SDoc pprLevelCheckReason = \case LevelCheckInstance _ t -> text "instance for" <+> quotes (ppr t) - LevelCheckSplice t _ -> - quotes (ppr t) + LevelCheckSplice t -> + quotes $ ppr $ userRdrName t pprUninferrableTyVarCtx :: UninferrableTyVarCtx -> SDoc pprUninferrableTyVarCtx = \case ===================================== compiler/GHC/Tc/Errors/Types.hs ===================================== @@ -6338,7 +6338,7 @@ data WrongThingSort data LevelCheckReason = LevelCheckInstance !InstanceWhat !PredType - | LevelCheckSplice !Name !(Maybe GlobalRdrElt) + | LevelCheckSplice !(WithUserRdr (Either Name GlobalRdrElt)) data UninferrableTyVarCtx = UninfTyCtx_ClassContext [TcType] ===================================== compiler/GHC/Tc/Gen/Export.hs ===================================== @@ -540,7 +540,7 @@ exports_from_avail (Just (L _ rdr_items)) rdr_env imports this_mod let avail = availFromGRE gre name = greName gre - checkThLocalNameNoLift (ieLWrappedUserRdrName l name) + checkThLocalNameNoLift $ ieLWrappedUserRdrName l $ Right $! gre occs' <- check_occs occs ie [gre] (export_warn_spans', dont_warn_export', warn_txt_rn) <- process_warning export_warn_spans @@ -589,7 +589,7 @@ exports_from_avail (Just (L _ rdr_items)) rdr_env imports this_mod occs' <- check_occs occs ie [gre] return (Just avail, occs', exp_dflts) - checkThLocalNameNoLift (ieLWrappedUserRdrName l name) + checkThLocalNameNoLift (ieLWrappedUserRdrName l $ Right $! gre) (export_warn_spans', dont_warn_export', warn_txt_rn) <- process_warning export_warn_spans dont_warn_export @@ -617,7 +617,7 @@ exports_from_avail (Just (L _ rdr_items)) rdr_env imports this_mod all_gres = par : all_kids all_names = map greName all_gres - checkThLocalNameNoLift (ieLWrappedUserRdrName l name) + checkThLocalNameNoLift (ieLWrappedUserRdrName l $ Right $! par) occs' <- check_occs occs ie all_gres (export_warn_spans', dont_warn_export', warn_txt_rn) <- process_warning export_warn_spans @@ -656,7 +656,7 @@ exports_from_avail (Just (L _ rdr_items)) rdr_env imports this_mod all_gres = par : all_kids all_names = map greName all_gres - checkThLocalNameNoLift (ieLWrappedUserRdrName l name) + checkThLocalNameNoLift (ieLWrappedUserRdrName l $ Right $! par) occs' <- check_occs occs ie all_gres (export_warn_spans', dont_warn_export', warn_txt_rn) <- process_warning export_warn_spans @@ -794,8 +794,8 @@ exports_from_avail (Just (L _ rdr_items)) rdr_env imports this_mod = addUsedGREs ExportDeprecationWarnings (pickGREs parent_rdr kid_gres) -ieLWrappedUserRdrName :: LIEWrappedName GhcPs -> Name -> LIdOccP GhcRn -ieLWrappedUserRdrName l n = fmap (\rdr -> WithUserRdr rdr n) $ ieLWrappedName l +ieLWrappedUserRdrName :: LIEWrappedName GhcPs -> n -> GenLocated SrcSpanAnnN (WithUserRdr n) +ieLWrappedUserRdrName l n = (\rdr -> WithUserRdr rdr n) <$> ieLWrappedName l -- | In what namespaces should we go looking for an import/export item -- that is out of scope, for suggestions in error messages? @@ -901,7 +901,7 @@ lookupChildrenExport parent_gre child_gres rdr_items = mapAndReportM doOne rdr_i ; return (replaceLWrappedName n ub, gre)} FoundChild child@(GRE { gre_name = child_nm, gre_par = par }) -> do { checkPatSynParent spec_parent par child_nm - ; checkThLocalNameNoLift (ieLWrappedUserRdrName n child_nm) + ; checkThLocalNameNoLift (ieLWrappedUserRdrName n $ Right $! child) ; return (replaceLWrappedName n child_nm, child) } IncorrectParent p c gs -> failWithDcErr (parentGRE_name p) (greName c) gs ===================================== compiler/GHC/Tc/Utils/Env.hs ===================================== @@ -252,15 +252,12 @@ tcLookupGlobal name env <- getGblEnv ; case lookupNameEnv (tcg_type_env env) name of { Just thing -> return thing ; - Nothing -> - -- Should it have been in the local envt? -- (NB: use semantic mod here, since names never use -- identity module, see Note [Identity versus semantic module].) - if nameIsLocalOrFrom (tcg_semantic_mod env) name - then notFound name -- Internal names can happen in GHCi - else - + Nothing | nameIsLocalOrFrom (tcg_semantic_mod env) name -> + notFound (Left name) -- Internal names can happen in GHCi + | otherwise -> -- Try home package table and external package table do { mb_thing <- tcLookupImported_maybe name ; case mb_thing of @@ -1221,10 +1218,10 @@ pprBinders :: [Name] -> SDoc pprBinders [bndr] = quotes (ppr bndr) pprBinders bndrs = pprWithCommas ppr bndrs -notFound :: Name -> TcM TyThing -notFound name +notFound :: MayGRE GREInfo -> TcM TyThing +notFound mgre = do { lcl_env <- getLclEnv - ; lvls <- getCurrentAndBindLevel name + ; lvls <- getCurrentAndBindLevel mgre ; if -- See Note [Out of scope might be a staging error] | isUnboundName name -> failM -- If the name really isn't in scope -- don't report it again (#11941) @@ -1235,7 +1232,13 @@ notFound name -- function, we check this completely independently -- before scrutinizing lvls | Just (_top_lvl_flag, bind_lvls, lvl@Splice {}) <- lvls - -> failWithTc (TcRnBadlyLevelled (LevelCheckSplice name Nothing) bind_lvls (thLevelIndex lvl) Nothing ErrorWithoutFlag) + , let name = mgreName mgre -> failWithTc $ + TcRnBadlyLevelled + (LevelCheckSplice (mgre <$ noUserRdr name)) + bind_lvls + (thLevelIndex lvl) + Nothing + ErrorWithoutFlag | otherwise -> pure () ; if isTermVarOrFieldNameSpace (nameNameSpace name) @@ -1260,6 +1263,7 @@ notFound name -- so let's just not print it! Getting a loop here is -- very unhelpful, because it hides one compiler bug with another } + where name = mgreName mgre wrongThingErr :: WrongThingSort -> TcTyThing -> Name -> TcM a wrongThingErr expected thing name = ===================================== compiler/GHC/Tc/Utils/Monad.hs ===================================== @@ -127,7 +127,7 @@ module GHC.Tc.Utils.Monad( -- * Template Haskell context recordThUse, recordThNeededRuntimeDeps, keepAlive, getThLevel, getCurrentAndBindLevel, setThLevel, - addModFinalizersWithLclEnv, + addModFinalizersWithLclEnv, MayGRE, mgreName, mgreGRE, -- * Safe Haskell context recordUnsafeInfer, finalSafeMode, fixSafeInstances, @@ -2468,32 +2468,40 @@ keepAlive name getThLevel :: TcM ThLevel getThLevel = do { env <- getLclEnv; return (getLclEnvThLevel env) } -getCurrentAndBindLevel :: Name -> TcRn (Maybe (TopLevelFlag, Set.Set ThLevelIndex, ThLevel)) -getCurrentAndBindLevel name +getCurrentAndBindLevel :: MayGRE w -> TcRn (Maybe (TopLevelFlag, Set.Set ThLevelIndex, ThLevel)) +getCurrentAndBindLevel mgre = do { env <- getLclEnv; - ; case lookupNameEnv (getLclEnvThBndrs env) name of + ; case lookupNameEnv (getLclEnvThBndrs env) $ mgreName mgre of Nothing -> do - lvls <- getExternalBindLvl name - if Set.empty == lvls - -- This case happens when code is generated for identifiers which are not - -- in scope. - -- - -- TODO: What happens if someone generates [|| GHC.Magic.dataToTag# ||] - then do - return Nothing - else return (Just (TopLevel, lvls, getLclEnvThLevel env)) + lvls <- getExternalBindLvl mgre + let res + | Set.null lvls = Nothing + -- This case happens when code is generated for identifiers which are not + -- in scope. + -- + -- TODO: What happens if someone generates [|| GHC.Magic.dataToTag# ||] + + | otherwise = Just (TopLevel, lvls, getLclEnvThLevel env) + return res Just (top_lvl, bind_lvl) -> return (Just (top_lvl, Set.singleton bind_lvl, getLclEnvThLevel env)) } -getExternalBindLvl :: Name -> TcRn (Set.Set ThLevelIndex) -getExternalBindLvl name = do - env <- getGlobalRdrEnv +getExternalBindLvl :: MayGRE w -> TcRn (Set.Set ThLevelIndex) +getExternalBindLvl mgre = do mod <- getModule - case lookupGRE_Name env name of - Just gre -> return $ (Set.map thLevelIndexFromImportLevel (greLevels gre)) - Nothing -> - if nameIsLocalOrFrom mod name - then return $ Set.singleton topLevelIndex - else return Set.empty + return $ case mgre of + Right gre -> Set.map thLevelIndexFromImportLevel (greLevels gre) + Left name + | nameIsLocalOrFrom mod name -> Set.singleton topLevelIndex + | otherwise -> Set.empty + +-- | @'GlobalRdrEltX' w@ if we have on, 'Name' otherwise +type MayGRE w = Either Name (GlobalRdrEltX w) + +mgreName :: MayGRE w -> Name +mgreName = either id greName + +mgreGRE :: MayGRE w -> Maybe (GlobalRdrEltX w) +mgreGRE = either (const Nothing) Just setThLevel :: ThLevel -> TcM a -> TcRn a setThLevel l = updLclEnv (setLclEnvThLevel l) ===================================== compiler/GHC/Types/Name/Reader.hs ===================================== @@ -40,7 +40,7 @@ module GHC.Types.Name.Reader ( isOrig, isOrig_maybe, isExact, isExact_maybe, isSrcRdrName, -- ** Preserving user-written qualification - WithUserRdr(..), noUserRdr, unLocWithUserRdr, userRdrName, + WithUserRdr(..), noUserRdr, unLocWithUserRdr, userRdrName, unwrapUserRdr, -- * Local mapping of 'RdrName' to 'Name.Name' LocalRdrEnv, emptyLocalRdrEnv, extendLocalRdrEnv, extendLocalRdrEnvList, @@ -2247,9 +2247,12 @@ unLocWithUserRdr (L _ (WithUserRdr _ a)) = a noUserRdr :: Name -> WithUserRdr Name noUserRdr n = WithUserRdr (nameRdrName n) n -userRdrName :: WithUserRdr Name -> RdrName +userRdrName :: WithUserRdr a -> RdrName userRdrName (WithUserRdr rdr _) = rdr +unwrapUserRdr :: WithUserRdr a -> a +unwrapUserRdr (WithUserRdr _ a) = a + rdrQual_maybe :: RdrName -> Maybe ModuleName rdrQual_maybe = \case Qual q _ -> Just q ===================================== testsuite/tests/splice-imports/SI03.stderr ===================================== @@ -1,6 +1,5 @@ SI03.hs:10:11: error: [GHC-28914] • Level error: ‘sid’ is bound at level 0 but used at level -1 - • Available from the imports: - • imported from ‘SI01A’ at SI03.hs:5:1-12 + • imported from ‘SI01A’ at SI03.hs:5:1-12 • In the untyped splice: $(sid [| pure () |]) ===================================== testsuite/tests/splice-imports/SI05.stderr ===================================== @@ -1,7 +1,6 @@ SI05.hs:10:11: error: [GHC-28914] - • Level error: ‘SI01A.sid’ is bound at level 0 but used at level -1 - • Available from the imports: - • imported from ‘SI01A’ at SI05.hs:6:1-12 + • Level error: ‘sid’ is bound at level 0 but used at level -1 + • imported from ‘SI01A’ at SI05.hs:6:1-12 • In the untyped splice: $(sid [| pure () |]) SI05.hs:10:11: error: [GHC-87543] ===================================== testsuite/tests/splice-imports/SI25.stderr ===================================== @@ -1,8 +1,7 @@ SI25.hs:16:13: error: [GHC-28914] • Level error: ‘nestedCode’ is bound at level -1 but used at level -2 - • Available from the imports: - • imported from ‘SI25Helper’ at -1 at SI25.hs:6:1-24 + • imported from ‘SI25Helper’ at -1 at SI25.hs:6:1-24 • In the untyped splice: $(nestedCode "nested") In the untyped splice: $($(nestedCode "nested")) ===================================== testsuite/tests/splice-imports/SI28.stderr ===================================== @@ -1,7 +1,6 @@ SI28.hs:8:13: error: [GHC-28914] • Level error: ‘id’ is bound at level 1 but used at level 0 - • Available from the imports: - • imported from ‘Prelude’ at 1 at SI28.hs:6:1-20 + • imported from ‘Prelude’ at 1 at SI28.hs:6:1-20 • In the Template Haskell quotation: [| id |] In the untyped splice: $([| id |]) ===================================== testsuite/tests/splice-imports/SI31.stderr ===================================== @@ -1,6 +1,5 @@ <interactive>:2:3: error: [GHC-28914] • Level error: ‘id’ is bound at level 0 but used at level -1 - • Available from the imports: - • imported from ‘Prelude’ + • imported from ‘Prelude’ • In the untyped splice: $(id [| () |]) ===================================== testsuite/tests/splice-imports/T26088.stderr ===================================== @@ -1,6 +1,5 @@ T26088A.hs:8:8: error: [GHC-28914] • Level error: ‘a’ is bound at level -1 but used at level 1 - • Available from the imports: - • imported from ‘T26088B’ at -1 at T26088A.hs:4:1-21 + • imported from ‘T26088B’ at -1 at T26088A.hs:4:1-21 • In the Template Haskell quotation: [| a |] ===================================== testsuite/tests/splice-imports/T26090.stderr ===================================== @@ -1,16 +1,13 @@ T26090.hs:2:17: error: [GHC-28914] • Level error: ‘a’ is bound at level 1 but used at level 0 - • Available from the imports: - • imported from ‘T26090A’ at 1 at T26090.hs:8:1-20 + • imported from ‘T26090A’ at 1 at T26090.hs:8:1-20 T26090.hs:4:17: error: [GHC-28914] • Level error: ‘s’ is bound at level 1 but used at level 0 - • Available from the imports: - • imported from ‘T26090A’ at 1 at T26090.hs:8:1-20 + • imported from ‘T26090A’ at 1 at T26090.hs:8:1-20 • In the export: S(s) T26090.hs:5:17: error: [GHC-28914] • Level error: ‘R’ is bound at level 1 but used at level 0 - • Available from the imports: - • imported from ‘T26090A’ at 1 at T26090.hs:8:1-20 + • imported from ‘T26090A’ at 1 at T26090.hs:8:1-20 ===================================== testsuite/tests/splice-imports/T26616.hs ===================================== @@ -0,0 +1,8 @@ +{-# LANGUAGE ExplicitLevelImports, NoImplicitPrelude #-} +module T26616 where + +import quote Data.Maybe qualified as Q +import Data.Maybe qualified as Z +import splice Data.Maybe qualified as S + +foo = Q.isJust ===================================== testsuite/tests/splice-imports/T26616.stderr ===================================== @@ -0,0 +1,4 @@ +T26616.hs:8:7: error: [GHC-28914] + • Level error: ‘Q.isJust’ is bound at level 1 but used at level 0 + • imported qualified from ‘Data.Maybe’ at 1 at T26616.hs:4:1-39 + ===================================== testsuite/tests/splice-imports/all.T ===================================== @@ -52,3 +52,4 @@ test('T26090', [], multimod_compile_fail, ['T26090', '-v0']) test('ModuleExport', [], multimod_compile_fail, ['ModuleExport', '-v0']) test('LevelImportExports', [], makefile_test, []) test('DodgyLevelExport', [], multimod_compile, ['DodgyLevelExport', '-v0 -Wdodgy-exports']) +test('T26616', normal, compile_fail, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7ffe1f5bce25424bd0e5c096768320f… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7ffe1f5bce25424bd0e5c096768320f… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/mangoiv/26616
by Magnus (＠MangoIV) 15 Jun '26

15 Jun '26

Magnus pushed new branch wip/mangoiv/26616 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/mangoiv/26616 You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/spj-reinstallable-base2] 13 commits: accept bkpfail17 test output
by Rodrigo Mesquita (＠alt-romes) 15 Jun '26

15 Jun '26

Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: bb98d22d by Rodrigo Mesquita at 2026-06-12T17:43:45+01:00 accept bkpfail17 test output - - - - - d30c25a4 by Rodrigo Mesquita at 2026-06-12T17:45:38+01:00 -package base for GhciPackageRename and T12485 - - - - - 32b157a6 by Rodrigo Mesquita at 2026-06-15T11:28:16+01:00 GHC.Essentials should be hidden in haddock this fixes haddockHtml test which was picking up names from GHC.Essentials instead of picking them up from the re-exporting modules. not-home could also have worked, but we want to hide it anway - - - - - 1818c30f by Rodrigo Mesquita at 2026-06-15T12:16:58+01:00 drop traceIf which was not very useful by default and which tripped up a test which grepped for occurrences of Integer in search of a bug. I tried to tighten the grep but didn't work, and the trace seemed to be off in that the interface hadn't been loaded at that point - - - - - 86d5a5da by Rodrigo Mesquita at 2026-06-15T14:15:10+01:00 runRW# is also known-key - - - - - d3b59b49 by Rodrigo Mesquita at 2026-06-15T14:29:40+01:00 failIfM show callstack only on debug to keep previous behavior - - - - - 6d6b6deb by Rodrigo Mesquita at 2026-06-15T14:49:30+01:00 output has 1 less unfolding bc it no longer has trModule binding - - - - - 428ecc8a by Rodrigo Mesquita at 2026-06-15T15:00:26+01:00 no callStackDoc fixes test even with validate - - - - - abe9686a by Rodrigo Mesquita at 2026-06-15T17:05:17+01:00 Fix unused imports warning for unused wildcard imports - - - - - 165e18f8 by Rodrigo Mesquita at 2026-06-15T17:28:28+01:00 Less work in rule2 bc we no longer produce unless there are exported datatypes - - - - - bc3bebf3 by Rodrigo Mesquita at 2026-06-15T18:01:21+01:00 Fix T3007 by making it not use any known-name and not depend on GHC.Essentials - - - - - a705c89e by Rodrigo Mesquita at 2026-06-15T18:01:59+01:00 Fix T3103 by importing known-names from ghc-internal - - - - - a715d7d3 by Rodrigo Mesquita at 2026-06-15T18:03:55+01:00 Missing SPEC known-key name re-fixes T14003 - - - - - 16 changed files: - compiler/GHC/Builtin/KnownKeys.hs - compiler/GHC/Iface/Load.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Tc/Utils/Monad.hs - libraries/base/src/GHC/Essentials.hs - testsuite/tests/backpack/should_fail/bkpfail17.stderr - testsuite/tests/cabal/T12485/Makefile - testsuite/tests/deSugar/should_compile/T13208.stdout - testsuite/tests/driver/T3007/A/Internal.hs - testsuite/tests/driver/T3007/Makefile - testsuite/tests/ghci/scripts/all.T - testsuite/tests/rename/should_compile/T3103/Foreign/Ptr.hs - testsuite/tests/rename/should_compile/T3103/GHC/Base.lhs - testsuite/tests/rename/should_compile/T3103/GHC/Word.hs - testsuite/tests/rename/should_compile/T3103/test.T - testsuite/tests/simplCore/should_compile/rule2.stderr Changes: ===================================== compiler/GHC/Builtin/KnownKeys.hs ===================================== @@ -258,6 +258,9 @@ knownKeyTable , (mkTcOcc "JSVal", jsvalTyConKey) #endif + -- SpecConstr's SPEC type + , (mkTcOcc "SPEC", specTyConKey) + -- Type rep , (mkTcOcc "TyCon", trTyConTyConKey) @@ -269,6 +272,7 @@ knownKeyTable , (mkVarOcc "cstringLength#", cstringLengthIdKey) , (mkVarOcc "eqString", eqStringIdKey) , (mkVarOcc "inline", inlineIdKey) + , (mkVarOcc "runRW#", runRWKey) , (mkVarOcc "seq#", seqHashKey) , (mkVarOcc "divInt#", divIntIdKey) , (mkVarOcc "modInt#", modIntIdKey) ===================================== compiler/GHC/Iface/Load.hs ===================================== @@ -839,8 +839,6 @@ loadInterface doc_str mod from -- Crucial assertion that checks if you are trying to load a HPT module into the EPS. -- If you start loading HPT modules into the EPS then you get strange errors about -- overlapping instances. - ; traceIf (hang (text "Loaded new interface" <+> ppr mod) - 2 (ppr (mi_exports iface))) ; massertPpr ((isOneShot (ghcMode (hsc_dflags hsc_env))) || moduleUnitId mod `notElem` hsc_all_home_unit_ids hsc_env ===================================== compiler/GHC/Rename/Names.hs ===================================== @@ -2204,7 +2204,7 @@ warnUnusedImport rdr_env (L loc decl, used, unused, unused_wcs) -- Do not warn for 'import M()' -- See (UI1) in Note [Unused imports] | Just (Exactly, _) <- ideclImportList decl - , null unused + , null unused && null unused_wcs = return () -- Note [Do not warn about Prelude hiding] @@ -2398,8 +2398,8 @@ check this by looking at the names that it brings into scope scope; if there are no ununused names, don't report. (UI1) We don't want to complain about `import M()`, because that is often used to bring - M's /instances/ into scope. That is neatly dealt with by the "no unused names" - criterion. + M's /instances/ into scope. That is neatly dealt with by the "no unused + names" (nor unused wildcard imports) criterion. (UI2) We don't report a decl as unused if it has an `as Rebindable` qualifier. See (KN1) in Note [Overview of known entities] in GHC.Builtin ===================================== compiler/GHC/Tc/Utils/Monad.hs ===================================== @@ -1,4 +1,4 @@ -{-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE RecordWildCards #-} {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -2464,7 +2464,7 @@ failIfM msg = do env <- getLclEnv let full_msg = (if_loc env <> colon) $$ nest 2 msg logger <- getLogger - liftIO $ fatalErrorMsg logger (full_msg $$ callStackDoc) + liftIO $ fatalErrorMsg logger full_msg failM -------------------- ===================================== libraries/base/src/GHC/Essentials.hs ===================================== @@ -1,4 +1,5 @@ {-# LANGUAGE MagicHash, Trustworthy, RankNTypes, CPP #-} +{-# OPTIONS_HADDOCK hide #-} -- | -- @@ -80,6 +81,9 @@ module GHC.Essentials , Void , NonEmpty + -- SpecConstr + , SPEC(..) + -- FFI , Ptr, FunPtr , ConstPtr @@ -164,7 +168,7 @@ module GHC.Essentials -- Names that have BuiltinRules , CS.unpackFoldrCString#, CS.unpackFoldrCStringUtf8#, CS.unpackAppendCString# , CS.unpackAppendCStringUtf8#, CS.cstringLength# - , eqString, inline + , eqString, inline, runRW# , UnsafeEquality( UnsafeRefl ), unsafeEqualityProof, unsafeCoerce# ===================================== testsuite/tests/backpack/should_fail/bkpfail17.stderr ===================================== @@ -2,10 +2,10 @@ [1 of 1] Compiling ShouldFail[sig] [2 of 2] Processing q Instantiating q - [1 of 1] Including p[ShouldFail=base-4.20.0.0:Prelude] - Instantiating p[ShouldFail=base-4.20.0.0:Prelude] + [1 of 1] Including p[ShouldFail=base-4.23.0.0:Prelude] + Instantiating p[ShouldFail=base-4.23.0.0:Prelude] [1 of 1] Compiling ShouldFail[sig] -<no location info>: error: [GHC-15843] +bkpfail17.bkp:5:9: error: [GHC-15843] • Type constructor ‘Either’ has conflicting definitions in the module and its hsig file. Main module: type Either :: * -> * -> * ===================================== testsuite/tests/cabal/T12485/Makefile ===================================== @@ -2,6 +2,8 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk +# -package base (GHC.Essentials) is needed to make available +# the module from which GHC looks up known-key names T12485 : @rm -rf a.db b.db '$(GHC_PKG)' init a.db @@ -9,6 +11,6 @@ T12485 : '$(GHC_PKG)' init b.db '$(GHC_PKG)' -f a.db/ -f b.db/ register b.pkg # register b.pkg in b.db # -package-db in dependency order - '$(TEST_HC)' $(TEST_HC_OPTS) -XNoImplicitPrelude -fforce-recomp -hide-all-packages -no-user-package-db -package-db a.db -package-db b.db -package-id a-1-XXX -package-id b-1-XXX Main.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -XNoImplicitPrelude -fforce-recomp -hide-all-packages -package 'base (GHC.Essentials)' -no-user-package-db -package-db a.db -package-db b.db -package-id a-1-XXX -package-id b-1-XXX Main.hs # -package-db in reverse dependency order - '$(TEST_HC)' $(TEST_HC_OPTS) -XNoImplicitPrelude -fforce-recomp -hide-all-packages -no-user-package-db -package-db b.db -package-db a.db -package-id a-1-XXX -package-id b-1-XXX Main.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -XNoImplicitPrelude -fforce-recomp -hide-all-packages -package 'base (GHC.Essentials)' -no-user-package-db -package-db b.db -package-db a.db -package-id a-1-XXX -package-id b-1-XXX Main.hs ===================================== testsuite/tests/deSugar/should_compile/T13208.stdout ===================================== @@ -2,5 +2,3 @@ Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=True)}] f = \ (@p) _ [Occ=Dead] -> GHC.Internal.Types.True - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, ===================================== testsuite/tests/driver/T3007/A/Internal.hs ===================================== @@ -1,3 +1,4 @@ +{-# OPTIONS_GHC -dno-typeable-binds #-} -- don't generate $trModule bindings, which require some known-keys module Internal ( A (A) ===================================== testsuite/tests/driver/T3007/Makefile ===================================== @@ -9,15 +9,16 @@ clean: rm -rf package.conf # --no-user-package-db to avoid warning about missing settings file +# -frebindable-known-names to disable the dependency on GHC.Essentials; the package itself uses no known-keys. T3007: $(MAKE) -s --no-print-directory clean '$(GHC_PKG)' init package.conf cd A && '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup - cd A && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --with-hc-pkg='$(GHC_PKG)' --ghc-pkg-option=--global-package-db=../package.conf --ghc-pkg-option=--no-user-package-db --ghc-option=-package-db../package.conf + cd A && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --with-hc-pkg='$(GHC_PKG)' --ghc-pkg-option=--global-package-db=../package.conf --ghc-pkg-option=--no-user-package-db --ghc-option=-package-db../package.conf --ghc-option=-frebindable-known-names cd A && ./Setup build -v0 cd A && ./Setup register --inplace -v0 cd B && '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup - cd B && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --with-hc-pkg='$(GHC_PKG)' --ghc-pkg-option=--global-package-db=../package.conf --ghc-pkg-option=--no-user-package-db --ghc-option=-package-db../package.conf + cd B && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --with-hc-pkg='$(GHC_PKG)' --ghc-pkg-option=--global-package-db=../package.conf --ghc-pkg-option=--no-user-package-db --ghc-option=-package-db../package.conf --ghc-option=-frebindable-known-names cd B && ./Setup build -v0 ===================================== testsuite/tests/ghci/scripts/all.T ===================================== @@ -387,8 +387,9 @@ test('T24459', normal, ghci_script, ['T24459.script']) test('T24632', normal, ghci_script, ['T24632.script']) # Test package renaming in GHCi session +# (GHC.Essentials from base is needed for known-names) test('GhciPackageRename', - [extra_hc_opts("-hide-all-packages -package 'containers (Data.Map as Prelude)'")], + [extra_hc_opts("-hide-all-packages -package 'base (GHC.Essentials)' -package 'containers (Data.Map as Prelude)'")], ghci_script, ['GhciPackageRename.script']) test('T26233', normal, ghci_script, ['T26233.script']) ===================================== testsuite/tests/rename/should_compile/T3103/Foreign/Ptr.hs ===================================== @@ -5,6 +5,7 @@ module Foreign.Ptr () where import GHC.Show (Show(..)) import GHC.Word (Word) import GHC.Base (Num) +import qualified GHC.Internal.Base as Rebindable newtype WordPtr = WordPtr Word deriving Num ===================================== testsuite/tests/rename/should_compile/T3103/GHC/Base.lhs ===================================== @@ -10,6 +10,7 @@ module GHC.Base import GHC.Classes import GHC.Prim +import qualified GHC.Internal.Base as Rebindable class Num a where signum :: a -> a ===================================== testsuite/tests/rename/should_compile/T3103/GHC/Word.hs ===================================== @@ -7,6 +7,8 @@ module GHC.Word ( import GHC.Base import GHC.Types import GHC.Num () +import qualified GHC.Internal.Num as Rebindable +import qualified GHC.Internal.Base as Rebindable import {-# SOURCE #-} GHC.Unicode () ===================================== testsuite/tests/rename/should_compile/T3103/test.T ===================================== @@ -2,4 +2,4 @@ test('T3103', [extra_files(['Foreign/', 'GHC/'])], multimod_compile, ['Foreign.Ptr', - '-v0 -hide-all-packages -package ghc-prim -package ghc-bignum -this-unit-id base']) + '-v0 -hide-all-packages -package ghc-internal -package ghc-prim -package ghc-bignum -this-unit-id base -frebindable-known-names']) ===================================== testsuite/tests/simplCore/should_compile/rule2.stderr ===================================== @@ -10,14 +10,13 @@ ==================== Grand total simplifier statistics ==================== -Total ticks: 11 +Total ticks: 10 1 PreInlineUnconditionally 1 f 2 UnfoldingDone 1 GHC.Internal.Base.id 1 Roman.bar 1 RuleFired 1 foo/bar -1 LetFloatFromLet 1 6 BetaReduction 1 f 1 a View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6c4f54f938f1d405de0079980bffda… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6c4f54f938f1d405de0079980bffda… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/andreask/deduplicate-hsc-tidy
by Andreas Klebinger (＠AndreasK) 15 Jun '26

15 Jun '26

Andreas Klebinger pushed new branch wip/andreask/deduplicate-hsc-tidy at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/andreask/deduplicate-hsc-tidy You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/hadrian-cfg-check] hadrian: Emit useful error if system.config is not found.
by Andreas Klebinger (＠AndreasK) 15 Jun '26

15 Jun '26

Andreas Klebinger pushed to branch wip/andreask/hadrian-cfg-check at Glasgow Haskell Compiler / GHC Commits: 7ef1c18f by Andreas Klebinger at 2026-06-15T17:48:02+02:00 hadrian: Emit useful error if system.config is not found. Fixes #27384 - - - - - 1 changed file: - hadrian/src/Rules.hs Changes: ===================================== hadrian/src/Rules.hs ===================================== @@ -118,8 +118,15 @@ packageRules = do Rules.SimpleTargets.simplePackageTargets Rules.SimpleTargets.completionRule +configCheckRule :: Rules () +configCheckRule = do + "hadrian/cfg/system.config" %> \cfg -> do + putFailure (cfg <> " not found.\nPerhaps you forgot to run:\n\t./boot\n\t./configure" ) + fail (cfg <> " not found.") + buildRules :: Rules () buildRules = do + configCheckRule Rules.BinaryDist.bindistRules Rules.Generate.copyRules Rules.Generate.generateRules View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7ef1c18ffb6e53582c3bd0dc7028ff5… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7ef1c18ffb6e53582c3bd0dc7028ff5… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/andreask/hadrian-cfg-check
by Andreas Klebinger (＠AndreasK) 15 Jun '26

15 Jun '26

Andreas Klebinger pushed new branch wip/andreask/hadrian-cfg-check at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/andreask/hadrian-cfg-check You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/dcoutts/windows-dlls] 2 commits: Hadrian: create a ghc-internal .def file per ghc-internal dll
by David Eichmann (＠DavidEichmann) 15 Jun '26

15 Jun '26

David Eichmann pushed to branch wip/dcoutts/windows-dlls at Glasgow Haskell Compiler / GHC Commits: 4456f207 by David Eichmann at 2026-06-15T16:18:24+01:00 Hadrian: create a ghc-internal .def file per ghc-internal dll The .def file generated from rts/win32/libHSghc-internal.def.in contains the name of the ghc-internal dll. The correct dll name differs based on if the dll is inplace/final and if using the Dynamic way. Previously, this was not accounted for and inconsistent dlls names where used. That led to failure when loading dlls at runtime in experiments with windows dynamic linking. - - - - - 96c59586 by David Eichmann at 2026-06-15T16:18:45+01:00 Hadrian: fix ghc-internal .def file name - - - - - 4 changed files: - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Library.hs - hadrian/src/Rules/Rts.hs - rts/win32/libHSghc-internal.def.in Changes: ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -377,7 +377,6 @@ templateRules = do , interpolateSetting "ProjectPatchLevel1" ProjectPatchLevel1 , interpolateSetting "ProjectPatchLevel2" ProjectPatchLevel2 ] - templateRule "rts/win32/libHSghc-internal.def" projectVersion templateRule "docs/index.html" $ packageUnitIds Stage1 templateRule "docs/users_guide/ghc_config.py" $ mconcat [ projectVersion ===================================== hadrian/src/Rules/Library.hs ===================================== @@ -9,6 +9,7 @@ import GHC.Toolchain.Target (Target(tgtArchOs)) import Base import Context +import qualified Data.List as List import Expression hiding (way, package, stage) import Oracles.ModuleFiles import Packages @@ -20,6 +21,7 @@ import Utilities import Data.Time.Clock import Rules.Generate (generatedDependencies) import Oracles.Flag +import Way.Type (wayToUnits) -- * Library 'Rules' @@ -203,13 +205,32 @@ extraObjects context | package context == rts = do target <- interpretInContext context getStagedTarget - builddir <- buildPath context - return [ builddir -/- "libHSghc-internal.dll.a" - | archOS_OS (tgtArchOs target) == OSMinGW32 - , Dynamic `wayUnit` way context ] + if not (archOS_OS (tgtArchOs target) == OSMinGW32 + && Dynamic `wayUnit` way context) + then return [] + else do + -- Find the ghc-internal library file name. Note that the + -- ghc-internal's .dll.a file is placed in the RTS build dir and not + -- the ghc-internal build dir as we only use it when building the + -- RTS and not other libraries. + ghcInternalDllName <- takeFileName <$> pkgLibraryFile Context { + stage = stage context, + way = rtsWayToLibraryWay (way context), + iplace = iplace context, + package = ghcInternal + } + + builddir <- buildPath context + return [ builddir -/- ghcInternalDllName <> ".a"] | otherwise = return [] +-- | The rts is compiled in many different ways, but libraries are only built in +-- (non)Dynamic and (non)Profiled ways. This function converts the rts way into +-- compatible library way. +rtsWayToLibraryWay :: Way -> Way +rtsWayToLibraryWay = wayFromUnits . List.intersect [Dynamic, Profiling] . wayToUnits + -- | Return all the object files to be put into the library we're building for -- the given 'Context'. libraryObjects :: Context -> Action [FilePath] ===================================== hadrian/src/Rules/Rts.hs ===================================== @@ -13,11 +13,19 @@ rtsRules = priority 3 $ do -- to be linked into the rts dll. forM_ [Stage1, Stage2, Stage3 ] $ \ stage -> do let buildPath = root -/- buildDir (rtsContext stage) - buildPath -/- "libHSghc-internal.dll.a" %> buildGhcInternalImportLib + buildPath -/- "libHSghc-internal-*.def" %> buildGhcInternalImportDef + buildPath -/- "libHSghc-internal-*.dll.a" %> buildGhcInternalImportLib + +buildGhcInternalImportDef :: FilePath -> Action () +buildGhcInternalImportDef target = do + templateIn <- readFile' "rts/win32/libHSghc-internal.def.in" + let dllName = takeFileName target -<.> "dll" + templateOut = replace "@GhcInternalDll@" dllName templateIn + writeFile' target templateOut buildGhcInternalImportLib :: FilePath -> Action () buildGhcInternalImportLib target = do - let input = "rts/win32/libHSghc-internal.def" + let input = dropExtension (dropExtension target) <.> "def" -- the .def file output = target -- the .dll.a import lib need [input] runBuilder Dlltool ["-d", input, "-l", output] [input] [output] ===================================== rts/win32/libHSghc-internal.def.in ===================================== @@ -1,4 +1,4 @@ -LIBRARY libHSghc-internal-@ProjectVersionForLib@.0-ghc@ProjectVersion@.dll +LIBRARY @GhcInternalDll@ EXPORTS init_ghc_hs_iface View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/276642f7382f269346d8a22e6c21e5… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/276642f7382f269346d8a22e6c21e5… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-26953] drop rebase artifact
by Rodrigo Mesquita (＠alt-romes) 15 Jun '26

15 Jun '26

Rodrigo Mesquita pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC Commits: 0a0f4ccc by Rodrigo Mesquita at 2026-06-15T15:46:57+01:00 drop rebase artifact - - - - - 9 changed files: - compiler/GHC/CmmToAsm/BlockLayout.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/Session/Units.hs - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Linker/Unit.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Unit/Info.hs - compiler/GHC/Unit/State.hs - compiler/GHC/Utils/Misc.hs Changes: ===================================== compiler/GHC/CmmToAsm/BlockLayout.hs ===================================== @@ -36,6 +36,7 @@ import GHC.Utils.Outputable import GHC.Utils.Panic import GHC.Utils.Misc +import Data.Containers.ListUtils (nubOrd) import Data.List (sortOn, sortBy, nub) import Data.List.NonEmpty (nonEmpty) import qualified Data.List.NonEmpty as NE @@ -426,7 +427,7 @@ combineNeighbourhood edges chains applyEdges :: [CfgEdge] -> FrontierMap -> FrontierMap -> Set.Set (BlockId, BlockId) -> ([BlockChain], Set.Set (BlockId,BlockId)) applyEdges [] chainEnds _chainFronts combined = - (ordNub $ map snd $ mapElems chainEnds, combined) + (nubOrd $ map snd $ mapElems chainEnds, combined) applyEdges ((CfgEdge from to _w):edges) chainEnds chainFronts combined | Just (c1_e,c1) <- mapLookup from chainEnds , Just (c2_f,c2) <- mapLookup to chainFronts ===================================== compiler/GHC/Driver/Backpack.hs ===================================== @@ -76,6 +76,7 @@ import GHC.Data.FastString import qualified GHC.Data.EnumSet as EnumSet import qualified GHC.Data.ShortText as ST +import Data.Containers.ListUtils (nubOrd) import Data.List ( partition ) import System.Exit import Control.Monad @@ -763,14 +764,14 @@ hsunitModuleGraph do_link unit = do let inodes = instantiationNodes (homeUnitId $ hsc_home_unit hsc_env) (hsc_units hsc_env) -- TODO: Backpack mode does not properly support ExternalPackage nodes yet -- Module nodes do not get given package dependencies (see hsModuleToModSummary). - let pkg_nodes = ordNub $ map (\(_, iud) -> UnitNode [] (instUnitInstanceOf iud)) inodes + let pkg_nodes = nubOrd $ map (\(_, iud) -> UnitNode [] (instUnitInstanceOf iud)) inodes let graph_nodes = nodes ++ req_nodes ++ (map (uncurry InstantiationNode) $ inodes) ++ pkg_nodes key_nodes = map mkNodeKey graph_nodes all_nodes = graph_nodes ++ [LinkNode key_nodes (homeUnitId $ hsc_home_unit hsc_env) | do_link] -- This error message is not very good but .bkp mode is just for testing so -- better to be direct rather than pretty. when - (length key_nodes /= length (ordNub key_nodes)) + (length key_nodes /= length (nubOrd key_nodes)) (pprPanic "Duplicate nodes keys in backpack file" (ppr key_nodes)) -- 3. Return the kaboodle ===================================== compiler/GHC/Driver/Session/Units.hs ===================================== @@ -25,7 +25,6 @@ import qualified GHC.Unit.State as State import GHC.Types.SrcLoc import GHC.Types.SourceError -import GHC.Utils.Misc import GHC.Utils.Panic import GHC.Utils.Outputable as Outputable import GHC.Utils.Monad ( liftIO, mapMaybeM ) @@ -35,6 +34,7 @@ import System.IO import System.Exit import System.FilePath import Control.Monad +import Data.Containers.ListUtils (nubOrdOn) import Data.List ( partition, (\\) ) import qualified Data.Set as Set import GHC.Prelude @@ -204,7 +204,7 @@ checkDuplicateUnits dflags flags = where uids = map (second homeUnitId_) flags - deduplicated_uids = ordNubOn snd uids + deduplicated_uids = nubOrdOn snd uids duplicate_ids = Set.fromList (map snd uids \\ map snd deduplicated_uids) duplicate_flags = filter (flip Set.member duplicate_ids . snd) uids ===================================== compiler/GHC/HsToCore/Usage.hs ===================================== @@ -32,6 +32,7 @@ import GHC.Unit.Module.Deps import GHC.Data.Maybe import GHC.Data.FastString +import Data.Containers.ListUtils (nubOrdOn) import Data.List (sortBy) import Data.Map (Map) import qualified Data.Map as Map @@ -180,7 +181,7 @@ the TH splice. -- modules and direct object files for pkg dependencies mkObjectUsage :: Plugins -> FinderCache -> [LinkableUsage] -> PkgsLoaded -> IO [Usage] mkObjectUsage plugins fc th_links_needed th_pkgs_needed = do - let ls = ordNubOn linkableModule (th_links_needed ++ plugins_links_needed) + let ls = nubOrdOn linkableModule (th_links_needed ++ plugins_links_needed) ds = concatMap loaded_pkg_hs_objs $ eltsUDFM (plusUDFM th_pkgs_needed plugin_pkgs_needed) -- TODO possibly record loaded_pkg_non_hs_objs as well (plugins_links_needed, plugin_pkgs_needed) = loadedPluginDeps plugins concat <$> sequence (map linkableToUsage ls ++ map librarySpecToUsage ds) ===================================== compiler/GHC/Linker/Unit.hs ===================================== @@ -25,6 +25,7 @@ import qualified GHC.Data.ShortText as ST import GHC.Settings import Control.Monad +import Data.Containers.ListUtils (nubOrd) import Data.List (nub) import Data.Semigroup ( Semigroup(..) ) import System.Directory @@ -95,7 +96,7 @@ collectArchives namever ways pc = filterM doesFileExist [ searchPath </> ("lib" ++ lib ++ ".a") | searchPath <- searchPaths , lib <- libs ] - where searchPaths = ordNub . filter notNull . libraryDirsForWay ways $ pc + where searchPaths = nubOrd . filter notNull . libraryDirsForWay ways $ pc libs = unitHsLibs namever ways pc ++ (map ST.unpack . unitExtDepLibsStaticSys $ pc) getLibs :: GhcNameVersion -> Ways -> UnitEnv -> [UnitId] -> IO [(String,String)] ===================================== compiler/GHC/Rename/Pat.hs ===================================== @@ -78,6 +78,7 @@ import GHC.Core.TyCon ( isKindName ) import qualified GHC.LanguageExtensions as LangExt import Control.Monad ( when, ap, guard, unless ) +import Data.Containers.ListUtils (nubOrdOn) import Data.Foldable import Data.Function ( on ) import Data.Functor.Identity ( Identity (..) ) @@ -666,7 +667,7 @@ rnPatAndThen mk (OrPat _ pats) ; pats' <- rnLPatsAndThen mk pats ; let bndrs = collectPatsBinders CollVarTyVarBinders (NE.toList pats') ; liftCps $ setSrcSpan loc $ checkErr (null bndrs) $ - TcRnOrPatBindsVariables (NE.fromList (ordNubOn getOccName bndrs)) + TcRnOrPatBindsVariables (NE.fromList (nubOrdOn getOccName bndrs)) ; return (OrPat noExtField pats') } rnPatAndThen mk (SumPat _ pat alt arity) ===================================== compiler/GHC/Unit/Info.hs ===================================== @@ -49,6 +49,7 @@ import GHC.Unit.Database import GHC.Settings +import Data.Containers.ListUtils (nubOrd) import Data.Version import Data.Bifunctor import Data.List (isPrefixOf, stripPrefix) @@ -185,7 +186,7 @@ mkUnitPprInfo ufs i = UnitPprInfo -- | Find all the include directories in the given units collectIncludeDirs :: [UnitInfo] -> [FilePath] -collectIncludeDirs ps = map ST.unpack $ ordNub (filter (not . ST.null) (concatMap unitIncludeDirs ps)) +collectIncludeDirs ps = map ST.unpack $ nubOrd (filter (not . ST.null) (concatMap unitIncludeDirs ps)) -- | Find all the C-compiler options in the given units collectExtraCcOpts :: [UnitInfo] -> [String] @@ -193,7 +194,7 @@ collectExtraCcOpts ps = map ST.unpack (concatMap unitCcOptions ps) -- | Find all the library directories in the given units for the given ways collectLibraryDirs :: Ways -> [UnitInfo] -> [FilePath] -collectLibraryDirs ws = ordNub . filter notNull . concatMap (libraryDirsForWay ws) +collectLibraryDirs ws = nubOrd . filter notNull . concatMap (libraryDirsForWay ws) -- | Find all the frameworks in the given units collectFrameworks :: [UnitInfo] -> [String] @@ -201,7 +202,7 @@ collectFrameworks ps = map ST.unpack (concatMap unitExtDepFrameworks ps) -- | Find all the package framework paths in these and the preload packages collectFrameworksDirs :: [UnitInfo] -> [String] -collectFrameworksDirs ps = map ST.unpack (ordNub (filter (not . ST.null) (concatMap unitExtDepFrameworkDirs ps))) +collectFrameworksDirs ps = map ST.unpack (nubOrd (filter (not . ST.null) (concatMap unitExtDepFrameworkDirs ps))) -- | Either the 'unitLibraryDirs' or 'unitLibraryDynDirs' as appropriate for the way. libraryDirsForWay :: Ways -> UnitInfo -> [String] ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -112,6 +112,7 @@ import GHC.Utils.Exception import System.Directory import System.FilePath as FilePath import Control.Monad +import Data.Containers.ListUtils (nubOrd) import Data.Graph (stronglyConnComp, SCC(..)) import Data.Char ( toUpper ) import Data.List ( intersperse, partition, sortBy, sortOn, sort ) @@ -1705,7 +1706,7 @@ mkUnitState logger cfg = do basicLinkedUnits = fmap (RealUnit . Definite) $ filter (flip elemUniqMap pkg_db) $ unitConfigAutoLink cfg - preload3 = ordNub $ (basicLinkedUnits ++ preload1) + preload3 = nubOrd $ (basicLinkedUnits ++ preload1) -- Close the preload packages with their dependencies dep_preload <- mayThrowUnitErr ===================================== compiler/GHC/Utils/Misc.hs ===================================== @@ -59,7 +59,7 @@ module GHC.Utils.Misc ( replaceAt, dropTail, capitalise, -- * Sorting - sortWith, minWith, nubSort, ordNub, ordNubOn, + sortWith, minWith, nubSort, -- * Comparisons isEqual, @@ -570,23 +570,6 @@ minWith get_key xs = assert (not (null xs) ) nubSort :: Ord a => [a] -> [a] nubSort = Set.toAscList . Set.fromList --- | Remove duplicates but keep elements in order. --- O(n * log n) -ordNub :: Ord a => [a] -> [a] -ordNub xs = ordNubOn id xs - --- | Remove duplicates but keep elements in order. --- O(n * log n) -ordNubOn :: Ord b => (a -> b) -> [a] -> [a] -ordNubOn f xs - = go Set.empty xs - where - go _ [] = [] - go s (x:xs) - | Set.member (f x) s = go s xs - | otherwise = x : go (Set.insert (f x) s) xs - - {- ************************************************************************ * * View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0a0f4ccca3e106384c3a78db8204ebd… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0a0f4ccca3e106384c3a78db8204ebd… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/ani/T27156] 9 commits: Hadrian: avoid response files when command line is short enough
by Apoorv Ingle (＠ani) 15 Jun '26

15 Jun '26

Apoorv Ingle pushed to branch wip/ani/T27156 at Glasgow Haskell Compiler / GHC Commits: 498bb21a by David Eichmann at 2026-06-09T18:02:39-04:00 Hadrian: avoid response files when command line is short enough This replaces the logic of always using response files on Windows. With the new condition based on command line lenght, reponse files can be avoided in many more cases (on windows). Now that response files are only used in a small number of cases, response files are always kept and the -r / --keep-response-files command line options have been removed The response file paths are nolonger randomized. They are placed in the `_build/rsp` directory. This ensures they are ignored by git and we that Hadrian reuses response file paths when rebuilding rather than leaving stale response files around. Update user guide putting response files in its own section - - - - - 87f510a5 by Simon Hengel at 2026-06-09T18:03:25-04:00 Don't use non-breaking spaces - - - - - 41a19379 by David Eichmann at 2026-06-09T18:04:11-04:00 Hadrian: remove unused wrapper scripts from windows bindist These wrapper scripts are only installed on non-relocatable builds which are not generally supported on windows. - - - - - ce01ccb6 by sheaf at 2026-06-10T05:08:48-04:00 Don't drop ticks around variables of type `IO ()` GHC.Core.Utils.mkTick is responsible for placing a tick on a Core expression. It contains logic for dropping SCCs (non-counting profiling ticks) around non-function variables, as such variables cannot meaningfully contribute to profiles. However, the logic for what counts as a function was incorrect: it used `isFunTy` which returns 'False' for types such as 'IO ()' where the function arrow is hidden under a newtype. We now use 'mightBeFunTy' instead of 'isFunTy'. This ensures we don't drop ticks in cases we aren't sure. On the way, we improve the documentation of 'isFunTy', 'isPiTy' and 'mightBeFunTy', and update the latter's implementation to consistently handle unary classes. Fixes #27225 ------------------------- Metric Decrease: T5642 ------------------------- - - - - - d311c4f1 by Simon Jakobi at 2026-06-10T05:09:32-04:00 testsuite: Add regression test for #4081 Check that a strict constructor field is unboxed once outside an enclosing loop, not re-inspected each iteration (the float-out case-floating from 9cb20b488). Uses simonpj's `data T a = T !a` example from the ticket; T4081.stderr captures the expected Core. Co-Authored-By: Claude Opus 4.7 <noreply(a)anthropic.com> - - - - - 333df444 by sheaf at 2026-06-10T05:10:25-04:00 Check for cabal-install >= 3.12 upfront Starting with commit 8cb99552f607f6bc4000e45ab32532d50c8bb996, Hadrian requires cabal-install >= 3.12 in order to use the 'cabal path' command that was introduced in version 3.12, as per https://github.com/haskell/cabal/blob/a51c4ee1556d816ad86e90db7e6330dd51b0b… This was not reflected in the Hadrian build script, causing a delayed build failure instead of enforcing the version requirement upfront, which this patch does. Fixes #27317 - - - - - 98c20394 by sheaf at 2026-06-10T05:11:09-04:00 Fix crash in Data.Data instance for HsCtxt The Data.Data instance for HsCtxt contained an error for the 'toConstr' method, which could trigger for example when looking at -ddump-tc-ast traces. Replace it with the 'abstractConstr' pattern used in the rest of the codebase. - - - - - 089e9187 by Apoorv Ingle at 2026-06-10T21:12:02-05:00 Work on #27156 - Add `RebindableSyntaxTable` to store function/operator names while renaming in the XBlah fields - Expand the following expressions right before typechecking instead of in the renamer * OverloadedLabel * RecordDotSyntax: HsGetField and HsProjection * ExplicitList * RecordUpd * HsIf * HsDo (Vanilla cases) - - - - - 8aac933c by Apoorv Ingle at 2026-06-15T00:04:47-05:00 update notes - - - - - 49 changed files: - + changelog.d/T27156 - + changelog.d/T27225 - + changelog.d/T27317 - + changelog.d/T27359 - changelog.d/hadrian-response-files.md - compiler/GHC/Core/Type.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/Driver/Backend.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Runtime/Debugger/Breakpoints.hs - compiler/GHC/Runtime/Eval/Types.hs - compiler/GHC/Runtime/Heap/Inspect.hs - compiler/GHC/Tc/Gen/Do.hs - compiler/GHC/Tc/Gen/Expand.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Types/RepType.hs - compiler/GHC/Utils/Logger.hs - docs/users_guide/using.rst - hadrian/build-cabal - hadrian/src/Builder.hs - hadrian/src/CommandLine.hs - hadrian/src/Hadrian/Builder/Ar.hs - hadrian/src/Hadrian/Utilities.hs - hadrian/src/Rules/BinaryDist.hs - libraries/ghc-internal/src/GHC/Internal/Lexeme.hs - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/ghc-api/T25121_status.stdout - testsuite/tests/parser/should_fail/RecordDotSyntaxFail8.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail9.stderr - + testsuite/tests/profiling/should_run/T27225.hs - + testsuite/tests/profiling/should_run/T27225.stdout - + testsuite/tests/profiling/should_run/T27225b.hs - + testsuite/tests/profiling/should_run/T27225b.stdout - testsuite/tests/profiling/should_run/all.T - testsuite/tests/profiling/should_run/caller-cc/CallerCc1.prof.sample - testsuite/tests/profiling/should_run/callstack001.stdout - testsuite/tests/profiling/should_run/scc001.prof.sample - testsuite/tests/rebindable/T19918.stdout - + testsuite/tests/simplCore/should_compile/T4081.hs - + testsuite/tests/simplCore/should_compile/T4081.stderr - testsuite/tests/simplCore/should_compile/all.T - testsuite/tests/th/T18102b.stdout The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/89ab658e1487762c08277a97f0b682… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/89ab658e1487762c08277a97f0b682… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/mangoiv/add-more-hlint-ignore
by Magnus (＠MangoIV) 15 Jun '26

15 Jun '26

Magnus pushed new branch wip/mangoiv/add-more-hlint-ignore at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/mangoiv/add-more-hlint-ignore You're receiving this email because of your account on gitlab.haskell.org.

1 0