- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/andreask/spec_tyfams] use inscope set
by Andreas Klebinger (＠AndreasK) 26 Apr '25

26 Apr '25

Andreas Klebinger pushed to branch wip/andreask/spec_tyfams at Glasgow Haskell Compiler / GHC Commits: 6e9567ff by Andreas Klebinger at 2025-04-26T13:56:37+02:00 use inscope set - - - - - 1 changed file: - compiler/GHC/Core/Opt/Specialise.hs Changes: ===================================== compiler/GHC/Core/Opt/Specialise.hs ===================================== @@ -1282,7 +1282,7 @@ specCase :: SpecEnv specCase env scrut' case_bndr [Alt con args rhs] | -- See Note [Floating dictionaries out of cases] -- interestingDict scrut' (idType case_bndr) - interestingDict (ISE emptyInScopeSet realIdUnfolding) scrut' + interestingDict (ISE (substInScopeSet $ se_subst env) realIdUnfolding) scrut' , not (isDeadBinder case_bndr && null sc_args') = do { case_bndr_flt :| sc_args_flt <- mapM clone_me (case_bndr' :| sc_args') @@ -3067,7 +3067,7 @@ mkCallUDs' env f args -- on this argument; if so, SpecDict, if not UnspecArg mk_spec_arg arg (Anon _pred af) | isInvisibleFunArg af - , interestingDict (ISE emptyInScopeSet realIdUnfolding) arg + , interestingDict (ISE (substInScopeSet $ se_subst env) realIdUnfolding) arg -- , interestingDict arg (scaledThing pred) -- See Note [Interesting dictionary arguments] = SpecDict arg View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6e9567ffa7a2a32ee68ce8a50e69866… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6e9567ffa7a2a32ee68ce8a50e69866… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T24603] aligned tests
by Serge S. Gulin (＠gulin.serge) 26 Apr '25

26 Apr '25

Serge S. Gulin pushed to branch wip/T24603 at Glasgow Haskell Compiler / GHC Commits: a73fdf14 by Serge S. Gulin at 2025-04-26T15:03:39+03:00 aligned tests - - - - - 1 changed file: - testsuite/tests/interface-stability/base-exports.stdout Changes: ===================================== testsuite/tests/interface-stability/base-exports.stdout ===================================== @@ -10491,6 +10491,7 @@ module System.Posix.Internals where c_lseek :: GHC.Internal.Foreign.C.Types.CInt -> GHC.Internal.System.Posix.Types.COff -> GHC.Internal.Foreign.C.Types.CInt -> GHC.Internal.Types.IO GHC.Internal.System.Posix.Types.COff c_mkfifo :: GHC.Internal.Foreign.C.String.Encoding.CString -> GHC.Internal.System.Posix.Types.CMode -> GHC.Internal.Types.IO GHC.Internal.Foreign.C.Types.CInt c_open :: CFilePath -> GHC.Internal.Foreign.C.Types.CInt -> GHC.Internal.System.Posix.Types.CMode -> GHC.Internal.Types.IO GHC.Internal.Foreign.C.Types.CInt + c_openat :: GHC.Internal.Foreign.C.Types.CInt -> CFilePath -> GHC.Internal.Foreign.C.Types.CInt -> GHC.Internal.System.Posix.Types.CMode -> GHC.Internal.Types.IO GHC.Internal.Foreign.C.Types.CInt c_pipe :: GHC.Internal.Ptr.Ptr GHC.Internal.Foreign.C.Types.CInt -> GHC.Internal.Types.IO GHC.Internal.Foreign.C.Types.CInt c_read :: GHC.Internal.Foreign.C.Types.CInt -> GHC.Internal.Ptr.Ptr GHC.Internal.Word.Word8 -> GHC.Internal.Foreign.C.Types.CSize -> GHC.Internal.Types.IO GHC.Internal.System.Posix.Types.CSsize c_s_isblk :: GHC.Internal.System.Posix.Types.CMode -> GHC.Internal.Foreign.C.Types.CInt View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a73fdf14f61ccac46b07a457ec263c1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a73fdf14f61ccac46b07a457ec263c1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/spec_tyfams] Disable trace for ci checks
by Andreas Klebinger (＠AndreasK) 26 Apr '25

26 Apr '25

