- ghc-commits - Haskell.org

[Git][ghc/ghc] Pushed new branch wip/python-version-check
by Cheng Shao (＠TerrorJack) 17 Aug '25

17 Aug '25

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

1 0

[Git][ghc/ghc][wip/warning-for-last-and-init] Revert submodules
by Bodigrim (＠Bodigrim) 16 Aug '25

16 Aug '25

Bodigrim pushed to branch wip/warning-for-last-and-init at Glasgow Haskell Compiler / GHC Commits: add564b6 by Andrew Lelechenko at 2025-08-16T23:24:44+01:00 Revert submodules - - - - - 3 changed files: - hadrian/src/Settings/Warnings.hs - utils/hpc - utils/hsc2hs Changes: ===================================== hadrian/src/Settings/Warnings.hs ===================================== @@ -78,6 +78,9 @@ ghcWarningsArgs = do ] , package filepath ? pure [ "-Wno-x-partial" ] + , package hpc ? pure [ "-Wno-x-partial" ] + , package hpcBin ? pure [ "-Wno-x-partial" ] + , package hsc2hs ? pure [ "-Wno-x-partial" ] , package cabal ? pure [ "-Wno-deriving-typeable", "-Wno-incomplete-record-selectors" ] -- The -Wno-incomplete-record-selectors is due to ===================================== utils/hpc ===================================== @@ -1 +1 @@ -Subproject commit dd43f7e139d7a4f4908d1e8af35a75939f763ef1 +Subproject commit 5923da3fe77993b7afc15b5163cffcaa7da6ecf5 ===================================== utils/hsc2hs ===================================== @@ -1 +1 @@ -Subproject commit 2059c961fc28bbfd0cafdbef96d5d21f1d911b53 +Subproject commit fe3990b9f35000427b016a79330d9f195587cad8 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/add564b60f5e9afb8d6ff625558e5b6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/add564b60f5e9afb8d6ff625558e5b6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T23162-spj] 2 commits: Improved error messages from fundep changes
by Simon Peyton Jones (＠simonpj) 16 Aug '25

16 Aug '25

Simon Peyton Jones pushed to branch wip/T23162-spj at Glasgow Haskell Compiler / GHC Commits: 8e2a2e57 by Simon Peyton Jones at 2025-08-16T09:51:36+01:00 Improved error messages from fundep changes - - - - - b8d5945f by Simon Peyton Jones at 2025-08-16T23:18:43+01:00 More wibbles to Outputable - - - - - 16 changed files: - compiler/GHC/Utils/Outputable.hs - testsuite/tests/deriving/should_fail/T3621.stderr - testsuite/tests/indexed-types/should_fail/T9662.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail10.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail13.stderr - testsuite/tests/parser/should_fail/T20654a.stderr - testsuite/tests/partial-sigs/should_fail/T14040a.stderr - testsuite/tests/typecheck/no_skolem_info/T14040.stderr - testsuite/tests/typecheck/should_fail/FD3.stderr - testsuite/tests/typecheck/should_fail/FDsFromGivens2.stderr - testsuite/tests/typecheck/should_fail/T13506.stderr - testsuite/tests/typecheck/should_fail/T19415b.stderr - testsuite/tests/typecheck/should_fail/T5246.stderr - testsuite/tests/typecheck/should_fail/T5978.stderr - testsuite/tests/typecheck/should_fail/T8603.stderr - testsuite/tests/typecheck/should_fail/T9612.stderr Changes: ===================================== compiler/GHC/Utils/Outputable.hs ===================================== @@ -522,20 +522,22 @@ pprDeeper d = SDoc $ \ctx -> case sdocStyle ctx of _ -> runSDoc d ctx --- | Truncate a list that is longer than the default depth +-- | Trim the list to the length of the remaining depth count pprDeeperList :: ([SDoc] -> SDoc) -> [SDoc] -> SDoc pprDeeperList f ds | null ds = f [] | otherwise = SDoc work where - -- Trim the list to the length of the remaining depth count - work ctx@SDC{ sdocStyle=PprUser _ depth _ } - | Just list_elts_to_print + work ctx@SDC{ sdocStyle=PprUser q depth c } + | Just n_remaining <- case depth of DefaultDepth -> Just (sdocDefaultDepth ctx) PartWay n -> Just n AllTheWay -> Nothing - = runSDoc (f (trim list_elts_to_print ds)) ctx + = runSDoc (f (trim n_remaining ds)) + -- Trim the length of the list + (ctx { sdocStyle = PprUser q (PartWay (n_remaining - 1)) c }) + -- ..and go deeper as we step inside the list elements work other_ctx = runSDoc (f ds) other_ctx ===================================== testsuite/tests/deriving/should_fail/T3621.stderr ===================================== @@ -1,15 +1,9 @@ -T3621.hs:24:43: error: [GHC-25897] - • Couldn't match type ‘s’ with ‘state’ - arising from a functional dependency between: - constraint ‘MonadState state (State s)’ - arising from the 'deriving' clause of a data type declaration - instance ‘MonadState s1 (State s1)’ at T3621.hs:21:10-31 - ‘s’ is a rigid type variable bound by - the deriving clause for ‘MonadState state (WrappedState s)’ - at T3621.hs:24:43-58 - ‘state’ is a rigid type variable bound by - the deriving clause for ‘MonadState state (WrappedState s)’ - at T3621.hs:24:43-58 +T3621.hs:24:43: error: [GHC-39999] + • No instance for ‘MonadState state (State s)’ + arising from the 'deriving' clause of a data type declaration + Possible fix: + use a standalone 'deriving instance' declaration, + so you can specify the instance context yourself • When deriving the instance for (MonadState state (WrappedState s)) ===================================== testsuite/tests/indexed-types/should_fail/T9662.stderr ===================================== @@ -1,12 +1,12 @@ T9662.hs:49:8: error: [GHC-25897] - • Couldn't match type ‘n’ with ‘Int’ + • Couldn't match type ‘k’ with ‘Int’ Expected: Exp (((sh :. k) :. m) :. n) -> Exp (((sh :. m) :. n) :. k) Actual: Exp (Tuple (((Atom a0 :. Atom Int) :. Atom Int) :. Atom Int)) -> Exp (Plain (((Unlifted (Atom a0) :. Exp Int) :. Exp Int) :. Exp Int)) - ‘n’ is a rigid type variable bound by + ‘k’ is a rigid type variable bound by the type signature for: test :: forall sh k m n. Shape (((sh :. k) :. m) :. n) -> Shape (((sh :. m) :. n) :. k) ===================================== testsuite/tests/parser/should_fail/RecordDotSyntaxFail10.stderr ===================================== @@ -1,9 +1,9 @@ - -RecordDotSyntaxFail10.hs:40:11: error: [GHC-18872] - • Couldn't match type ‘Int’ with ‘[Char]’ +RecordDotSyntaxFail10.hs:40:11: error: [GHC-39999] + • No instance for ‘HasField "quux" Quux String’ • In the second argument of ‘($)’, namely ‘a {foo.bar.baz.quux}’ In a stmt of a 'do' block: print $ a {foo.bar.baz.quux} In the expression: - do let a = ... + do let a = Foo {foo = Bar {bar = ...}} let quux = "Expecto patronum!" print $ a {foo.bar.baz.quux} + ===================================== testsuite/tests/parser/should_fail/RecordDotSyntaxFail13.stderr ===================================== @@ -1,13 +1,10 @@ - -RecordDotSyntaxFail13.hs:26:11: error: [GHC-18872] - • Couldn't match type ‘Int’ with ‘Foo -> Int’ - arising from a functional dependency between: - constraint ‘HasField "foo" Foo (Foo -> Int)’ - arising from a record update - instance ‘HasField "foo" Foo Int’ - at RecordDotSyntaxFail13.hs:21:10-31 +RecordDotSyntaxFail13.hs:26:11: error: [GHC-39999] + • No instance for ‘HasField "foo" Foo (Foo -> Int)’ + arising from a record update + (maybe you haven't applied a function to enough arguments?) • In the second argument of ‘($)’, namely ‘a {foo}’ In a stmt of a 'do' block: print $ a {foo} In the expression: - do let a = ... + do let a = Foo {foo = 12} print $ a {foo} + ===================================== testsuite/tests/parser/should_fail/T20654a.stderr ===================================== @@ -1,12 +1,10 @@ - -T20654a.hs:7:9: error: [GHC-18872] - • Couldn't match type: forall a. a -> a - with: Int -> Int - arising from a functional dependency between constraints: - ‘?poly::Int -> Int’ - arising from a use of implicit parameter ‘?poly’ at T20654a.hs:7:9-13 - ‘?poly::forall a. a -> a’ - arising from the type signature for: - foo :: (?poly::forall a. a -> a) => Int -> Int at T20654a.hs:6:1-48 +T20654a.hs:7:9: error: [GHC-91416] + • Could not deduce ‘?poly::Int -> Int’ + arising from a use of implicit parameter ‘?poly’ + from the context: ?poly::forall a. a -> a + bound by the type signature for: + foo :: (?poly::forall a. a -> a) => Int -> Int + at T20654a.hs:6:1-48 • In the expression: ?poly x In an equation for ‘foo’: foo x = ?poly x + ===================================== testsuite/tests/partial-sigs/should_fail/T14040a.stderr ===================================== @@ -1,6 +1,6 @@ T14040a.hs:26:46: error: [GHC-46956] - • Couldn't match kind ‘k0’ with ‘WeirdList z’ - Expected kind ‘WeirdList k0’, + • Couldn't match kind ‘k1’ with ‘WeirdList z’ + Expected kind ‘WeirdList k1’, but ‘xs’ has kind ‘WeirdList (WeirdList z)’ because kind variable ‘z’ would escape its scope This (rigid, skolem) kind variable is bound by @@ -24,8 +24,8 @@ T14040a.hs:26:46: error: [GHC-46956] -> p _ wl T14040a.hs:27:27: error: [GHC-46956] - • Couldn't match kind ‘k1’ with ‘z’ - Expected kind ‘WeirdList k1’, + • Couldn't match kind ‘k0’ with ‘z’ + Expected kind ‘WeirdList k0’, but ‘WeirdCons x xs’ has kind ‘WeirdList z’ because kind variable ‘z’ would escape its scope This (rigid, skolem) kind variable is bound by ===================================== testsuite/tests/typecheck/no_skolem_info/T14040.stderr ===================================== @@ -1,6 +1,6 @@ T14040.hs:27:46: error: [GHC-46956] - • Couldn't match kind ‘k0’ with ‘WeirdList z’ - Expected kind ‘WeirdList k0’, + • Couldn't match kind ‘k1’ with ‘WeirdList z’ + Expected kind ‘WeirdList k1’, but ‘xs’ has kind ‘WeirdList (WeirdList z)’ because kind variable ‘z’ would escape its scope This (rigid, skolem) kind variable is bound by @@ -24,8 +24,8 @@ T14040.hs:27:46: error: [GHC-46956] -> p _ wl T14040.hs:28:27: error: [GHC-46956] - • Couldn't match kind ‘k1’ with ‘z’ - Expected kind ‘WeirdList k1’, + • Couldn't match kind ‘k0’ with ‘z’ + Expected kind ‘WeirdList k0’, but ‘WeirdCons x xs’ has kind ‘WeirdList z’ because kind variable ‘z’ would escape its scope This (rigid, skolem) kind variable is bound by ===================================== testsuite/tests/typecheck/should_fail/FD3.stderr ===================================== @@ -1,15 +1,5 @@ - -FD3.hs:15:15: error: [GHC-25897] - • Couldn't match type ‘a’ with ‘(String, a)’ - arising from a functional dependency between: - constraint ‘MkA (String, a) a’ arising from a use of ‘mkA’ - instance ‘MkA a1 a1’ at FD3.hs:12:10-16 - ‘a’ is a rigid type variable bound by - the type signature for: - translate :: forall a. (String, a) -> A a - at FD3.hs:14:1-31 +FD3.hs:15:15: error: [GHC-39999] + • No instance for ‘MkA (String, a) a’ arising from a use of ‘mkA’ • In the expression: mkA a In an equation for ‘translate’: translate a = mkA a - • Relevant bindings include - a :: (String, a) (bound at FD3.hs:15:11) - translate :: (String, a) -> A a (bound at FD3.hs:15:1) + ===================================== testsuite/tests/typecheck/should_fail/FDsFromGivens2.stderr ===================================== @@ -1,13 +1,10 @@ - -FDsFromGivens2.hs:15:15: error: [GHC-18872] - • Couldn't match type ‘Char’ with ‘[a]’ - arising from a functional dependency between constraints: - ‘C Char [a]’ arising from a use of ‘f’ at FDsFromGivens2.hs:15:15 - ‘C Char Char’ - arising from a pattern with constructor: - KCC :: C Char Char => () -> KCC, - in an equation for ‘bar’ at FDsFromGivens2.hs:15:6-10 +FDsFromGivens2.hs:15:15: error: [GHC-39999] + • Could not deduce ‘C Char [a]’ arising from a use of ‘f’ + from the context: C Char Char + bound by a pattern with constructor: + KCC :: C Char Char => () -> KCC, + in an equation for ‘bar’ + at FDsFromGivens2.hs:15:6-10 • In the expression: f In an equation for ‘bar’: bar (KCC _) = f - • Relevant bindings include - bar :: KCC -> a -> a (bound at FDsFromGivens2.hs:15:1) + ===================================== testsuite/tests/typecheck/should_fail/T13506.stderr ===================================== @@ -1,8 +1,6 @@ - -T13506.hs:16:12: error: [GHC-18872] - • Couldn't match type ‘Char’ with ‘()’ - arising from a functional dependency between: - constraint ‘FunDep [Char] ()’ arising from a use of ‘singleton’ - instance ‘FunDep [a] a’ at T13506.hs:5:10-21 +T13506.hs:16:12: error: [GHC-39999] + • No instance for ‘FunDep [Char] ()’ + arising from a use of ‘singleton’ • In the expression: singleton () In an equation for ‘illTyped’: illTyped = singleton () + ===================================== testsuite/tests/typecheck/should_fail/T19415b.stderr ===================================== @@ -1,8 +1,6 @@ - -T19415b.hs:15:8: error: [GHC-18872] - • Couldn't match type ‘Int’ with ‘Char’ - arising from a functional dependency between: - constraint ‘Ping (T a0) (T b) Char’ arising from a use of ‘foo’ - instance ‘Ping (T a) (T b1) Int’ at T19415b.hs:12:10-53 +T19415b.hs:15:8: error: [GHC-39999] + • No instance for ‘Ping (T a0) (T b0) Char’ + arising from a use of ‘foo’ • In the expression: foo 'c' MkT In an equation for ‘loop’: loop = foo 'c' MkT + ===================================== testsuite/tests/typecheck/should_fail/T5246.stderr ===================================== @@ -1,10 +1,9 @@ - -T5246.hs:11:10: error: [GHC-18872] - • Couldn't match type ‘[Char]’ with ‘Int’ - arising from a functional dependency between constraints: - ‘?x::Int’ arising from a use of ‘foo’ at T5246.hs:11:10-12 - ‘?x::String’ - arising from the implicit-parameter binding for ?x at T5246.hs:(10,7)-(11,12) +T5246.hs:11:10: error: [GHC-91416] + • Could not deduce ‘?x::Int’ arising from a use of ‘foo’ + from the context: ?x::String + bound by the implicit-parameter binding for ?x + at T5246.hs:(10,7)-(11,12) • In the expression: foo In the expression: let ?x = "hello" in foo In an equation for ‘bar’: bar = let ?x = "hello" in foo + ===================================== testsuite/tests/typecheck/should_fail/T5978.stderr ===================================== @@ -1,8 +1,5 @@ - -T5978.hs:22:11: error: [GHC-18872] - • Couldn't match type ‘Bool’ with ‘Char’ - arising from a functional dependency between: - constraint ‘C Double Char’ arising from a use of ‘polyBar’ - instance ‘C Double Bool’ at T5978.hs:8:10-22 +T5978.hs:22:11: error: [GHC-39999] + • No instance for ‘C Double Char’ arising from a use of ‘polyBar’ • In the expression: polyBar id monoFoo In an equation for ‘monoBar’: monoBar = polyBar id monoFoo + ===================================== testsuite/tests/typecheck/should_fail/T8603.stderr ===================================== @@ -3,8 +3,8 @@ T8603.hs:33:17: error: [GHC-18872] When matching types m0 :: * -> * [a2] :: * - Expected: [a2] -> StateT s RV a1 - Actual: t0 m0 (StateT s RV a1) + Expected: [a2] -> StateT s RV a0 + Actual: t0 m0 (StateT s RV a0) • The function ‘lift’ is applied to two visible arguments, but its type ‘(Control.Monad.Trans.Class.MonadTrans t, Monad m) => m a -> t m a’ ===================================== testsuite/tests/typecheck/should_fail/T9612.stderr ===================================== @@ -1,11 +1,11 @@ - -T9612.hs:16:9: error: [GHC-18872] - • Couldn't match type: [(Int, a)] - with: (Int, a) - arising from a functional dependency between: - constraint ‘MonadWriter (Int, a) (WriterT [(Int, a)] Identity)’ - arising from a use of ‘tell’ - instance ‘MonadWriter w (WriterT w m)’ at T9612.hs:20:10-59 +T9612.hs:16:9: error: [GHC-39999] + • Could not deduce ‘MonadWriter + (Int, a) (WriterT [(Int, a)] Identity)’ + arising from a use of ‘tell’ + from the context: Eq a + bound by the type signature for: + f :: forall a. Eq a => a -> (Int, a) -> Writer [(Int, a)] (Int, a) + at T9612.hs:13:1-57 • In a stmt of a 'do' block: tell (n, x) In the expression: do tell (n, x) @@ -14,8 +14,4 @@ T9612.hs:16:9: error: [GHC-18872] f y (n, x) = do tell (n, x) return (1, y) - • Relevant bindings include - x :: a (bound at T9612.hs:14:8) - y :: a (bound at T9612.hs:14:3) - f :: a -> (Int, a) -> Writer [(Int, a)] (Int, a) - (bound at T9612.hs:14:1) + View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/164590b57b9bd0ff7f18bb0bef2ed5… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/164590b57b9bd0ff7f18bb0bef2ed5… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/hiddenmodules-uniqset] 2 commits: driver: use UniqSet for hiddenModules in DynFlags/FinderOpts
by Cheng Shao (＠TerrorJack) 16 Aug '25