Andreas Klebinger pushed to branch wip/andreask/spec_tyfams at Glasgow Haskell Compiler / GHC Commits: 701de524 by Andreas Klebinger at 2025-04-26T12:47:50+02:00 Disable trace for ci checks - - - - - 1 changed file: - compiler/GHC/Core/Opt/Specialise.hs Changes: ===================================== compiler/GHC/Core/Opt/Specialise.hs ===================================== @@ -68,6 +68,7 @@ import Data.List.NonEmpty ( NonEmpty (..) ) import GHC.Core.Subst (substTickish) import GHC.Core.TyCon (tyConClass_maybe) import GHC.Core.DataCon (dataConTyCon) +import Control.Monad {- ************************************************************************ @@ -1704,7 +1705,7 @@ specCalls spec_imp env existing_rules calls_for_me fn rhs , rule_bndrs, rule_lhs_args , spec_bndrs1, dx_binds, spec_args) <- specHeader env rhs_bndrs all_call_args - ; pprTrace "spec_call" (vcat + ; when False $ pprTrace "spec_call" (vcat [ text "fun: " <+> ppr fn , text "call info: " <+> ppr _ci , text "useful: " <+> ppr useful View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/701de52480878d9ceaeb4ee8a692b50… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/701de52480878d9ceaeb4ee8a692b50… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/spec_tyfams] Try simons version of isInterestingDict
by Andreas Klebinger (＠AndreasK) 26 Apr '25

26 Apr '25

Andreas Klebinger pushed to branch wip/andreask/spec_tyfams at Glasgow Haskell Compiler / GHC Commits: 9ec6b757 by Andreas Klebinger at 2025-04-26T12:37:22+02:00 Try simons version of isInterestingDict - - - - - 1 changed file: - compiler/GHC/Core/Opt/Specialise.hs Changes: ===================================== compiler/GHC/Core/Opt/Specialise.hs ===================================== @@ -14,8 +14,8 @@ import GHC.Driver.Config.Diagnostic import GHC.Driver.Config.Core.Rules ( initRuleOpts ) import GHC.Core.Type hiding( substTy, substCo, extendTvSubst, zapSubst ) -import GHC.Core.Multiplicity -import GHC.Core.SimpleOpt( defaultSimpleOpts, simpleOptExprWith ) +-- import GHC.Core.Multiplicity +import GHC.Core.SimpleOpt( defaultSimpleOpts, simpleOptExprWith, exprIsConApp_maybe ) import GHC.Core.Predicate import GHC.Core.Coercion( Coercion ) import GHC.Core.Opt.Monad @@ -66,6 +66,8 @@ import GHC.Core.Unfold import Data.List( partition ) import Data.List.NonEmpty ( NonEmpty (..) ) import GHC.Core.Subst (substTickish) +import GHC.Core.TyCon (tyConClass_maybe) +import GHC.Core.DataCon (dataConTyCon) {- ************************************************************************ @@ -1278,7 +1280,8 @@ specCase :: SpecEnv , UsageDetails) specCase env scrut' case_bndr [Alt con args rhs] | -- See Note [Floating dictionaries out of cases] - interestingDict scrut' (idType case_bndr) + -- interestingDict scrut' (idType case_bndr) + interestingDict (ISE emptyInScopeSet realIdUnfolding) scrut' , not (isDeadBinder case_bndr && null sc_args') = do { case_bndr_flt :| sc_args_flt <- mapM clone_me (case_bndr' :| sc_args') @@ -3061,9 +3064,10 @@ mkCallUDs' env f args -- For "invisibleFunArg", which are the type-class dictionaries, -- we decide on a case by case basis if we want to specialise -- on this argument; if so, SpecDict, if not UnspecArg - mk_spec_arg arg (Anon pred af) + mk_spec_arg arg (Anon _pred af) | isInvisibleFunArg af - , interestingDict arg (scaledThing pred) + , interestingDict (ISE emptyInScopeSet realIdUnfolding) arg + -- , interestingDict arg (scaledThing pred) -- See Note [Interesting dictionary arguments] = SpecDict arg @@ -3169,33 +3173,47 @@ in the NonRec case of specBind. (This is too exotic to trouble with the Rec case.) -} -interestingDict :: CoreExpr -> Type -> Bool +-- interestingDict :: CoreExpr -> Type -> Bool +interestingDict :: InScopeEnv -> CoreExpr -> Bool -- A dictionary argument is interesting if it has *some* structure, -- see Note [Interesting dictionary arguments] -- NB: "dictionary" arguments include constraints of all sorts, -- including equality constraints; hence the Coercion case -- To make this work, we need to ensure that dictionaries have -- unfoldings in them. -interestingDict arg _arg_ty - -- No benefit to specalizing for a ~# b I believe - -- | (isEqPred arg_ty) = False - -- | - -- not (typeDeterminesValue arg_ty) = False -- See Note [Type determines value] - | otherwise = go arg - where - go (Var v) = hasSomeUnfolding (idUnfolding v) - || isDataConWorkId v - go (Type _) = False - go (Coercion _) = False - go (App fn (Type _)) = go fn - go (App fn (Coercion _)) = go fn - go (Tick _ a) = go a - go (Cast e _) = go e - go (Lit{}) = True - go (Case{}) = True - go (Let{}) = True - go (App{}) = True - go (Lam{}) = True +interestingDict env (Cast arg _) + = interestingDict env arg +interestingDict env arg + | Just (_, _, data_con, _tys, args) <- exprIsConApp_maybe env arg + , Just cls <- tyConClass_maybe (dataConTyCon data_con) + , (not . isIPLikePred) (exprType arg) + = if isCTupleClass cls + then any (interestingDict env) args + else True + | otherwise + = False + + +-- interestingDict arg _arg_ty +-- -- No benefit to specalizing for a ~# b I believe +-- -- | (isEqPred arg_ty) = False +-- -- | +-- -- not (typeDeterminesValue arg_ty) = False -- See Note [Type determines value] +-- | otherwise = go arg +-- where +-- go (Var v) = hasSomeUnfolding (idUnfolding v) +-- || isDataConWorkId v +-- go (Type _) = False +-- go (Coercion _) = False +-- go (App fn (Type _)) = go fn +-- go (App fn (Coercion _)) = go fn +-- go (Tick _ a) = go a +-- go (Cast e _) = go e +-- go (Lit{}) = True +-- go (Case{}) = True +-- go (Let{}) = True +-- go (App{}) = True +-- go (Lam{}) = True -- go _ = True View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9ec6b7572f3399c2033e718574eafc9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9ec6b7572f3399c2033e718574eafc9… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/T25944
by Sebastian Graf (＠sgraf812) 26 Apr '25

26 Apr '25

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

1 0

[Git][ghc/ghc][wip/T24603] aligned tests
by Serge S. Gulin (＠gulin.serge) 26 Apr '25

26 Apr '25

Serge S. Gulin pushed to branch wip/T24603 at Glasgow Haskell Compiler / GHC Commits: 3ba16e48 by Serge S. Gulin at 2025-04-26T11:20:01+03:00 aligned tests - - - - - 2 changed files: - libraries/ghc-internal/src/GHC/Internal/System/Posix/Internals.hs - testsuite/tests/ghc-api/fixed-nodes/all.T Changes: ===================================== libraries/ghc-internal/src/GHC/Internal/System/Posix/Internals.hs ===================================== @@ -556,6 +556,8 @@ foreign import javascript interruptible "h$open" c_interruptible_open_ :: CFilePath -> CInt -> CMode -> IO CInt foreign import javascript interruptible "h$open" c_safe_open_ :: CFilePath -> CInt -> CMode -> IO CInt +foreign import javascript interruptible "h$openat" + c_openat :: CInt -> CFilePath -> CInt -> CMode -> IO CInt foreign import javascript interruptible "h$base_read" c_read :: CInt -> Ptr Word8 -> CSize -> IO CSsize foreign import javascript interruptible "h$base_read" ===================================== testsuite/tests/ghc-api/fixed-nodes/all.T ===================================== @@ -2,7 +2,6 @@ test('FixedNodes', [extra_run_opts(f'"{config.libdir}"'), extra_files(['T1A.hs', 'T1B.hs', 'T1C.hs']), wasm_broken(25953), - js_broken(25953) ], compile_and_run, ['-package ghc']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3ba16e485d3725684ce76816270a7ab… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3ba16e485d3725684ce76816270a7ab… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/spec_tyfams] Wibble
by Andreas Klebinger (＠AndreasK) 26 Apr '25

26 Apr '25

Andreas Klebinger pushed to branch wip/andreask/spec_tyfams at Glasgow Haskell Compiler / GHC Commits: 4fc55232 by Andreas Klebinger at 2025-04-26T09:36:42+02:00 Wibble - - - - - 1 changed file: - compiler/GHC/Core/Opt/Specialise.hs Changes: ===================================== compiler/GHC/Core/Opt/Specialise.hs ===================================== @@ -3176,7 +3176,7 @@ interestingDict :: CoreExpr -> Type -> Bool -- including equality constraints; hence the Coercion case -- To make this work, we need to ensure that dictionaries have -- unfoldings in them. -interestingDict arg arg_ty +interestingDict arg _arg_ty -- No benefit to specalizing for a ~# b I believe -- | (isEqPred arg_ty) = False -- | View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4fc55232c1be5a4fc9e14bb88d84bbd… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4fc55232c1be5a4fc9e14bb88d84bbd… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/int-index/enforce-namespaces] WIP: Take subordinate 'type' specifiers into account
by Vladislav Zavialov (＠int-index) 25 Apr '25

25 Apr '25

Vladislav Zavialov pushed to branch wip/int-index/enforce-namespaces at Glasgow Haskell Compiler / GHC Commits: b911a6f1 by Vladislav Zavialov at 2025-04-26T02:18:54+02:00 WIP: Take subordinate 'type' specifiers into account - - - - - 29 changed files: - compiler/GHC/Rename/Names.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Types/Error/Codes.hs - docs/users_guide/9.14.1-notes.rst - docs/users_guide/exts/explicit_namespaces.rst - testsuite/tests/driver/RecompExports/RecompExports1.stderr - testsuite/tests/driver/RecompExports/RecompExports4.stderr - testsuite/tests/module/T21826.stderr - testsuite/tests/module/mod81.stderr - testsuite/tests/module/mod91.stderr - + testsuite/tests/rename/should_compile/T22581c.hs - + testsuite/tests/rename/should_compile/T22581c_helper.hs - + testsuite/tests/rename/should_compile/T22581d.script - + testsuite/tests/rename/should_compile/T22581d.stdout - + testsuite/tests/rename/should_compile/T25991a.hs - + testsuite/tests/rename/should_compile/T25991a_helper.hs - testsuite/tests/rename/should_compile/all.T - + testsuite/tests/rename/should_fail/T22581a.hs - + testsuite/tests/rename/should_fail/T22581a.stderr - + testsuite/tests/rename/should_fail/T22581a_helper.hs - + testsuite/tests/rename/should_fail/T22581b.hs - + testsuite/tests/rename/should_fail/T22581b.stderr - + testsuite/tests/rename/should_fail/T22581b_helper.hs - + testsuite/tests/rename/should_fail/T25991b1.hs - + testsuite/tests/rename/should_fail/T25991b2.hs - + testsuite/tests/rename/should_fail/T25991b_helper.hs - testsuite/tests/rename/should_fail/T9006.stderr - testsuite/tests/rename/should_fail/all.T Changes: ===================================== compiler/GHC/Rename/Names.hs ===================================== @@ -1256,7 +1256,7 @@ filterImports hsc_env iface decl_spec (Just (want_hiding, L l import_items)) -- 'BadImportW' is only constructed below in 'handle_bad_import', in -- the 'EverythingBut' case, so that's what we pass to -- 'badImportItemErr'. - reason <- badImportItemErr iface decl_spec ie IsNotSubordinate all_avails + (reason : _) <- badImportItemErr iface decl_spec ie IsNotSubordinate all_avails pure (TcRnDodgyImports (DodgyImportsHiding reason)) warning_msg (DeprecatedExport n w) = pure $ TcRnPragmaWarning @@ -1268,15 +1268,15 @@ filterImports hsc_env iface decl_spec (Just (want_hiding, L l import_items)) run_lookup :: IELookupM a -> TcRn (Maybe a) run_lookup m = case m of Failed err -> do - msg <- lookup_err_msg err - addErr (TcRnImportLookup msg) + msgs <- lookup_err_msgs err + mapM_ addErr [TcRnImportLookup msg | msg <- msgs] return Nothing Succeeded a -> return (Just a) - lookup_err_msg err = case err of + lookup_err_msgs err = case err of BadImport ie sub -> badImportItemErr iface decl_spec ie sub all_avails - IllegalImport -> pure ImportLookupIllegal - QualImportError rdr -> pure (ImportLookupQualified rdr) + IllegalImport -> pure [ImportLookupIllegal] + QualImportError rdr -> pure [ImportLookupQualified rdr] -- For each import item, we convert its RdrNames to Names, -- and at the same time compute all the GlobalRdrElt corresponding @@ -1362,13 +1362,24 @@ filterImports hsc_env iface decl_spec (Just (want_hiding, L l import_items)) -- See Note [Importing DuplicateRecordFields] case lookupChildren subnames rdr_ns of - Failed rdrs -> failLookupWith $ - BadImport (IEThingWith (deprecation, ann) ltc wc rdrs noDocstring) - (IsSubordinate { subordinate_parent = gre}) + Failed errs -> failLookupWith $ BadImport ie subordinate_err -- We are trying to import T( a,b,c,d ), and failed -- to find 'b' and 'd'. So we make up an import item -- to report as failing, namely T( b, d ). - -- c.f. #15412 + -- c.f. #15413 + where + items = map lce_wrapped_name errs + ie = IEThingWith (deprecation, ann) ltc wc items noDocstring + subordinate_err = + assertPpr (length unavailable + length nontype == length items) + (ppr items) $ + IsSubordinateError { subordinate_err_parent = gre + , subordinate_err_unavailable = unavailable + , subordinate_err_nontype = nontype } + unavailable = + [ (occNameFS . rdrNameOcc . ieWrappedName) wname + | LookupChildNotFound (L _ wname) <- errs ] + nontype = [ g | LookupChildNonType _ g <- errs ] Succeeded childnames -> return ([ (IEThingWith (Nothing, ann) (L l name') wc childnames' noDocstring @@ -1414,13 +1425,15 @@ data IELookupWarning | DeprecatedExport Name (WarningTxt GhcRn) -- | Is this import/export item a subordinate or not? -data IsSubordinate - = IsSubordinate { subordinate_parent :: GlobalRdrElt } +data IsSubordinateError + = IsSubordinateError { subordinate_err_parent :: !GlobalRdrElt + , subordinate_err_unavailable :: [FastString] + , subordinate_err_nontype :: [GlobalRdrElt] } | IsNotSubordinate data IELookupError = QualImportError RdrName - | BadImport (IE GhcPs) IsSubordinate + | BadImport (IE GhcPs) IsSubordinateError | IllegalImport failLookupWith :: IELookupError -> IELookupM a @@ -1603,9 +1616,14 @@ mkChildEnv gres = foldr add emptyNameEnv gres findChildren :: NameEnv [a] -> Name -> [a] findChildren env n = lookupNameEnv env n `orElse` [] +data LookupChildError + = LookupChildNotFound { lce_wrapped_name :: !(LIEWrappedName GhcPs) } + | LookupChildNonType { lce_wrapped_name :: !(LIEWrappedName GhcPs) + , _lce_nontype_item :: !GlobalRdrElt } + lookupChildren :: [GlobalRdrElt] -> [LIEWrappedName GhcPs] - -> MaybeErr [LIEWrappedName GhcPs] -- The ones for which the lookup failed + -> MaybeErr [LookupChildError] -- The ones for which the lookup failed [LocatedA GlobalRdrElt] -- (lookupChildren all_kids rdr_items) maps each rdr_item to its -- corresponding Name all_kids, if the former exists @@ -1623,21 +1641,25 @@ lookupChildren all_kids rdr_items = Failed fails where mb_xs = map doOne rdr_items - fails = [ bad_rdr | Failed bad_rdr <- mb_xs ] - oks = [ ok | Succeeded ok <- mb_xs ] + fails = [ err | Failed err <- mb_xs ] + oks = [ ok | Succeeded ok <- mb_xs ] oks :: [[LocatedA GlobalRdrElt]] - doOne item@(L l r) - = case (lookupFsEnv kid_env . occNameFS . rdrNameOcc . ieWrappedName) r of - Just [g] - | not $ isRecFldGRE g - -> Succeeded [L l g] - Just gs - | all isRecFldGRE gs - -> Succeeded $ map (L l) gs - _ -> Failed item + doOne :: LIEWrappedName GhcPs -> MaybeErr LookupChildError [LocatedA GlobalRdrElt] + doOne item@(L l r) = + case r of + IEName{} | notNull val_gs -> Succeeded [L l g | g <- val_gs] + IEName{} | notNull typ_gs -> Succeeded [L l g | g <- typ_gs] + IEType{} | notNull typ_gs -> Succeeded [L l g | g <- typ_gs] + IEType{} | (g:_) <- val_gs -> Failed $ LookupChildNonType item g + _ -> Failed $ LookupChildNotFound item + where + fs = (occNameFS . rdrNameOcc . ieWrappedName) r + gs = fromMaybe [] (lookupFsEnv kid_env fs) + (val_gs, typ_gs) = partition (isValNameSpace . greNameSpace) gs -- See Note [Children for duplicate record fields] + kid_env :: FastStringEnv [GlobalRdrElt] kid_env = extendFsEnvList_C (++) emptyFsEnv [(occNameFS (occName x), [x]) | x <- all_kids] @@ -2297,9 +2319,10 @@ DRFPatSynExport for a test of this. -} badImportItemErr - :: ModIface -> ImpDeclSpec -> IE GhcPs -> IsSubordinate + :: ModIface -> ImpDeclSpec -> IE GhcPs + -> IsSubordinateError -> [AvailInfo] - -> TcRn ImportLookupReason + -> TcRn [ImportLookupReason] -- non-empty badImportItemErr iface decl_spec ie sub avails = do patsyns_enabled <- xoptM LangExt.PatternSynonyms expl_ns_enabled <- xoptM LangExt.ExplicitNamespaces @@ -2307,20 +2330,24 @@ badImportItemErr iface decl_spec ie sub avails = do hsc_env <- getTopEnv let rdr_env = mkGlobalRdrEnv $ gresFromAvails hsc_env (Just imp_spec) all_avails - pure (ImportLookupBad (importErrorKind dflags rdr_env expl_ns_enabled) iface decl_spec ie patsyns_enabled) + pure [ImportLookupBad k iface decl_spec ie patsyns_enabled | k <- importErrorKind dflags rdr_env expl_ns_enabled ] where importErrorKind dflags rdr_env expl_ns_enabled | any checkIfTyCon avails = case sub of - IsNotSubordinate -> BadImportAvailTyCon expl_ns_enabled - IsSubordinate {} -> BadImportNotExportedSubordinates unavailableChildren - | any checkIfVarName avails = BadImportAvailVar - | Just con <- find checkIfDataCon avails = BadImportAvailDataCon (availOccName con) - | otherwise = BadImportNotExported suggs + IsNotSubordinate -> [BadImportAvailTyCon expl_ns_enabled] + IsSubordinateError { subordinate_err_parent = gre + , subordinate_err_unavailable = unavailable + , subordinate_err_nontype = nontype } + -> [BadImportNotExportedSubordinates gre unavailable | notNull unavailable] ++ + [BadImportNonTypeSubordinates gre nontype | notNull nontype ] + | any checkIfVarName avails = [BadImportAvailVar] + | Just con <- find checkIfDataCon avails = [BadImportAvailDataCon (availOccName con)] + | otherwise = [BadImportNotExported suggs] where suggs = similar_suggs ++ fieldSelectorSuggestions rdr_env rdr what_look = case sub of - IsNotSubordinate -> WL_TyCon_or_TermVar - IsSubordinate gre -> + IsNotSubordinate -> WL_TyCon_or_TermVar + IsSubordinateError { subordinate_err_parent = gre } -> case greInfo gre of IAmTyCon ClassFlavour -> WL_TyCon_or_TermVar @@ -2359,9 +2386,6 @@ badImportItemErr iface decl_spec ie sub avails = do importedFS = occNameFS $ rdrNameOcc rdr imp_spec = ImpSpec { is_decl = decl_spec, is_item = ImpAll } all_avails = mi_exports iface - unavailableChildren = case ie of - IEThingWith _ _ _ ns _ -> map (rdrNameOcc . ieWrappedName . unLoc) ns - _ -> panic "importedChildren failed pattern match: no children" addDupDeclErr :: NonEmpty GlobalRdrElt -> TcRn () addDupDeclErr gres@(gre :| _) ===================================== compiler/GHC/Tc/Errors/Ppr.hs ===================================== @@ -3305,6 +3305,7 @@ instance Diagnostic TcRnMessage where ++ [ImportSuggestion occ $ CouldAddTypeKeyword mod_name] BadImportAvailDataCon par -> [ImportSuggestion occ $ ImportDataCon (Just (mod_name, patsyns_enabled)) par] BadImportNotExportedSubordinates{} -> noHints + BadImportNonTypeSubordinates{} -> noHints TcRnImportLookup{} -> noHints TcRnUnusedImport{} @@ -5889,15 +5890,30 @@ pprImportLookup = \case where tycon_occ = rdrNameOcc $ ieName ie tycon = parenSymOcc tycon_occ (ppr tycon_occ) - BadImportNotExportedSubordinates ns -> + BadImportNotExportedSubordinates gre unavailable -> withContext - [ text "an item called" <+> quotes sub <+> text "is exported, but it does not export any children" - , text "(constructors, class methods or field names) called" - <+> pprWithCommas (quotes . ppr) ns <> dot + [ what <+> text "called" <+> parent_name <+> text "is exported, but it does not export" + , text "any" <+> what_children <+> text "called" <+> unavailable_names <> dot ] where - sub_occ = rdrNameOcc $ ieName ie - sub = parenSymOcc sub_occ (ppr sub_occ) + parent_name = (quotes . pprPrefixOcc . nameOccName . gre_name) gre + unavailable_names = pprWithCommas (quotes . ppr) unavailable + (what, what_children) = case greInfo gre of + IAmTyCon ClassFlavour -> (text "a class", text "class methods or associated types") + IAmTyCon _ -> (text "a data type", text "constructors or record fields") + _ -> (text "an item", text "children") + BadImportNonTypeSubordinates gre nontype -> + withContext + [ what <+> text "called" <+> parent_name <+> text "is exported," + , sep [ text "but its subordinate" <+> "item" <> plural nontype <+> nontype_names + , isOrAre nontype <+> "not in the type namespace." ] ] + where + parent_name = (quotes . pprPrefixOcc . nameOccName . gre_name) gre + nontype_names = pprWithCommas (quotes . pprPrefixOcc . nameOccName . gre_name) nontype + what = case greInfo gre of + IAmTyCon ClassFlavour -> text "a class" + IAmTyCon _ -> text "a data type" + _ -> text "an item" BadImportAvailDataCon dataType_occ -> withContext [ text "an item called" <+> quotes datacon ===================================== compiler/GHC/Tc/Errors/Types.hs ===================================== @@ -5846,7 +5846,9 @@ data BadImportKind -- @import Data.Maybe (Just)@ instead of @import Data.Maybe (Maybe(Just))@ | BadImportAvailDataCon OccName -- | The parent does not export the given children. - | BadImportNotExportedSubordinates [OccName] + | BadImportNotExportedSubordinates !GlobalRdrElt [FastString] + -- | Incorrect @type@ keyword when importing subordinates that aren't types. + | BadImportNonTypeSubordinates !GlobalRdrElt [GlobalRdrElt] -- | Incorrect @type@ keyword when importing something which isn't a type. | BadImportAvailVar deriving Generic ===================================== compiler/GHC/Types/Error/Codes.hs ===================================== @@ -756,6 +756,7 @@ type family GhcDiagnosticCode c = n | n -> c where GhcDiagnosticCode "BadImportNotExported" = 61689 GhcDiagnosticCode "BadImportAvailDataCon" = 35373 GhcDiagnosticCode "BadImportNotExportedSubordinates" = 10237 + GhcDiagnosticCode "BadImportNonTypeSubordinates" = 51433 GhcDiagnosticCode "BadImportAvailTyCon" = 56449 GhcDiagnosticCode "BadImportAvailVar" = 12112 ===================================== docs/users_guide/9.14.1-notes.rst ===================================== @@ -82,6 +82,9 @@ Compiler :ghc-ticket:`20875`, :ghc-ticket:`21172`, :ghc-ticket:`22257`, :ghc-ticket:`25238`, :ghc-ticket:`25834`. +- The compiler no longer accepts invalid ``type`` namespace specifiers in + subordinate import lists (:ghc-ticket:`22581`). + - A new flag, :ghc-flag:`-Wuseless-specialisations`, controls warnings emitted when GHC determines that a SPECIALISE pragma would have no effect. ===================================== docs/users_guide/exts/explicit_namespaces.rst ===================================== @@ -34,6 +34,20 @@ disambiguate this case, thus: :: module N( f, type (++) ) where data family a ++ b = L a | R b +It is also possible to use the ``type`` namespace specifier in subordinate +import and export lists: +:: + + module N (C(type (#))) where + class C a b where + type a # b + (#) :: a -> b -> (a # b) + module M where + import N as T (C(type (#))) + import N as D (C((#))) + -- (T.#) is the associated type + -- (D.#) is the class method + The extension :extension:`ExplicitNamespaces` is implied by :extension:`TypeOperators` and (for some reason) by :extension:`TypeFamilies`. ===================================== testsuite/tests/driver/RecompExports/RecompExports1.stderr ===================================== @@ -3,6 +3,6 @@ RecompExports1_N.hs:3:25: error: [GHC-61689] RecompExports1_N.hs:3:30: error: [GHC-10237] In the import of ‘RecompExports1_M’: - an item called ‘T’ is exported, but it does not export any children - (constructors, class methods or field names) called ‘Foo’. + a data type called ‘T’ is exported, but it does not export + any constructors or record fields called ‘Foo’. ===================================== testsuite/tests/driver/RecompExports/RecompExports4.stderr ===================================== @@ -1,10 +1,10 @@ RecompExports4_N.hs:3:26: error: [GHC-10237] In the import of ‘RecompExports4_M’: - an item called ‘T’ is exported, but it does not export any children - (constructors, class methods or field names) called ‘fld’. + a data type called ‘T’ is exported, but it does not export + any constructors or record fields called ‘fld’. RecompExports4_N.hs:3:39: error: [GHC-10237] In the import of ‘RecompExports4_M’: - an item called ‘C’ is exported, but it does not export any children - (constructors, class methods or field names) called ‘meth’. + a class called ‘C’ is exported, but it does not export + any class methods or associated types called ‘meth’. ===================================== testsuite/tests/module/T21826.stderr ===================================== @@ -1,4 +1,3 @@ - T21826.hs:3:29: error: [GHC-56449] In the import of ‘Data.Type.Equality’: an item called ‘(~)’ is exported, but it is a type. @@ -24,13 +23,13 @@ T21826.hs:5:21: error: [GHC-61689] T21826.hs:6:21: error: [GHC-10237] In the import of ‘Data.Maybe’: - an item called ‘Maybe’ is exported, but it does not export any children - (constructors, class methods or field names) called ‘Some’. + a data type called ‘Maybe’ is exported, but it does not export + any constructors or record fields called ‘Some’. T21826.hs:7:21: error: [GHC-10237] In the import of ‘Data.Maybe’: - an item called ‘Maybe’ is exported, but it does not export any children - (constructors, class methods or field names) called ‘Some’, ‘Mk’. + a data type called ‘Maybe’ is exported, but it does not export + any constructors or record fields called ‘Some’, ‘Mk’. T21826.hs:8:20: error: [GHC-12112] In the import of ‘Data.List’: @@ -55,3 +54,4 @@ T21826.hs:13:21: error: [GHC-56449] Suggested fix: Add the ‘type’ keyword to the import statement: import Data.Maybe ( type Maybe ) + ===================================== testsuite/tests/module/mod81.stderr ===================================== @@ -1,5 +1,5 @@ - mod81.hs:3:16: error: [GHC-10237] In the import of ‘Prelude’: - an item called ‘Either’ is exported, but it does not export any children - (constructors, class methods or field names) called ‘Foo’. + a data type called ‘Either’ is exported, but it does not export + any constructors or record fields called ‘Foo’. + ===================================== testsuite/tests/module/mod91.stderr ===================================== @@ -1,5 +1,5 @@ - mod91.hs:3:16: error: [GHC-10237] In the import of ‘Prelude’: - an item called ‘Eq’ is exported, but it does not export any children - (constructors, class methods or field names) called ‘eq’. + a class called ‘Eq’ is exported, but it does not export + any class methods or associated types called ‘eq’. + ===================================== testsuite/tests/rename/should_compile/T22581c.hs ===================================== @@ -0,0 +1,13 @@ +{-# LANGUAGE ExplicitNamespaces #-} + +module T22581c where + +import T22581c_helper (K(type T), C(type (#), type Tf, type Df)) + +type T' :: K +type T' = T + +type C' a = C a +type (#.) a b = a # b +type Tf' a = Tf a +type Df' a = Df a \ No newline at end of file ===================================== testsuite/tests/rename/should_compile/T22581c_helper.hs ===================================== @@ -0,0 +1,10 @@ +{-# LANGUAGE TypeData, TypeFamilies #-} + +module T22581c_helper (K(T), C((#), Tf, Df)) where + +type data K = T + +class C a where + type a # b + type Tf a + data Df a \ No newline at end of file ===================================== testsuite/tests/rename/should_compile/T22581d.script ===================================== @@ -0,0 +1,2 @@ +:set -XExplicitNamespaces +import Data.Functor.Product (Product(type Pair)) ===================================== testsuite/tests/rename/should_compile/T22581d.stdout ===================================== @@ -0,0 +1,5 @@ +<interactive>:2:30: error: [GHC-51433] + In the import of ‘Data.Functor.Product’: + a data type called ‘Product’ is exported, + but its subordinate item ‘Pair’ is not in the type namespace. + ===================================== testsuite/tests/rename/should_compile/T25991a.hs ===================================== @@ -0,0 +1,9 @@ +{-# LANGUAGE TypeFamilies, DataKinds #-} + +module T25991a where + +import T25991a_helper as T (C(type (#))) +import T25991a_helper as D (C((#))) + +type S a b = a T.# b +f a b = a D.# b \ No newline at end of file ===================================== testsuite/tests/rename/should_compile/T25991a_helper.hs ===================================== @@ -0,0 +1,7 @@ +{-# LANGUAGE TypeFamilies #-} + +module T25991a_helper (C(..)) where + +class C a b where + type a # b + (#) :: a -> b -> () ===================================== testsuite/tests/rename/should_compile/all.T ===================================== @@ -229,4 +229,7 @@ test('T14032d', normal, compile, ['']) test('T24621_normal', normal, compile, ['']) test('T24621_th', req_th, compile, ['']) test('T24732', normal, compile_and_run, ['-package "base(Prelude, Text.Printf as P\')"']) -test('T25182', [extra_files(['ReExportTuples.hs'])], multimod_compile, ['T25182', '-v0']) \ No newline at end of file +test('T25182', [extra_files(['ReExportTuples.hs'])], multimod_compile, ['T25182', '-v0']) +test('T22581c', [extra_files(['T22581c_helper.hs'])], multimod_compile, ['T22581c', '-v0']) +test('T22581d', combined_output, ghci_script, ['T22581d.script']) +test('T25991a', [extra_files(['T25991a_helper.hs'])], multimod_compile, ['T25991a', '-v0']) ===================================== testsuite/tests/rename/should_fail/T22581a.hs ===================================== @@ -0,0 +1,8 @@ +{-# LANGUAGE ExplicitNamespaces #-} + +module T22581a where + +import T22581a_helper (T(type MkT)) + +t :: T +t = MkT ===================================== testsuite/tests/rename/should_fail/T22581a.stderr ===================================== @@ -0,0 +1,5 @@ +T22581a.hs:5:24: error: [GHC-51433] + In the import of ‘T22581a_helper’: + a data type called ‘T’ is exported, + but its subordinate item ‘MkT’ is not in the type namespace. + ===================================== testsuite/tests/rename/should_fail/T22581a_helper.hs ===================================== @@ -0,0 +1,3 @@ +module T22581a_helper (T(MkT)) where + +data T = MkT ===================================== testsuite/tests/rename/should_fail/T22581b.hs ===================================== @@ -0,0 +1,6 @@ +{-# LANGUAGE ExplicitNamespaces #-} + +module T22581b where + +import T22581b_helper (T(type MkT1, MkT2, MkT3, unT)) + ===================================== testsuite/tests/rename/should_fail/T22581b.stderr ===================================== @@ -0,0 +1,10 @@ +T22581b.hs:5:24: error: [GHC-51433] + In the import of ‘T22581b_helper’: + a data type called ‘T’ is exported, + but its subordinate item ‘MkT1’ is not in the type namespace. + +T22581b.hs:5:24: error: [GHC-10237] + In the import of ‘T22581b_helper’: + a data type called ‘T’ is exported, but it does not export + any constructors or record fields called ‘MkT3’, ‘unT’. + ===================================== testsuite/tests/rename/should_fail/T22581b_helper.hs ===================================== @@ -0,0 +1,3 @@ +module T22581b_helper (T(MkT1, MkT2)) where + +data T = MkT1 | MkT2 ===================================== testsuite/tests/rename/should_fail/T25991b1.hs ===================================== @@ -0,0 +1,7 @@ +{-# LANGUAGE TypeFamilies, DataKinds #-} + +module T25991b1 where + +import T25991b_helper (C((#))) + +type S a b = a # b \ No newline at end of file ===================================== testsuite/tests/rename/should_fail/T25991b2.hs ===================================== @@ -0,0 +1,7 @@ +{-# LANGUAGE TypeFamilies, DataKinds #-} + +module T25991b2 where + +import T25991b_helper (C(type (#))) + +f a b = a # b \ No newline at end of file ===================================== testsuite/tests/rename/should_fail/T25991b_helper.hs ===================================== @@ -0,0 +1,7 @@ +{-# LANGUAGE TypeFamilies #-} + +module T25991b_helper (C(..)) where + +class C a b where + type a # b + (#) :: a -> b -> () ===================================== testsuite/tests/rename/should_fail/T9006.stderr ===================================== @@ -1,5 +1,5 @@ - T9006.hs:3:16: error: [GHC-10237] In the import of ‘T9006a’: - an item called ‘T’ is exported, but it does not export any children - (constructors, class methods or field names) called ‘T’. + a data type called ‘T’ is exported, but it does not export + any constructors or record fields called ‘T’. + ===================================== testsuite/tests/rename/should_fail/all.T ===================================== @@ -237,3 +237,7 @@ test('T25877', [extra_files(['T25877_aux.hs'])], multimod_compile_fail, ['T25877 test('T23501_fail', normal, compile_fail, ['']) test('T23501_fail_ext', normal, compile_fail, ['']) test('T25437', normal, compile_fail, ['']) +test('T22581a', [extra_files(['T22581a_helper.hs'])], multimod_compile_fail, ['T22581a', '-v0']) +test('T22581b', [extra_files(['T22581b_helper.hs'])], multimod_compile_fail, ['T22581b', '-v0']) +test('T25991b1', [extra_files(['T25991b_helper.hs'])], multimod_compile_fail, ['T25991b1', '-v0']) +test('T25991b2', [extra_files(['T25991b_helper.hs'])], multimod_compile_fail, ['T25991b2', '-v0']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b911a6f11acbafe2bd7b0c79cbdb9c5… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b911a6f11acbafe2bd7b0c79cbdb9c5… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/splice-imports-2025] Implement Explicit Level Imports for Template Haskell
by Matthew Pickering (＠mpickering) 25 Apr '25

25 Apr '25

Matthew Pickering pushed to branch wip/splice-imports-2025 at Glasgow Haskell Compiler / GHC Commits: 217caad1 by Matthew Pickering at 2025-04-25T18:58:42+01:00 Implement Explicit Level Imports for Template Haskell This commit introduces the `ExplicitLevelImports` and `ImplicitStagePersistence` language extensions as proposed in GHC Proposal #682. Key Features ------------ - `ExplicitLevelImports` adds two new import modifiers - `splice` and `quote` - allowing precise control over the level at which imported identifiers are available - `ImplicitStagePersistence` (enabled by default) preserves existing path-based cross-stage persistence behavior - `NoImplicitStagePersistence` disables implicit cross-stage persistence, requiring explicit level imports Benefits -------- - Improved compilation performance by reducing unnecessary code generation - Enhanced IDE experience with faster feedback in `-fno-code` mode - Better dependency tracking by distinguishing compile-time and runtime dependencies - Foundation for future cross-compilation improvements This implementation enables the separation of modules needed at compile-time from those needed at runtime, allowing for more efficient compilation pipelines and clearer code organization in projects using Template Haskell. Implementation Notes -------------------- The level which a name is availble at is stored in the 'GRE', in the normal GlobalRdrEnv. The function `greLevels` returns the levels which a specific GRE is imported at. The level information for a 'Name' is computed by `getCurrentAndBindLevel`. The level validity is checked by `checkCrossLevelLifting`. Instances are checked by `checkWellLevelledDFun`, which computes the level an instance by calling `checkWellLevelledInstanceWhat`, which sees what is available at by looking at the module graph. Modifications to downsweep -------------------------- Code generation is now only enabled for modules which are needed at compile time. See the Note [-fno-code mode] for more information. Uniform error messages for level errors --------------------------------------- All error messages to do with levels are now reported uniformly using the `TcRnBadlyStaged` constructor. Error messages are uniformly reported in terms of levels. 0 - top-level 1 - quote level -1 - splice level The only level hard-coded into the compiler is the top-level in GHC.Types.ThLevelIndex.topLevelIndex. Uniformly refer to levels and stages ------------------------------------ There was much confusion about levels vs stages in the compiler. A level is a semantic concept, used by the typechecker to ensure a program can be evaluated in a well-staged manner. A stage is an operational construct, program evaluation proceeds in stages. Deprecate -Wbadly-staged-types ------------------------------ `-Wbadly-staged-types` is deprecated in favour of `-Wbadly-levelled-types`. Lift derivation changed ----------------------- Derived lift instances will now not generate code with expression quotations. Before: ``` data A = A Int deriving Lift => lift (A x) = [| A $(lift x) |] ``` After: ``` lift (A x) = conE 'A `appE` (lift x) ``` This is because if you attempt to derive `Lift` in a module where `NoImplicitStagePersistence` is enabled, you would get an infinite loop where a constructor was attempted to be persisted using the instance you are currently defining. GHC API Changes --------------- The ModuleGraph now contains additional information about the type of the edges (normal, quote or splice) between modules. This is abstracted using the `ModuleGraphEdge` data type. Fixes #25828 ------------------------- Metric Increase: MultiLayerModulesTH_Make ------------------------- - - - - - 265 changed files: - compiler/GHC.hs - compiler/GHC/Data/Graph/Directed/Reachability.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/Downsweep.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Make.hs - compiler/GHC/Driver/MakeFile.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/Iface/Recomp.hs - compiler/GHC/Iface/Tidy.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/Header.hs - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Rename/Env.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Runtime/Loader.hs - compiler/GHC/Tc/Deriv/Generate.hs - compiler/GHC/Tc/Deriv/Utils.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/Splice.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/Plugin.hs - compiler/GHC/Tc/Solver/Dict.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/TyCl/Instance.hs - compiler/GHC/Tc/Types.hs - compiler/GHC/Tc/Types/LclEnv.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Types/TH.hs - compiler/GHC/Tc/Utils/Backpack.hs - compiler/GHC/Tc/Utils/Concrete.hs - compiler/GHC/Tc/Utils/Env.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/Types/Basic.hs - compiler/GHC/Types/Error/Codes.hs - compiler/GHC/Types/Name/Reader.hs - + compiler/GHC/Types/ThLevelIndex.hs - compiler/GHC/Unit/Home/PackageTable.hs - compiler/GHC/Unit/Module/Deps.hs - compiler/GHC/Unit/Module/Graph.hs - compiler/GHC/Unit/Module/Imported.hs - compiler/GHC/Unit/Module/ModSummary.hs - + compiler/GHC/Unit/Module/Stage.hs - compiler/GHC/Unit/Types.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Outputable.hs - compiler/Language/Haskell/Syntax/ImpExp.hs - + compiler/Language/Haskell/Syntax/ImpExp/IsBoot.hs - compiler/ghc.cabal.in - docs/users_guide/exts/control.rst - docs/users_guide/exts/template_haskell.rst - docs/users_guide/phases.rst - docs/users_guide/using-warnings.rst - ghc/GHCi/UI.hs - libraries/base/tests/IO/Makefile - libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs - testsuite/tests/ado/ado004.stderr - testsuite/tests/annotations/should_fail/annfail03.stderr - testsuite/tests/annotations/should_fail/annfail04.stderr - testsuite/tests/annotations/should_fail/annfail06.stderr - testsuite/tests/annotations/should_fail/annfail09.stderr - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/dependent/should_compile/T14729.stderr - testsuite/tests/dependent/should_compile/T15743.stderr - testsuite/tests/dependent/should_compile/T15743e.stderr - testsuite/tests/deriving/should_compile/T14682.stderr - testsuite/tests/determinism/determ021/determ021.stdout - + testsuite/tests/driver/T4437.stdout - testsuite/tests/driver/json2.stderr - testsuite/tests/gadt/T19847a.stderr - testsuite/tests/ghc-api/fixed-nodes/FixedNodes.hs - testsuite/tests/ghc-api/fixed-nodes/ModuleGraphInvariants.hs - testsuite/tests/indexed-types/should_compile/T15711.stderr - testsuite/tests/indexed-types/should_compile/T15852.stderr - testsuite/tests/indexed-types/should_compile/T3017.stderr - testsuite/tests/interface-stability/template-haskell-exports.stdout - testsuite/tests/module/mod185.stderr - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/DumpSemis.stderr - testsuite/tests/parser/should_compile/KindSigs.stderr - testsuite/tests/parser/should_compile/T14189.stderr - testsuite/tests/partial-sigs/should_compile/ADT.stderr - testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr - testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr - testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr - testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr - testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr - testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr - testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr - testsuite/tests/partial-sigs/should_compile/DataFamilyInstanceLHS.stderr - testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr - testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr - testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr - testsuite/tests/partial-sigs/should_compile/Either.stderr - testsuite/tests/partial-sigs/should_compile/EqualityConstraint.stderr - testsuite/tests/partial-sigs/should_compile/Every.stderr - testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr - testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr - testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr - testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr - testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr - testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr - testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr - testsuite/tests/partial-sigs/should_compile/ExtraNumAMROn.stderr - testsuite/tests/partial-sigs/should_compile/Forall1.stderr - testsuite/tests/partial-sigs/should_compile/GenNamed.stderr - testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr - testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr - testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr - testsuite/tests/partial-sigs/should_compile/Meltdown.stderr - testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr - testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr - testsuite/tests/partial-sigs/should_compile/NamedWildcardInDataFamilyInstanceLHS.stderr - testsuite/tests/partial-sigs/should_compile/NamedWildcardInTypeFamilyInstanceLHS.stderr - testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr - testsuite/tests/partial-sigs/should_compile/PatBind.stderr - testsuite/tests/partial-sigs/should_compile/PatBind2.stderr - testsuite/tests/partial-sigs/should_compile/PatternSig.stderr - testsuite/tests/partial-sigs/should_compile/Recursive.stderr - testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr - testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr - testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr - testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr - testsuite/tests/partial-sigs/should_compile/SkipMany.stderr - testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr - testsuite/tests/partial-sigs/should_compile/TypeFamilyInstanceLHS.stderr - testsuite/tests/partial-sigs/should_compile/Uncurry.stderr - testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr - testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr - testsuite/tests/polykinds/T15592.stderr - testsuite/tests/polykinds/T15592b.stderr - testsuite/tests/printer/T18052a.stderr - testsuite/tests/quasiquotation/qq001/qq001.stderr - testsuite/tests/quasiquotation/qq002/qq002.stderr - testsuite/tests/quasiquotation/qq003/qq003.stderr - testsuite/tests/quasiquotation/qq004/qq004.stderr - + testsuite/tests/quotes/T5721.stderr - testsuite/tests/roles/should_compile/Roles1.stderr - testsuite/tests/roles/should_compile/Roles14.stderr - testsuite/tests/roles/should_compile/Roles2.stderr - testsuite/tests/roles/should_compile/Roles3.stderr - testsuite/tests/roles/should_compile/Roles4.stderr - testsuite/tests/roles/should_compile/T8958.stderr - testsuite/tests/showIface/DocsInHiFile1.stdout - testsuite/tests/showIface/DocsInHiFileTH.stdout - testsuite/tests/showIface/HaddockIssue849.stdout - testsuite/tests/showIface/HaddockOpts.stdout - testsuite/tests/showIface/HaddockSpanIssueT24378.stdout - testsuite/tests/showIface/LanguageExts.stdout - testsuite/tests/showIface/MagicHashInHaddocks.stdout - testsuite/tests/showIface/NoExportList.stdout - testsuite/tests/showIface/PragmaDocs.stdout - testsuite/tests/showIface/ReExports.stdout - + testsuite/tests/splice-imports/ClassA.hs - + testsuite/tests/splice-imports/InstanceA.hs - + testsuite/tests/splice-imports/Makefile - + testsuite/tests/splice-imports/SI01.hs - + testsuite/tests/splice-imports/SI01A.hs - + testsuite/tests/splice-imports/SI02.hs - + testsuite/tests/splice-imports/SI03.hs - + testsuite/tests/splice-imports/SI03.stderr - + testsuite/tests/splice-imports/SI04.hs - + testsuite/tests/splice-imports/SI05.hs - + testsuite/tests/splice-imports/SI05.stderr - + testsuite/tests/splice-imports/SI05A.hs - + testsuite/tests/splice-imports/SI06.hs - + testsuite/tests/splice-imports/SI07.hs - + testsuite/tests/splice-imports/SI07.stderr - + testsuite/tests/splice-imports/SI07A.hs - + testsuite/tests/splice-imports/SI08.hs - + testsuite/tests/splice-imports/SI08.stderr - + testsuite/tests/splice-imports/SI08_oneshot.stderr - + testsuite/tests/splice-imports/SI09.hs - + testsuite/tests/splice-imports/SI10.hs - + testsuite/tests/splice-imports/SI13.hs - + testsuite/tests/splice-imports/SI14.hs - + testsuite/tests/splice-imports/SI14.stderr - + testsuite/tests/splice-imports/SI15.hs - + testsuite/tests/splice-imports/SI15.stderr - + testsuite/tests/splice-imports/SI16.hs - + testsuite/tests/splice-imports/SI16.stderr - + testsuite/tests/splice-imports/SI17.hs - + testsuite/tests/splice-imports/SI18.hs - + testsuite/tests/splice-imports/SI18.stderr - + testsuite/tests/splice-imports/SI19.hs - + testsuite/tests/splice-imports/SI19A.hs - + testsuite/tests/splice-imports/SI20.hs - + testsuite/tests/splice-imports/SI20.stderr - + testsuite/tests/splice-imports/SI21.hs - + testsuite/tests/splice-imports/SI21.stderr - + testsuite/tests/splice-imports/SI22.hs - + testsuite/tests/splice-imports/SI22.stderr - + testsuite/tests/splice-imports/SI23.hs - + testsuite/tests/splice-imports/SI23A.hs - + testsuite/tests/splice-imports/SI24.hs - + testsuite/tests/splice-imports/SI25.hs - + testsuite/tests/splice-imports/SI25.stderr - + testsuite/tests/splice-imports/SI25Helper.hs - + testsuite/tests/splice-imports/SI26.hs - + testsuite/tests/splice-imports/SI27.hs - + testsuite/tests/splice-imports/SI27.stderr - + testsuite/tests/splice-imports/SI28.hs - + testsuite/tests/splice-imports/SI28.stderr - + testsuite/tests/splice-imports/SI29.hs - + testsuite/tests/splice-imports/SI29.stderr - + testsuite/tests/splice-imports/SI30.script - + testsuite/tests/splice-imports/SI30.stdout - + testsuite/tests/splice-imports/SI31.script - + testsuite/tests/splice-imports/SI31.stderr - + testsuite/tests/splice-imports/SI32.script - + testsuite/tests/splice-imports/SI32.stdout - + testsuite/tests/splice-imports/SI33.script - + testsuite/tests/splice-imports/SI33.stdout - + testsuite/tests/splice-imports/SI34.hs - + testsuite/tests/splice-imports/SI34.stderr - + testsuite/tests/splice-imports/SI34M1.hs - + testsuite/tests/splice-imports/SI34M2.hs - + testsuite/tests/splice-imports/SI35.hs - + testsuite/tests/splice-imports/SI35A.hs - + testsuite/tests/splice-imports/SI36.hs - + testsuite/tests/splice-imports/SI36.stderr - + testsuite/tests/splice-imports/SI36_A.hs - + testsuite/tests/splice-imports/SI36_B1.hs - + testsuite/tests/splice-imports/SI36_B2.hs - + testsuite/tests/splice-imports/SI36_B3.hs - + testsuite/tests/splice-imports/SI36_C1.hs - + testsuite/tests/splice-imports/SI36_C2.hs - + testsuite/tests/splice-imports/SI36_C3.hs - + testsuite/tests/splice-imports/all.T - testsuite/tests/th/T16976z.stderr - testsuite/tests/th/T17820a.stderr - testsuite/tests/th/T17820b.stderr - testsuite/tests/th/T17820c.stderr - testsuite/tests/th/T17820d.stderr - testsuite/tests/th/T17820e.stderr - testsuite/tests/th/T21547.stderr - testsuite/tests/th/T23829_hasty.stderr - testsuite/tests/th/T23829_hasty_b.stderr - testsuite/tests/th/T23829_tardy.ghc.stderr - testsuite/tests/th/T5795.stderr - testsuite/tests/th/TH_Roles2.stderr - testsuite/tests/typecheck/should_compile/T12763.stderr - testsuite/tests/typecheck/should_compile/T18406b.stderr - testsuite/tests/typecheck/should_compile/T18529.stderr - testsuite/tests/typecheck/should_compile/T21023.stderr - utils/check-exact/ExactPrint.hs - utils/count-deps/Main.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/217caad163283c37fb5560188a56511… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/217caad163283c37fb5560188a56511… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T25968] Move Data ModuleName instance to Language.Haskell.Syntax.Module.Name
by Ben Gamari (＠bgamari) 25 Apr '25

25 Apr '25

Ben Gamari pushed to branch wip/T25968 at Glasgow Haskell Compiler / GHC Commits: 8191cec5 by Ben Gamari at 2025-04-25T13:35:10-04:00 Move Data ModuleName instance to Language.Haskell.Syntax.Module.Name Fixes #25968. - - - - - 2 changed files: - compiler/GHC/Unit/Types.hs - compiler/Language/Haskell/Syntax/Module/Name.hs Changes: ===================================== compiler/GHC/Unit/Types.hs ===================================== @@ -96,7 +96,7 @@ import GHC.Utils.Misc import GHC.Settings.Config (cProjectUnitId) import Control.DeepSeq (NFData(..)) -import Data.Data +import Data.Data (Data(..)) import Data.List (sortBy) import Data.Function import Data.Bifunctor @@ -117,12 +117,6 @@ data GenModule unit = Module } deriving (Eq,Ord,Data,Functor) -instance Data ModuleName where - -- don't traverse? - toConstr _ = abstractConstr "ModuleName" - gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNoRepType "ModuleName" - -- | A Module is a pair of a 'Unit' and a 'ModuleName'. type Module = GenModule Unit ===================================== compiler/Language/Haskell/Syntax/Module/Name.hs ===================================== @@ -3,6 +3,7 @@ module Language.Haskell.Syntax.Module.Name where import Prelude import Data.Char (isAlphaNum) +import Data.Data import Control.DeepSeq import qualified Text.ParserCombinators.ReadP as Parse import System.FilePath @@ -12,6 +13,14 @@ import GHC.Data.FastString -- | A ModuleName is essentially a simple string, e.g. @Data.List@. newtype ModuleName = ModuleName FastString deriving (Show, Eq) +instance Data ModuleName where + -- don't traverse? + toConstr x = constr + where + constr = mkConstr (dataTypeOf x) "{abstract:ModuleName}" [] Prefix + gunfold _ _ = error "gunfold" + dataTypeOf _ = mkNoRepType "ModuleName" + instance Ord ModuleName where nm1 `compare` nm2 = stableModuleNameCmp nm1 nm2 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8191cec5053fe9dbedfdc4ba4eaa04a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8191cec5053fe9dbedfdc4ba4eaa04a… You're receiving this email because of your account on gitlab.haskell.org.

1 0