16 Aug '25

Cheng Shao pushed to branch wip/hiddenmodules-uniqset at Glasgow Haskell Compiler / GHC Commits: fbf8d52b by Cheng Shao at 2025-08-16T19:39:35+02:00 driver: use UniqSet for hiddenModules in DynFlags/FinderOpts This patch replaces Set ModuleName with UniqSet ModuleName in DynFlags.hiddenModules and FinderOpts.finder_hiddenModules for improved efficiency. Co-authored-by: Codex <codex(a)openai.com> - - - - - 96513732 by Cheng Shao at 2025-08-16T19:42:26+02:00 driver: use UniqMap ModuleName in the finder This patch replaces Map ModuleName with UniqMap ModuleName in the finder for improved efficiency. Co-authored-by: Codex <codex(a)openai.com> - - - - - 7 changed files: - compiler/GHC/Driver/Config/Finder.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Make.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/HsToCore/Docs.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Finder/Types.hs Changes: ===================================== compiler/GHC/Driver/Config/Finder.hs ===================================== @@ -9,7 +9,7 @@ import GHC.Driver.DynFlags import GHC.Unit.Finder.Types import GHC.Data.FastString import GHC.Data.OsPath -import qualified Data.Map as Map +import GHC.Types.Unique.Map -- | Create a new 'FinderOpts' from DynFlags. initFinderOpts :: DynFlags -> FinderOpts @@ -22,7 +22,7 @@ initFinderOpts flags = FinderOpts , finder_workingDirectory = fmap unsafeEncodeUtf $ workingDirectory flags , finder_thisPackageName = mkFastString <$> thisPackageName flags , finder_hiddenModules = hiddenModules flags - , finder_reexportedModules = Map.fromList [(known_as, is_as) | ReexportedModule is_as known_as <- reverse (reexportedModules flags)] + , finder_reexportedModules = listToUniqMap [(known_as, is_as) | ReexportedModule is_as known_as <- reverse (reexportedModules flags)] , finder_hieDir = fmap unsafeEncodeUtf $ hieDir flags , finder_hieSuf = unsafeEncodeUtf $ hieSuf flags , finder_hiDir = fmap unsafeEncodeUtf $ hiDir flags ===================================== compiler/GHC/Driver/DynFlags.hs ===================================== @@ -143,6 +143,7 @@ import System.Directory import GHC.Foreign (withCString, peekCString) import qualified Data.Set as Set +import GHC.Types.Unique.Set import qualified GHC.LanguageExtensions as LangExt @@ -261,7 +262,7 @@ data DynFlags = DynFlags { -- Note [Filepaths and Multiple Home Units] workingDirectory :: Maybe FilePath, thisPackageName :: Maybe String, -- ^ What the package is called, use with multiple home units - hiddenModules :: Set.Set ModuleName, + hiddenModules :: !(UniqSet ModuleName), reexportedModules :: [ReexportedModule], -- ways @@ -597,7 +598,7 @@ defaultDynFlags mySettings = workingDirectory = Nothing, thisPackageName = Nothing, - hiddenModules = Set.empty, + hiddenModules = emptyUniqSet, reexportedModules = [], objectDir = Nothing, ===================================== compiler/GHC/Driver/Make.hs ===================================== @@ -109,13 +109,14 @@ import GHC.Unit.Module.ModDetails import qualified Data.Map as Map import qualified Data.Set as Set +import GHC.Types.Unique.Set import Control.Concurrent.MVar import Control.Monad import qualified Control.Monad.Catch as MC import Data.IORef import Data.Maybe -import Data.List (sortOn, groupBy, sortBy) +import Data.List (sort, sortOn, groupBy, sortBy) import qualified Data.List as List import System.FilePath @@ -313,14 +314,15 @@ warnUnknownModules hsc_env dflags mod_graph = do where diag_opts = initDiagOpts dflags - unit_mods = Set.fromList (map ms_mod_name + unit_mods :: UniqSet ModuleName + unit_mods = mkUniqSet (map ms_mod_name (filter (\ms -> ms_unitid ms == homeUnitId_ dflags) (mgModSummaries mod_graph))) reexported_mods = reexportedModules dflags hidden_mods = hiddenModules dflags - hidden_warns = hidden_mods `Set.difference` unit_mods + hidden_warns = hidden_mods `minusUniqSet` unit_mods lookupModule mn = findImportedModule hsc_env mn NoPkgQual @@ -337,7 +339,7 @@ warnUnknownModules hsc_env dflags mod_graph = do final_msgs hidden_warns reexported_warns = unionManyMessages $ - [warn (DriverUnknownHiddenModules (homeUnitId_ dflags) (Set.toList hidden_warns)) | not (Set.null hidden_warns)] + [warn (DriverUnknownHiddenModules (homeUnitId_ dflags) (sort $ nonDetEltsUniqSet hidden_warns)) | not (isEmptyUniqSet hidden_warns)] ++ [warn (DriverUnknownReexportedModules (homeUnitId_ dflags) reexported_warns) | not (null reexported_warns)] -- | Describes which modules of the module graph need to be loaded. ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -293,6 +293,7 @@ import Data.List.NonEmpty (NonEmpty (..)) import qualified Data.List.NonEmpty as NE import qualified Data.Map as Map import qualified Data.Set as Set +import GHC.Types.Unique.Set import Data.Word import System.FilePath import Text.ParserCombinators.ReadP hiding (char) @@ -3153,7 +3154,7 @@ setPackageName p d = d { thisPackageName = Just p } addHiddenModule :: String -> DynP () addHiddenModule p = - upd (\s -> s{ hiddenModules = Set.insert (mkModuleName p) (hiddenModules s) }) + upd (\s -> s{ hiddenModules = addOneToUniqSet (hiddenModules s) (mkModuleName p) }) addReexportedModule :: String -> DynP () addReexportedModule p = ===================================== compiler/GHC/HsToCore/Docs.hs ===================================== @@ -175,7 +175,7 @@ mkDocStructureFromExportList mdl import_avails export_list = moduleExport alias avails = DsiModExport (nubSortNE orig_names) (sortAvails (nubAvails avails)) where - orig_names = M.findWithDefault aliasErr alias aliasMap + orig_names = fromMaybe aliasErr (lookupUniqMap aliasMap alias) aliasErr = error $ "mkDocStructureFromExportList: " ++ (moduleNameString . moduleName) mdl ++ ": Can't find alias " ++ moduleNameString alias @@ -185,9 +185,9 @@ mkDocStructureFromExportList mdl import_avails export_list = NonEmpty.toList -- Map from aliases to true module names. - aliasMap :: Map ModuleName (NonEmpty ModuleName) + aliasMap :: UniqMap ModuleName (NonEmpty ModuleName) aliasMap = - M.fromListWith (S.<>) $ + listToUniqMap_C (S.<>) $ (this_mdl_name, this_mdl_name :| []) : (flip concatMap (M.toList imported) $ \(mdl, imvs) -> [(imv_name imv, moduleName mdl :| []) | imv <- imvs]) ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -65,9 +65,10 @@ import Control.Applicative ((<|>)) import Control.Monad import Data.Time import qualified Data.Map as M +import GHC.Types.Unique.Map import GHC.Driver.Env import GHC.Driver.Config.Finder -import qualified Data.Set as Set +import GHC.Types.Unique.Set import Data.List.NonEmpty ( NonEmpty (..) ) import qualified System.OsPath as OsPath import qualified Data.List.NonEmpty as NE @@ -194,9 +195,9 @@ findImportedModuleNoHsc fc fopts ue mhome_unit mod_name mb_pkg = home_pkg_import (uid, opts) -- If the module is reexported, then look for it as if it was from the perspective -- of that package which reexports it. - | Just real_mod_name <- mod_name `M.lookup` finder_reexportedModules opts = + | Just real_mod_name <- lookupUniqMap (finder_reexportedModules opts) mod_name = findImportedModuleNoHsc fc opts ue (Just $ DefiniteHomeUnit uid Nothing) real_mod_name NoPkgQual - | mod_name `Set.member` finder_hiddenModules opts = + | elementOfUniqSet mod_name (finder_hiddenModules opts) = return (mkHomeHidden uid) | otherwise = findHomePackageModule fc opts uid mod_name @@ -794,4 +795,3 @@ findObjectLinkable mod obj_fn obj_time = pure (Linkable obj_time mod (NE.singleton (DotO obj_fn ModuleObject))) -- We used to look for _stub.o files here, but that was a bug (#706) -- Now GHC merges the stub.o into the main .o (#3687) - ===================================== compiler/GHC/Unit/Finder/Types.hs ===================================== @@ -12,12 +12,13 @@ import GHC.Prelude import GHC.Unit import GHC.Data.OsPath import qualified Data.Map as M +import GHC.Types.Unique.Map import GHC.Fingerprint import GHC.Platform.Ways import GHC.Unit.Env import GHC.Data.FastString -import qualified Data.Set as Set +import GHC.Types.Unique.Set -- | The 'FinderCache' maps modules to the result of -- searching for that module. It records the results of searching for @@ -101,8 +102,8 @@ data FinderOpts = FinderOpts -- that have a similar name. , finder_workingDirectory :: Maybe OsPath , finder_thisPackageName :: Maybe FastString - , finder_hiddenModules :: Set.Set ModuleName - , finder_reexportedModules :: M.Map ModuleName ModuleName -- Reverse mapping, if you are looking for this name then look for this module. + , finder_hiddenModules :: !(UniqSet ModuleName) + , finder_reexportedModules :: !(UniqMap ModuleName ModuleName) -- Reverse mapping, if you are looking for this name then look for this module. , finder_hieDir :: Maybe OsPath , finder_hieSuf :: OsString , finder_hiDir :: Maybe OsPath View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b09b64e884f6f3943d803b0e21540f… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b09b64e884f6f3943d803b0e21540f… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/hiddenmodules-uniqset] driver: use UniqSet for hiddenModules in DynFlags/FinderOpts
by Cheng Shao (＠TerrorJack) 16 Aug '25

16 Aug '25

Cheng Shao pushed to branch wip/hiddenmodules-uniqset at Glasgow Haskell Compiler / GHC Commits: b09b64e8 by Cheng Shao at 2025-08-16T16:38:29+02:00 driver: use UniqSet for hiddenModules in DynFlags/FinderOpts This patch replaces Set ModuleName with UniqSet ModuleName in DynFlags.hiddenModules and FinderOpts.finder_hiddenModules for improved efficiency. Co-authored-by: Codex <codex(a)openai.com> - - - - - 5 changed files: - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Make.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Finder/Types.hs Changes: ===================================== compiler/GHC/Driver/DynFlags.hs ===================================== @@ -143,6 +143,7 @@ import System.Directory import GHC.Foreign (withCString, peekCString) import qualified Data.Set as Set +import GHC.Types.Unique.Set import qualified GHC.LanguageExtensions as LangExt @@ -261,7 +262,7 @@ data DynFlags = DynFlags { -- Note [Filepaths and Multiple Home Units] workingDirectory :: Maybe FilePath, thisPackageName :: Maybe String, -- ^ What the package is called, use with multiple home units - hiddenModules :: Set.Set ModuleName, + hiddenModules :: !(UniqSet ModuleName), reexportedModules :: [ReexportedModule], -- ways @@ -597,7 +598,7 @@ defaultDynFlags mySettings = workingDirectory = Nothing, thisPackageName = Nothing, - hiddenModules = Set.empty, + hiddenModules = emptyUniqSet, reexportedModules = [], objectDir = Nothing, ===================================== compiler/GHC/Driver/Make.hs ===================================== @@ -109,13 +109,14 @@ import GHC.Unit.Module.ModDetails import qualified Data.Map as Map import qualified Data.Set as Set +import GHC.Types.Unique.Set import Control.Concurrent.MVar import Control.Monad import qualified Control.Monad.Catch as MC import Data.IORef import Data.Maybe -import Data.List (sortOn, groupBy, sortBy) +import Data.List (sort, sortOn, groupBy, sortBy) import qualified Data.List as List import System.FilePath @@ -313,14 +314,15 @@ warnUnknownModules hsc_env dflags mod_graph = do where diag_opts = initDiagOpts dflags - unit_mods = Set.fromList (map ms_mod_name + unit_mods :: UniqSet ModuleName + unit_mods = mkUniqSet (map ms_mod_name (filter (\ms -> ms_unitid ms == homeUnitId_ dflags) (mgModSummaries mod_graph))) reexported_mods = reexportedModules dflags hidden_mods = hiddenModules dflags - hidden_warns = hidden_mods `Set.difference` unit_mods + hidden_warns = hidden_mods `minusUniqSet` unit_mods lookupModule mn = findImportedModule hsc_env mn NoPkgQual @@ -337,7 +339,7 @@ warnUnknownModules hsc_env dflags mod_graph = do final_msgs hidden_warns reexported_warns = unionManyMessages $ - [warn (DriverUnknownHiddenModules (homeUnitId_ dflags) (Set.toList hidden_warns)) | not (Set.null hidden_warns)] + [warn (DriverUnknownHiddenModules (homeUnitId_ dflags) (sort $ nonDetEltsUniqSet hidden_warns)) | not (isEmptyUniqSet hidden_warns)] ++ [warn (DriverUnknownReexportedModules (homeUnitId_ dflags) reexported_warns) | not (null reexported_warns)] -- | Describes which modules of the module graph need to be loaded. ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -293,6 +293,7 @@ import Data.List.NonEmpty (NonEmpty (..)) import qualified Data.List.NonEmpty as NE import qualified Data.Map as Map import qualified Data.Set as Set +import GHC.Types.Unique.Set import Data.Word import System.FilePath import Text.ParserCombinators.ReadP hiding (char) @@ -3153,7 +3154,7 @@ setPackageName p d = d { thisPackageName = Just p } addHiddenModule :: String -> DynP () addHiddenModule p = - upd (\s -> s{ hiddenModules = Set.insert (mkModuleName p) (hiddenModules s) }) + upd (\s -> s{ hiddenModules = addOneToUniqSet (hiddenModules s) (mkModuleName p) }) addReexportedModule :: String -> DynP () addReexportedModule p = ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -67,7 +67,7 @@ import Data.Time import qualified Data.Map as M import GHC.Driver.Env import GHC.Driver.Config.Finder -import qualified Data.Set as Set +import GHC.Types.Unique.Set import Data.List.NonEmpty ( NonEmpty (..) ) import qualified System.OsPath as OsPath import qualified Data.List.NonEmpty as NE @@ -196,7 +196,7 @@ findImportedModuleNoHsc fc fopts ue mhome_unit mod_name mb_pkg = -- of that package which reexports it. | Just real_mod_name <- mod_name `M.lookup` finder_reexportedModules opts = findImportedModuleNoHsc fc opts ue (Just $ DefiniteHomeUnit uid Nothing) real_mod_name NoPkgQual - | mod_name `Set.member` finder_hiddenModules opts = + | elementOfUniqSet mod_name (finder_hiddenModules opts) = return (mkHomeHidden uid) | otherwise = findHomePackageModule fc opts uid mod_name @@ -794,4 +794,3 @@ findObjectLinkable mod obj_fn obj_time = pure (Linkable obj_time mod (NE.singleton (DotO obj_fn ModuleObject))) -- We used to look for _stub.o files here, but that was a bug (#706) -- Now GHC merges the stub.o into the main .o (#3687) - ===================================== compiler/GHC/Unit/Finder/Types.hs ===================================== @@ -17,7 +17,7 @@ import GHC.Platform.Ways import GHC.Unit.Env import GHC.Data.FastString -import qualified Data.Set as Set +import GHC.Types.Unique.Set -- | The 'FinderCache' maps modules to the result of -- searching for that module. It records the results of searching for @@ -101,7 +101,7 @@ data FinderOpts = FinderOpts -- that have a similar name. , finder_workingDirectory :: Maybe OsPath , finder_thisPackageName :: Maybe FastString - , finder_hiddenModules :: Set.Set ModuleName + , finder_hiddenModules :: UniqSet ModuleName , finder_reexportedModules :: M.Map ModuleName ModuleName -- Reverse mapping, if you are looking for this name then look for this module. , finder_hieDir :: Maybe OsPath , finder_hieSuf :: OsString View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b09b64e884f6f3943d803b0e21540fa… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b09b64e884f6f3943d803b0e21540fa… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/hiddenmodules-uniqset
by Cheng Shao (＠TerrorJack) 16 Aug '25

16 Aug '25

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

1 0

[Git][ghc/ghc] Pushed new branch wip/printptr-untag-closure
by Cheng Shao (＠TerrorJack) 16 Aug '25

16 Aug '25

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

1 0

[Git][ghc/ghc] Pushed new branch wip/fix-spt-stub
by Cheng Shao (＠TerrorJack) 16 Aug '25

16 Aug '25

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

1 0

[Git][ghc/ghc][wip/symbolizer] 3 commits: compiler: fix closure C type in SPT init code
by Cheng Shao (＠TerrorJack) 16 Aug '25

16 Aug '25

Cheng Shao pushed to branch wip/symbolizer at Glasgow Haskell Compiler / GHC Commits: f38fcd9b by Cheng Shao at 2025-08-16T13:57:20+02:00 compiler: fix closure C type in SPT init code This patch fixes the closure C type in SPT init code to StgClosure, instead of the previously incorrect StgPtr. Having an incorrect C type makes SPT init code not compatible with other foreign stub generation logic, which may also emit their own extern declarations for the same closure symbols and thus will clash with the incorrect prototypes in SPT init code. - - - - - 107feea4 by Cheng Shao at 2025-08-16T13:57:20+02:00 rts: remove libbfd logic - - - - - fd415c7a by Cheng Shao at 2025-08-16T13:57:20+02:00 compiler/rts: add debug symbolizer - - - - - 18 changed files: - + compiler/GHC/Cmm/GenerateDebugSymbolStub.hs - compiler/GHC/Driver/CodeOutput.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Iface/Tidy/StaticPtrTable.hs - compiler/ghc.cabal.in - configure.ac - hadrian/cfg/system.config.in - hadrian/src/Oracles/Flag.hs - hadrian/src/Settings/Packages.hs - − m4/fp_bfd_support.m4 - rts/Printer.c - rts/Printer.h - rts/RtsStartup.c - rts/configure.ac - rts/include/Rts.h - rts/include/rts/Config.h - + rts/include/rts/Debug.h - rts/rts.cabal Changes: ===================================== compiler/GHC/Cmm/GenerateDebugSymbolStub.hs ===================================== @@ -0,0 +1,138 @@ +{-# LANGUAGE MultiWayIf #-} +{-# LANGUAGE Strict #-} + +module GHC.Cmm.GenerateDebugSymbolStub + ( generateDebugSymbolStub, + ) +where + +import Control.Monad +import Control.Monad.IO.Class +import Data.Foldable +import Data.Functor +import Data.IORef +import Data.List (isSuffixOf) +import Data.Map.Strict qualified as Map +import Data.Maybe +import GHC.Cmm +import GHC.Cmm.CLabel +import GHC.Cmm.Dataflow.Label qualified as H +import GHC.Data.FastString +import GHC.Data.Stream (Stream) +import GHC.Data.Stream qualified as Stream +import GHC.Platform +import GHC.Prelude +import GHC.Types.ForeignStubs +import GHC.Unit.Types +import GHC.Utils.Outputable + +generateDebugSymbolStub :: + (MonadIO m) => + Platform -> + Module -> + Stream m RawCmmGroup r -> + Stream m RawCmmGroup (r, CStub) +generateDebugSymbolStub platform this_mod rawcmms0 = do + (lbls_ref, per_group) <- liftIO $ do + lbls_ref <- newIORef Map.empty + let per_group decls = for_ decls per_decl $> decls + per_decl (CmmData _ (CmmStaticsRaw lbl _)) = + liftIO + $ when (externallyVisibleCLabel lbl) + $ modifyIORef' lbls_ref + $ Map.insert lbl (data_label_type lbl) + per_decl (CmmProc h lbl _ _) = case H.mapToList h of + [] -> + liftIO + $ when (externallyVisibleCLabel lbl) + $ modifyIORef' lbls_ref + $ Map.insert lbl (proc_label_type lbl) + hs -> for_ hs $ \(_, CmmStaticsRaw lbl _) -> + liftIO + $ when (externallyVisibleCLabel lbl) + $ modifyIORef' lbls_ref + $ Map.insert lbl (data_label_type lbl) + data_label_type lbl + | "_closure" + `isSuffixOf` str + && not + (str `elem` ["stg_CHARLIKE_closure", "stg_INTLIKE_closure"]) = + Just ("extern StgClosure ", "") + | "_str" `isSuffixOf` str = + Just ("EB_(", ")") + | str + `elem` [ "stg_arg_bitmaps", + "stg_ap_stack_entries", + "stg_stack_save_entries" + ] = + Just ("ERO_(", ")") + | str + `elem` [ "no_break_on_exception", + "stg_scheduler_loop_epoch", + "stg_scheduler_loop_tid" + ] = + Just ("ERW_(", ")") + | str + `elem` [ "stg_gc_prim_p_ll_info", + "stg_gc_prim_pp_ll_info", + "stg_JSVAL_info", + "stg_scheduler_loop_info" + ] = + Just ("extern const StgInfoTable ", "") + | not $ needsCDecl lbl = + Nothing + | "_cc" `isSuffixOf` str = + Just ("extern CostCentre ", "[]") + | "_ccs" `isSuffixOf` str = + Just ("extern CostCentreStack ", "[]") + | "_ipe_buf" `isSuffixOf` str = + Just ("extern IpeBufferListNode ", "") + | otherwise = + Just ("ERW_(", ")") + where + str = + showSDocOneLine defaultSDocContext {sdocStyle = PprCode} + $ pprCLabel platform lbl + proc_label_type _ = Just ("EF_(", ")") + pure (lbls_ref, per_group) + r <- Stream.mapM per_group rawcmms0 + liftIO $ do + lbls <- Map.toList <$> readIORef lbls_ref + let ctor_lbl = mkInitializerStubLabel this_mod $ fsLit "symbolizer" + entries_lbl = + mkInitializerStubLabel this_mod $ fsLit "symbolizer_entries" + ctor_decls = + vcat + [ text lbl_type_l + <> pprCLabel platform lbl + <> text lbl_type_r + <> semi + | (lbl, maybe_lbl_type) <- lbls, + (lbl_type_l, lbl_type_r) <- maybeToList maybe_lbl_type + ] + <> text "static const DebugSymbolEntry " + <> pprCLabel platform entries_lbl + <> text "[] = " + <> braces + ( hsep + $ punctuate + comma + [ braces + $ text ".addr = (void*)&" + <> pprCLabel platform lbl + <> comma + <> text ".sym = " + <> doubleQuotes (pprCLabel platform lbl) + | (lbl, _) <- lbls + ] + ) + <> semi + ctor_body = + text "registerDebugSymbol" + <> parens + (pprCLabel platform entries_lbl <> comma <> int (length lbls)) + <> semi + cstub = case lbls of + [] -> mempty + _ -> initializerCStub platform ctor_lbl ctor_decls ctor_body + pure (r, cstub) ===================================== compiler/GHC/Driver/CodeOutput.hs ===================================== @@ -26,6 +26,7 @@ import GHC.CmmToC ( cmmToC ) import GHC.Cmm.Lint ( cmmLint ) import GHC.Cmm import GHC.Cmm.CLabel +import GHC.Cmm.GenerateDebugSymbolStub import GHC.StgToCmm.CgUtils (CgStream) @@ -76,7 +77,8 @@ import qualified Data.Set as Set codeOutput :: forall a. - Logger + Platform + -> Logger -> TmpFs -> LlvmConfigCache -> DynFlags @@ -95,7 +97,7 @@ codeOutput (Bool{-stub_h_exists-}, Maybe FilePath{-stub_c_exists-}), [(ForeignSrcLang, FilePath)]{-foreign_fps-}, a) -codeOutput logger tmpfs llvm_config dflags unit_state this_mod filenm location genForeignStubs foreign_fps pkg_deps dus0 +codeOutput platform logger tmpfs llvm_config dflags unit_state this_mod filenm location genForeignStubs foreign_fps pkg_deps dus0 cmm_stream = do { @@ -119,10 +121,12 @@ codeOutput logger tmpfs llvm_config dflags unit_state this_mod filenm location g ; return cmm } + debug_cmm_stream = generateDebugSymbolStub platform this_mod linted_cmm_stream + ; let final_stream :: CgStream RawCmmGroup (ForeignStubs, a) final_stream = do - { a <- linted_cmm_stream - ; let stubs = genForeignStubs a + { (a, debug_cstub) <- debug_cmm_stream + ; let stubs = genForeignStubs a `appendStubC` debug_cstub ; emitInitializerDecls this_mod stubs ; return (stubs, a) } ===================================== compiler/GHC/Driver/Main.hs ===================================== @@ -2094,7 +2094,7 @@ hscGenHardCode hsc_env cgguts mod_loc output_filename = do (output_filename, (_stub_h_exists, stub_c_exists), foreign_fps, cmm_cg_infos) <- {-# SCC "codeOutput" #-} - codeOutput logger tmpfs llvm_config dflags (hsc_units hsc_env) this_mod output_filename mod_loc + codeOutput platform logger tmpfs llvm_config dflags (hsc_units hsc_env) this_mod output_filename mod_loc foreign_stubs foreign_files dependencies (initDUniqSupply 'n' 0) rawcmms1 return ( output_filename, stub_c_exists, foreign_fps , Just stg_cg_infos, Just cmm_cg_infos) @@ -2248,7 +2248,7 @@ hscCompileCmmFile hsc_env original_filename filename output_filename = runHsc hs in NoStubs `appendStubC` ip_init | otherwise = NoStubs (_output_filename, (_stub_h_exists, stub_c_exists), _foreign_fps, _caf_infos) - <- codeOutput logger tmpfs llvm_config dflags (hsc_units hsc_env) cmm_mod output_filename no_loc foreign_stubs [] S.empty + <- codeOutput platform logger tmpfs llvm_config dflags (hsc_units hsc_env) cmm_mod output_filename no_loc foreign_stubs [] S.empty dus1 rawCmms return stub_c_exists where ===================================== compiler/GHC/Iface/Tidy/StaticPtrTable.hs ===================================== @@ -17,18 +17,18 @@ -- > static void hs_hpc_init_Main(void) { -- > -- > static StgWord64 k0[2] = {16252233372134256ULL,7370534374096082ULL}; --- > extern StgPtr Main_r2wb_closure; +-- > extern StgClosure Main_r2wb_closure; -- > hs_spt_insert(k0, &Main_r2wb_closure); -- > -- > static StgWord64 k1[2] = {12545634534567898ULL,5409674567544151ULL}; --- > extern StgPtr Main_r2wc_closure; +-- > extern StgClosure Main_r2wc_closure; -- > hs_spt_insert(k1, &Main_r2wc_closure); -- > -- > } -- -- where the constants are fingerprints produced from the static forms. -- --- The linker must find the definitions matching the @extern StgPtr <name>@ +-- The linker must find the definitions matching the @extern StgClosure <name>@ -- declarations. For this to work, the identifiers of static pointers need to be -- exported. This is done in 'GHC.Core.Opt.SetLevels.newLvlVar'. -- @@ -256,7 +256,7 @@ sptModuleInitCode platform this_mod entries init_fn_body = vcat [ text "static StgWord64 k" <> int i <> text "[2] = " <> pprFingerprint fp <> semi - $$ text "extern StgPtr " + $$ text "extern StgClosure " <> (pprCLabel platform $ mkClosureLabel (idName n) (idCafInfo n)) <> semi $$ text "hs_spt_insert" <> parens (hcat $ punctuate comma ===================================== compiler/ghc.cabal.in ===================================== @@ -242,6 +242,7 @@ Library GHC.Cmm.Dataflow.Label GHC.Cmm.DebugBlock GHC.Cmm.Expr + GHC.Cmm.GenerateDebugSymbolStub GHC.Cmm.GenericOpt GHC.Cmm.Graph GHC.Cmm.Info ===================================== configure.ac ===================================== @@ -876,9 +876,6 @@ AC_SUBST([UseLibm]) TargetHasLibm=$UseLibm AC_SUBST(TargetHasLibm) -FP_BFD_FLAG -AC_SUBST([UseLibbfd]) - dnl ################################################################ dnl Check for libraries dnl ################################################################ ===================================== hadrian/cfg/system.config.in ===================================== @@ -120,7 +120,6 @@ use-lib-numa = @UseLibNuma@ use-lib-m = @UseLibm@ use-lib-rt = @UseLibrt@ use-lib-dl = @UseLibdl@ -use-lib-bfd = @UseLibbfd@ use-lib-pthread = @UseLibpthread@ need-libatomic = @NeedLibatomic@ ===================================== hadrian/src/Oracles/Flag.hs ===================================== @@ -36,7 +36,6 @@ data Flag = CrossCompiling | UseLibm | UseLibrt | UseLibdl - | UseLibbfd | UseLibpthread | NeedLibatomic | UseGhcToolchain @@ -60,7 +59,6 @@ flag f = do UseLibm -> "use-lib-m" UseLibrt -> "use-lib-rt" UseLibdl -> "use-lib-dl" - UseLibbfd -> "use-lib-bfd" UseLibpthread -> "use-lib-pthread" NeedLibatomic -> "need-libatomic" UseGhcToolchain -> "use-ghc-toolchain" ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -442,7 +442,6 @@ rtsPackageArgs = package rts ? do , useSystemFfi `cabalFlag` "use-system-libffi" , useLibffiForAdjustors `cabalFlag` "libffi-adjustors" , flag UseLibpthread `cabalFlag` "need-pthread" - , flag UseLibbfd `cabalFlag` "libbfd" , flag NeedLibatomic `cabalFlag` "need-atomic" , flag UseLibdw `cabalFlag` "libdw" , flag UseLibnuma `cabalFlag` "libnuma" ===================================== m4/fp_bfd_support.m4 deleted ===================================== @@ -1,59 +0,0 @@ -# FP_BFD_SUPPORT() -# ---------------------- -# Whether to use libbfd for debugging RTS -# -# Sets: -# UseLibbfd: [YES|NO] -AC_DEFUN([FP_BFD_FLAG], [ - UseLibbfd=NO - AC_ARG_ENABLE(bfd-debug, - [AS_HELP_STRING([--enable-bfd-debug], - [Enable symbol resolution for -debug rts ('+RTS -Di') via binutils' libbfd [default=no]])], - [UseLibbfd=YES], - [UseLibbfd=NO]) -]) - -# FP_WHEN_ENABLED_BFD -# ---------------------- -# Checks for libraries in the default way, which will define various -# `HAVE_*` macros. -AC_DEFUN([FP_WHEN_ENABLED_BFD], [ - # don't pollute general LIBS environment - save_LIBS="$LIBS" - AC_CHECK_HEADERS([bfd.h]) - dnl ** check whether this machine has BFD and libiberty installed (used for debugging) - dnl the order of these tests matters: bfd needs libiberty - AC_CHECK_LIB(iberty, xmalloc) - dnl 'bfd_init' is a rare non-macro in libbfd - AC_CHECK_LIB(bfd, bfd_init) - - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include <bfd.h>]], - [[ - /* mimic our rts/Printer.c */ - bfd* abfd; - const char * name; - char **matching; - - name = "some.executable"; - bfd_init(); - abfd = bfd_openr(name, "default"); - bfd_check_format_matches (abfd, bfd_object, &matching); - { - long storage_needed; - storage_needed = bfd_get_symtab_upper_bound (abfd); - } - { - asymbol **symbol_table; - long number_of_symbols; - symbol_info info; - - number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); - bfd_get_symbol_info(abfd,symbol_table[0],&info); - } - ]])], - [], dnl bfd seems to work - [AC_MSG_ERROR([can't use 'bfd' library])]) - LIBS="$save_LIBS" -]) ===================================== rts/Printer.c ===================================== @@ -43,13 +43,20 @@ static void printStdObjPayload( const StgClosure *obj ); void printPtr( StgPtr p ) { const char *raw; - raw = lookupGHCName(p); + raw = lookupDebugSymbol(p); if (raw != NULL) { - debugBelch("<%s>", raw); - debugBelch("[%p]", p); - } else { - debugBelch("%p", p); + debugBelch("<%s>[%p]", raw, p); + return; } + + StgPtr p0 = (StgPtr)UNTAG_CLOSURE((StgClosure *)p); + raw = lookupDebugSymbol(p0); + if (raw != NULL) { + debugBelch("<%s>[%p+%td]", raw, p0, p - p0); + return; + } + + debugBelch("%p", p); } void printObj( StgClosure *obj ) @@ -853,129 +860,6 @@ void printLargeAndPinnedObjects(void) * Uses symbol table in (unstripped executable) * ------------------------------------------------------------------------*/ -/* -------------------------------------------------------------------------- - * Simple lookup table - * address -> function name - * ------------------------------------------------------------------------*/ - -static HashTable * add_to_fname_table = NULL; - -const char *lookupGHCName( void *addr ) -{ - if (add_to_fname_table == NULL) - return NULL; - - return lookupHashTable(add_to_fname_table, (StgWord)addr); -} - -/* -------------------------------------------------------------------------- - * Symbol table loading - * ------------------------------------------------------------------------*/ - -/* Causing linking trouble on Win32 plats, so I'm - disabling this for now. -*/ -#if defined(USING_LIBBFD) -# define PACKAGE 1 -# define PACKAGE_VERSION 1 -/* Those PACKAGE_* defines are workarounds for bfd: - * https://sourceware.org/bugzilla/show_bug.cgi?id=14243 - * ghc's build system filter PACKAGE_* values out specifically to avoid clashes - * with user's autoconf-based Cabal packages. - * It's a shame <bfd.h> checks for unrelated fields instead of actually used - * macros. - */ -# include <bfd.h> - -/* Fairly ad-hoc piece of code that seems to filter out a lot of - * rubbish like the obj-splitting symbols - */ - -static bool isReal( flagword flags STG_UNUSED, const char *name ) -{ -#if 0 - /* ToDo: make this work on BFD */ - int tp = type & N_TYPE; - if (tp == N_TEXT || tp == N_DATA) { - return (name[0] == '_' && name[1] != '_'); - } else { - return false; - } -#else - if (*name == '\0' || - (name[0] == 'g' && name[1] == 'c' && name[2] == 'c') || - (name[0] == 'c' && name[1] == 'c' && name[2] == '.')) { - return false; - } - return true; -#endif -} - -extern void DEBUG_LoadSymbols( const char *name ) -{ - bfd* abfd; - char **matching; - - bfd_init(); - abfd = bfd_openr(name, "default"); - if (abfd == NULL) { - barf("can't open executable %s to get symbol table", name); - } - if (!bfd_check_format_matches (abfd, bfd_object, &matching)) { - barf("mismatch"); - } - - { - long storage_needed; - asymbol **symbol_table; - long number_of_symbols; - long num_real_syms = 0; - long i; - - storage_needed = bfd_get_symtab_upper_bound (abfd); - - if (storage_needed < 0) { - barf("can't read symbol table"); - } - symbol_table = (asymbol **) stgMallocBytes(storage_needed,"DEBUG_LoadSymbols"); - - number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); - - if (number_of_symbols < 0) { - barf("can't canonicalise symbol table"); - } - - if (add_to_fname_table == NULL) - add_to_fname_table = allocHashTable(); - - for( i = 0; i != number_of_symbols; ++i ) { - symbol_info info; - bfd_get_symbol_info(abfd,symbol_table[i],&info); - if (isReal(info.type, info.name)) { - insertHashTable(add_to_fname_table, - info.value, (void*)info.name); - num_real_syms += 1; - } - } - - IF_DEBUG(interpreter, - debugBelch("Loaded %ld symbols. Of which %ld are real symbols\n", - number_of_symbols, num_real_syms) - ); - - stgFree(symbol_table); - } -} - -#else /* USING_LIBBFD */ - -extern void DEBUG_LoadSymbols( const char *name STG_UNUSED ) -{ - /* nothing, yet */ -} - -#endif /* USING_LIBBFD */ - void findPtr(P_ p, int); /* keep gcc -Wall happy */ int searched = 0; @@ -1080,6 +964,31 @@ void printObj( StgClosure *obj ) #endif /* DEBUG */ +/* -------------------------------------------------------------------------- + * Simple lookup table + * address -> function name + * ------------------------------------------------------------------------*/ + +static HashTable * add_to_fname_table = NULL; + +void registerDebugSymbol( const DebugSymbolEntry entries[], int len ) { + if (add_to_fname_table == NULL) { + add_to_fname_table = allocHashTable(); + } + + for (int i = 0; i < len; ++i) { + insertHashTable(add_to_fname_table, (StgWord)entries[i].addr, entries[i].sym); + } +} + +const char *lookupDebugSymbol( void *addr ) +{ + if (add_to_fname_table == NULL) + return NULL; + + return lookupHashTable(add_to_fname_table, (StgWord)addr); +} + /* ----------------------------------------------------------------------------- Closure types ===================================== rts/Printer.h ===================================== @@ -30,11 +30,9 @@ extern void printStaticObjects ( StgClosure *obj ); extern void printWeakLists ( void ); extern void printLargeAndPinnedObjects ( void ); -extern void DEBUG_LoadSymbols( const char *name ); - -extern const char *lookupGHCName( void *addr ); - extern const char *what_next_strs[]; #endif +extern const char *lookupDebugSymbol( void *addr ); + #include "EndPrivate.h" ===================================== rts/RtsStartup.c ===================================== @@ -15,7 +15,6 @@ #include "RtsFlags.h" #include "RtsUtils.h" #include "Prelude.h" -#include "Printer.h" /* DEBUG_LoadSymbols */ #include "Schedule.h" /* initScheduler */ #include "Stats.h" /* initStats */ #include "STM.h" /* initSTM */ @@ -326,11 +325,6 @@ hs_init_ghc(int *argc, char **argv[], RtsConfig rts_config) } else { setFullProgArgv(*argc,*argv); setupRtsFlags(argc, *argv, rts_config); - -#if defined(DEBUG) - /* load debugging symbols for current binary */ - DEBUG_LoadSymbols((*argv)[0]); -#endif /* DEBUG */ } /* Based on the RTS flags, decide which I/O manager to use. */ ===================================== rts/configure.ac ===================================== @@ -171,8 +171,6 @@ AS_IF( [test "$CABAL_FLAG_libm" = 1], [AC_DEFINE([HAVE_LIBM], [1], [Define to 1 if you need to link with libm])]) -AS_IF([test "$CABAL_FLAG_libbfd" = 1], [FP_WHEN_ENABLED_BFD]) - dnl ################################################################ dnl Check for libraries dnl ################################################################ ===================================== rts/include/Rts.h ===================================== @@ -283,6 +283,7 @@ void _warnFail(const char *filename, unsigned int linenum); #include "rts/StaticPtrTable.h" #include "rts/Libdw.h" #include "rts/LibdwPool.h" +#include "rts/Debug.h" /* Misc stuff without a home */ DLL_IMPORT_RTS extern char **prog_argv; /* so we can get at these from Haskell */ ===================================== rts/include/rts/Config.h ===================================== @@ -19,13 +19,6 @@ #error TICKY_TICKY is incompatible with THREADED_RTS #endif -/* - * Whether the runtime system will use libbfd for debugging purposes. - */ -#if defined(DEBUG) && defined(HAVE_BFD_H) && defined(HAVE_LIBBFD) && !defined(_WIN32) -#define USING_LIBBFD 1 -#endif - /* * We previously only offer the eventlog in a subset of RTS ways; we now * enable it unconditionally to simplify packaging. See #18948. @@ -101,4 +94,3 @@ code. #else #define CACHELINE_SIZE 64 #endif - ===================================== rts/include/rts/Debug.h ===================================== @@ -0,0 +1,18 @@ +/* ----------------------------------------------------------------------------- + * + * (c) The GHC Team, 2017-2025 + * + * Debug API + * + * Do not #include this file directly: #include "Rts.h" instead. + * + * To understand the structure of the RTS headers, see the wiki: + * https://gitlab.haskell.org/ghc/ghc/wikis/commentary/source-tree/includes + * + * -------------------------------------------------------------------------- */ + +#pragma once + +typedef struct { void *addr; const char *sym; } DebugSymbolEntry; + +void registerDebugSymbol( const DebugSymbolEntry entries[], int len ); ===================================== rts/rts.cabal ===================================== @@ -46,9 +46,6 @@ flag libffi-adjustors flag need-pthread default: False manual: True -flag libbfd - default: False - manual: True flag need-atomic default: False manual: True @@ -250,9 +247,6 @@ library if flag(need-atomic) -- for sub-word-sized atomic operations (#19119) extra-libraries: atomic - if flag(libbfd) - -- for debugging - extra-libraries: bfd iberty if flag(libdw) -- for backtraces extra-libraries: elf dw @@ -286,6 +280,7 @@ library rts/Bytecodes.h rts/Config.h rts/Constants.h + rts/Debug.h rts/EventLogFormat.h rts/EventLogWriter.h rts/FileLock.h View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2924dad40c01ccde7278a75207ca7d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2924dad40c01ccde7278a75207ca7d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T21730-import] 2 commits: Rename implicit => generated
by Brandon Chinn (＠brandonchinn178) 15 Aug '25

15 Aug '25

Brandon Chinn pushed to branch wip/T21730-import at Glasgow Haskell Compiler / GHC Commits: 4ac945d9 by Brandon Chinn at 2025-08-15T20:25:18-07:00 Rename implicit => generated - - - - - 17b879b3 by Brandon Chinn at 2025-08-15T20:52:09-07:00 Generated imports beat user imports for minimal imports - - - - - 8 changed files: - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Parser/Header.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Types/Name/Reader.hs - ghc/GHCi/UI.hs - testsuite/tests/parser/should_compile/T7476/T7476.stdout Changes: ===================================== compiler/GHC/Driver/Backpack.hs ===================================== @@ -878,14 +878,14 @@ hsModuleToModSummary home_keys pn hsc_src modname let (src_idecls, ord_idecls) = partition ((== IsBoot) . ideclSource . unLoc) imps implicit_prelude = xopt LangExt.ImplicitPrelude dflags - implicit_imports = mkPrelImports modname implicit_prelude imps + generated_imports = mkPrelImports modname implicit_prelude imps rn_pkg_qual = renameRawPkgQual (hsc_unit_env hsc_env) modname convImport (L _ i) = (convImportLevel (ideclLevelSpec i), rn_pkg_qual (ideclPkgQual i), reLoc $ ideclName i) extra_sig_imports <- liftIO $ findExtraSigImports hsc_env hsc_src modname - let normal_imports = map convImport (implicit_imports ++ ord_idecls) + let normal_imports = map convImport (generated_imports ++ ord_idecls) (implicit_sigs, inst_deps) <- liftIO $ implicitRequirementsShallow hsc_env normal_imports -- So that Finder can find it, even though it doesn't exist... ===================================== compiler/GHC/Hs/ImpExp.hs ===================================== @@ -80,16 +80,18 @@ type instance XCImportDecl GhcTc = DataConCantHappen data XImportDeclPass = XImportDeclPass { ideclAnn :: EpAnn EpAnnImportDecl , ideclSourceText :: SourceText -- Note [Pragma source text] in "GHC.Types.SourceText" - , ideclImplicit :: Bool -- ^ See Note [Implicit imports] + , ideclGenerated :: Bool -- ^ See Note [Generated imports] } deriving (Data) -{- Note [Implicit imports] -~~~~~~~~~~~~~~~~~~~~~~~~~~ +{- Note [Generated imports] +~~~~~~~~~~~~~~~~~~~~~~~~~~~ GHC generates an `ImportDecl` to represent the invisible `import Prelude` that appears in any file that omits `import Prelude`, setting this field to indicate that the import doesn't appear in the -original source. True => implicit import (of Prelude) +original source. + +Plugins may also introduce generated imports. -} type instance XXImportDecl (GhcPass _) = DataConCantHappen @@ -165,8 +167,8 @@ instance (OutputableBndrId p where pp_implicit ext = let implicit = case ghcPass @p of - GhcPs | XImportDeclPass { ideclImplicit = implicit } <- ext -> implicit - GhcRn | XImportDeclPass { ideclImplicit = implicit } <- ext -> implicit + GhcPs | XImportDeclPass { ideclGenerated = implicit } <- ext -> implicit + GhcRn | XImportDeclPass { ideclGenerated = implicit } <- ext -> implicit GhcTc -> dataConCantHappen ext in if implicit then text "(implicit)" else empty ===================================== compiler/GHC/Iface/Ext/Ast.hs ===================================== @@ -348,7 +348,7 @@ enrichHie ts (hsGrp, imports, exports, docs, modName) ev_bs insts tcs tte = modName <- toHie (IEC Export <$> modName) tasts <- toHie $ fmap (BC RegularBind ModuleScope) ts rasts <- processGrp hsGrp - imps <- toHie $ filter (not . ideclImplicit . ideclExt . unLoc) imports + imps <- toHie $ filter (not . ideclGenerated . ideclExt . unLoc) imports exps <- toHie $ fmap (map $ IEC Export . fst) exports docs <- toHie docs -- Add Instance bindings ===================================== compiler/GHC/Parser/Header.hs ===================================== @@ -100,12 +100,12 @@ getImports popts implicit_prelude buf filename source_filename = do mod = mb_mod `orElse` L (noAnnSrcSpan main_loc) mAIN_NAME (src_idecls, ord_idecls) = partition ((== IsBoot) . ideclSource . unLoc) imps - implicit_imports = mkPrelImports (unLoc mod) implicit_prelude imps + generated_imports = mkPrelImports (unLoc mod) implicit_prelude imps convImport (L _ (i :: ImportDecl GhcPs)) = (convImportLevel (ideclLevelSpec i), ideclPkgQual i, reLoc $ ideclName i) convImport_src (L _ (i :: ImportDecl GhcPs)) = (reLoc $ ideclName i) in return (map convImport_src src_idecls - , map convImport (implicit_imports ++ ord_idecls) + , map convImport (generated_imports ++ ord_idecls) , reLoc mod) @@ -146,7 +146,7 @@ mkPrelImports this_mod implicit_prelude import_decls = L loc $ ImportDecl { ideclExt = XImportDeclPass { ideclAnn = noAnn , ideclSourceText = NoSourceText - , ideclImplicit = True -- Implicit! + , ideclGenerated = True -- Generated! }, ideclName = L loc pRELUDE_NAME, ideclPkgQual = NoRawPkgQual, ===================================== compiler/GHC/Rename/Names.hs ===================================== @@ -317,7 +317,7 @@ rnImportDecl this_mod , ideclSafe = mod_safe , ideclLevelSpec = import_level , ideclQualified = qual_style - , ideclExt = XImportDeclPass { ideclImplicit = implicit } + , ideclExt = XImportDeclPass { ideclGenerated = implicit } , ideclAs = as_mod, ideclImportList = imp_details }), import_reason) = setSrcSpanA loc $ do @@ -1922,25 +1922,27 @@ type ImportDeclUsage warnUnusedImportDecls :: TcGblEnv -> HscSource -> RnM () warnUnusedImportDecls gbl_env hsc_src = do { uses <- readMutVar (tcg_used_gres gbl_env) - ; let user_imports = filterOut - (ideclImplicit . ideclExt . unLoc) - (tcg_rn_imports gbl_env) - -- This whole function deals only with *user* imports - -- both for warning about unnecessary ones, and for - -- deciding the minimal ones + ; let imports = tcg_rn_imports gbl_env rdr_env = tcg_rdr_env gbl_env - ; let usage :: [ImportDeclUsage] - usage = findImportUsage user_imports uses + -- We should only warn for unnecessary *user* imports, but deciding + -- minimal imports should take generated imports into account + ; let usageUserImports = findImportUsage (excludeGenerated imports) uses + usageAllImports = findImportUsage imports uses ; traceRn "warnUnusedImportDecls" $ (vcat [ text "Uses:" <+> ppr uses - , text "Import usage" <+> ppr usage]) + , text "Usage all user imports: " <+> ppr usageUserImports + , text "Usage all imports: " <+> ppr usageAllImports]) - ; mapM_ (warnUnusedImport rdr_env) usage + ; mapM_ (warnUnusedImport rdr_env) usageUserImports ; whenGOptM Opt_D_dump_minimal_imports $ - printMinimalImports hsc_src usage } + printMinimalImports hsc_src usageAllImports } + +-- | Exclude generated imports +excludeGenerated :: [LImportDecl GhcRn] -> [LImportDecl GhcRn] +excludeGenerated = filterOut (ideclGenerated . ideclExt . unLoc) findImportUsage :: [LImportDecl GhcRn] -> [GlobalRdrElt] @@ -2208,8 +2210,10 @@ x,y to avoid name-shadowing warnings. Example (#9061) Note [Printing minimal imports] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To print the minimal imports we walk over the user-supplied import -decls, and simply trim their import lists. NB that +To print the minimal imports we walk over all import decls (both user-supplied +and generated), trim their import lists, then filter out generated decls. + +NB that * We do *not* change the 'qualified' or 'as' parts! @@ -2301,7 +2305,7 @@ classifyGREs = partition (not . isRecFldGRE) printMinimalImports :: HscSource -> [ImportDeclUsage] -> RnM () -- See Note [Printing minimal imports] printMinimalImports hsc_src imports_w_usage - = do { imports' <- getMinimalImports imports_w_usage + = do { imports' <- excludeGenerated <$> getMinimalImports imports_w_usage ; this_mod <- getModule ; dflags <- getDynFlags ; liftIO $ withFile (mkFilename dflags this_mod) WriteMode $ \h -> ===================================== compiler/GHC/Types/Name/Reader.hs ===================================== @@ -2041,10 +2041,13 @@ bestImport iss = NE.head $ NE.sortBy best iss -- Less means better -- Unqualified always wins over qualified; then -- import-all wins over import-some; then + -- generated wins over user-specified; then -- earlier declaration wins over later best (ImpSpec { is_item = item1, is_decl = d1 }) (ImpSpec { is_item = item2, is_decl = d2 }) - = (is_qual d1 `compare` is_qual d2) S.<> best_item item1 item2 S.<> + = (is_qual d1 `compare` is_qual d2) S.<> + best_item item1 item2 S.<> + compareGenerated (is_dloc d1) (is_dloc d2) S.<> SrcLoc.leftmost_smallest (is_dloc d1) (is_dloc d2) best_item :: ImpItemSpec -> ImpItemSpec -> Ordering @@ -2055,6 +2058,11 @@ bestImport iss = NE.head $ NE.sortBy best iss (ImpSome { is_explicit = e2 }) = e1 `compare` e2 -- False < True, so if e1 is explicit and e2 is not, we get GT + compareGenerated UnhelpfulSpan{} UnhelpfulSpan{} = EQ + compareGenerated UnhelpfulSpan{} RealSrcSpan{} = LT + compareGenerated RealSrcSpan{} UnhelpfulSpan{} = GT + compareGenerated RealSrcSpan{} RealSrcSpan{} = EQ + {- Note [Choosing the best import declaration] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ When reporting unused import declarations we use the following rules. ===================================== ghc/GHCi/UI.hs ===================================== @@ -527,7 +527,7 @@ interactiveUI config srcs maybe_exprs = do let prelude_import = case simpleImportDecl preludeModuleName of -- Set to True because Prelude is implicitly imported. - impDecl@ImportDecl{ideclExt=ext} -> impDecl{ideclExt = ext{ideclImplicit=True}} + impDecl@ImportDecl{ideclExt=ext} -> impDecl{ideclExt = ext{ideclGenerated=True}} empty_cache <- liftIO newIfaceCache startGHCi (runGHCi srcs maybe_exprs) GHCiState{ progname = default_progname, ===================================== testsuite/tests/parser/should_compile/T7476/T7476.stdout ===================================== @@ -1 +1 @@ -import Control.Applicative ( Applicative(pure), (<**>) ) +import Control.Applicative ( (<**>) ) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bc29a798654f3452a23ce5ea019b88… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bc29a798654f3452a23ce5ea019b88… You're receiving this email because of your account on gitlab.haskell.org.

1 0