- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED] WIP libffi isJsTarget
by Sven Tennie (＠supersven) 21 Sep '25

21 Sep '25

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: d4c43fdc by Sven Tennie at 2025-09-21T09:25:07+02:00 WIP libffi isJsTarget - - - - - 4 changed files: - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Libffi.hs - hadrian/src/Rules/Register.hs - hadrian/src/Rules/Rts.hs Changes: ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -54,7 +54,7 @@ ghcInternalDependencies = do rtsDependencies :: Expr [FilePath] rtsDependencies = do rtsPath <- staged rtsBuildPath - jsTarget <- staged isJsTarget + jsTarget <- succStaged isJsTarget useSystemFfi <- succStaged (buildFlag UseSystemFfi) let -- headers common to native and JS RTS ===================================== hadrian/src/Rules/Libffi.hs ===================================== @@ -69,7 +69,7 @@ dynLibManifest = dynLibManifest' buildRoot -- | Need the (locally built) libffi library. needLibffi :: Stage -> Action () needLibffi stage = do - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) unless jsTarget $ do manifest <- dynLibManifest stage need [manifest] ===================================== hadrian/src/Rules/Register.hs ===================================== @@ -150,7 +150,7 @@ buildConfFinal rs context@Context {..} _conf = do -- Special package cases (these should ideally be rolled into Cabal). when (package == rts) $ do - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) -- If Cabal knew about "generated-headers", we could read them from the -- 'configuredCabal' information, and just "need" them here. ===================================== hadrian/src/Rules/Rts.hs ===================================== @@ -130,7 +130,7 @@ needRtsLibffiTargets :: Stage -> Action [FilePath] needRtsLibffiTargets stage = do rtsPath <- rtsBuildPath stage useSystemFfi <- buildFlag UseSystemFfi (succStage stage) - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) -- Header files (in the rts build dir). let headers = fmap ((rtsPath -/- "include") -/-) libffiHeaderFiles View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d4c43fdca9299ae5ab14cdc41f69006… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d4c43fdca9299ae5ab14cdc41f69006… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED] Fix libffi configuration
by Sven Tennie (＠supersven) 20 Sep '25

20 Sep '25

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: acd8d6ef by Sven Tennie at 2025-09-20T23:21:25+02:00 Fix libffi configuration Libffi needs to be built with the config of the successor stage. - - - - - 7 changed files: - hadrian/src/Builder.hs - hadrian/src/Context.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Libffi.hs - hadrian/src/Rules/Rts.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Packages.hs Changes: ===================================== hadrian/src/Builder.hs ===================================== @@ -241,7 +241,7 @@ instance H.Builder Builder where distro_mingw <- lookupStageBuildConfig "settings-use-distro-mingw" st -- TODO: Check this is the right stage libffi_adjustors <- targetUseLibffiForAdjustors st - use_system_ffi <- buildFlag UseSystemFfi st + use_system_ffi <- buildFlag UseSystemFfi (succStage st) return $ [ unlitPath ] ++ [ root -/- mingwStamp | windowsHost, distro_mingw == "NO" ] ===================================== hadrian/src/Context.hs ===================================== @@ -3,7 +3,7 @@ module Context ( Context (..), vanillaContext, stageContext, -- * Expressions - getStage, staged, getPackage, getWay, getBuildPath, getHieBuildPath, getPackageDbLoc, getStagedTarget, + getStage, staged, succStaged, getPackage, getWay, getBuildPath, getHieBuildPath, getPackageDbLoc, getStagedTarget, -- * Paths contextDir, buildPath, buildDir, pkgInplaceConfig, pkgSetupConfigFile, pkgSetupConfigDir, @@ -32,6 +32,9 @@ getStage = stage <$> getContext staged :: (Stage -> Action a) -> Expr Context b a staged f = getStage >>= \stage -> expr (f stage) +succStaged :: (Stage -> Action a) -> Expr Context b a +succStaged f = getStage >>= \stage -> expr (f (succStage stage)) + getInplace :: Expr Context b Inplace getInplace = iplace <$> getContext ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -55,7 +55,7 @@ rtsDependencies :: Expr [FilePath] rtsDependencies = do rtsPath <- staged rtsBuildPath jsTarget <- staged isJsTarget - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) let -- headers common to native and JS RTS common_headers = ===================================== hadrian/src/Rules/Libffi.hs ===================================== @@ -87,7 +87,7 @@ libffiContext stage = do -- | The name of the library libffiName :: Expr String libffiName = do - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) if useSystemFfi then pure "ffi" else libffiLocalName Nothing @@ -159,7 +159,7 @@ libffiRules :: Rules () libffiRules = do _ <- addOracleCache $ \ (LibffiDynLibs stage) -> do - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) if jsTarget then return [] else readFileLines =<< dynLibManifest stage ===================================== hadrian/src/Rules/Rts.hs ===================================== @@ -54,7 +54,7 @@ withLibffi stage action = needLibffi stage -- See Note [Packaging libffi headers] in GHC.Driver.CodeOutput. copyLibffiHeader :: Stage -> FilePath -> Action () copyLibffiHeader stage header = do - useSystemFfi <- buildFlag UseSystemFfi stage + useSystemFfi <- buildFlag UseSystemFfi (succStage stage) (fromStr, headerDir) <- if useSystemFfi then ("system",) <$> libffiSystemHeaderDir stage else needLibffi stage @@ -129,7 +129,7 @@ rtsLibffiLibrary stage way = do needRtsLibffiTargets :: Stage -> Action [FilePath] needRtsLibffiTargets stage = do rtsPath <- rtsBuildPath stage - useSystemFfi <- buildFlag UseSystemFfi stage + useSystemFfi <- buildFlag UseSystemFfi (succStage stage) jsTarget <- isJsTarget stage -- Header files (in the rts build dir). ===================================== hadrian/src/Settings/Builders/Ghc.hs ===================================== @@ -107,7 +107,7 @@ ghcLinkArgs = builder (Ghc LinkHs) ? do context <- getContext distPath <- expr (Context.distDynDir context) - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) buildPath <- getBuildPath libffiName' <- libffiName debugged <- buildingCompilerStage' . ghcDebugged =<< expr flavour ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -298,7 +298,7 @@ rtsPackageArgs = package rts ? do way <- getWay path <- getBuildPath top <- expr topDirectory - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) ffiIncludeDir <- staged (buildSetting FfiIncludeDir) ffiLibraryDir <- staged (buildSetting FfiLibDir) libdwIncludeDir <- staged (\s -> queryTargetTarget s (Lib.includePath <=< tgtRTSWithLibdw)) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/acd8d6ef06e1c254f32c5b3d6647092… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/acd8d6ef06e1c254f32c5b3d6647092… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED] Fix libffi configuration
by Sven Tennie (＠supersven) 20 Sep '25

20 Sep '25

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: 0b73a45a by Sven Tennie at 2025-09-20T20:41:30+02:00 Fix libffi configuration Libffi needs to be built with the config of the successor stage. - - - - - 7 changed files: - hadrian/src/Builder.hs - hadrian/src/Context.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Libffi.hs - hadrian/src/Rules/Rts.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Packages.hs Changes: ===================================== hadrian/src/Builder.hs ===================================== @@ -241,7 +241,7 @@ instance H.Builder Builder where distro_mingw <- lookupStageBuildConfig "settings-use-distro-mingw" st -- TODO: Check this is the right stage libffi_adjustors <- targetUseLibffiForAdjustors st - use_system_ffi <- buildFlag UseSystemFfi st + use_system_ffi <- buildFlag UseSystemFfi (succStage st) return $ [ unlitPath ] ++ [ root -/- mingwStamp | windowsHost, distro_mingw == "NO" ] ===================================== hadrian/src/Context.hs ===================================== @@ -3,7 +3,7 @@ module Context ( Context (..), vanillaContext, stageContext, -- * Expressions - getStage, staged, getPackage, getWay, getBuildPath, getHieBuildPath, getPackageDbLoc, getStagedTarget, + getStage, staged, succStaged, getPackage, getWay, getBuildPath, getHieBuildPath, getPackageDbLoc, getStagedTarget, -- * Paths contextDir, buildPath, buildDir, pkgInplaceConfig, pkgSetupConfigFile, pkgSetupConfigDir, @@ -32,6 +32,9 @@ getStage = stage <$> getContext staged :: (Stage -> Action a) -> Expr Context b a staged f = getStage >>= \stage -> expr (f stage) +succStaged :: (Stage -> Action a) -> Expr Context b a +succStaged f = getStage >>= \stage -> expr (f (succStage stage)) + getInplace :: Expr Context b Inplace getInplace = iplace <$> getContext ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -55,7 +55,7 @@ rtsDependencies :: Expr [FilePath] rtsDependencies = do rtsPath <- staged rtsBuildPath jsTarget <- staged isJsTarget - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) let -- headers common to native and JS RTS common_headers = ===================================== hadrian/src/Rules/Libffi.hs ===================================== @@ -69,7 +69,7 @@ dynLibManifest = dynLibManifest' buildRoot -- | Need the (locally built) libffi library. needLibffi :: Stage -> Action () needLibffi stage = do - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) unless jsTarget $ do manifest <- dynLibManifest stage need [manifest] @@ -87,7 +87,7 @@ libffiContext stage = do -- | The name of the library libffiName :: Expr String libffiName = do - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) if useSystemFfi then pure "ffi" else libffiLocalName Nothing @@ -159,7 +159,7 @@ libffiRules :: Rules () libffiRules = do _ <- addOracleCache $ \ (LibffiDynLibs stage) -> do - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) if jsTarget then return [] else readFileLines =<< dynLibManifest stage ===================================== hadrian/src/Rules/Rts.hs ===================================== @@ -33,7 +33,7 @@ rtsRules = priority 3 $ do -- Header files -- See Note [Packaging libffi headers] in GHC.Driver.CodeOutput. forM_ libffiHeaderFiles $ \header -> - buildPath -/- "include" -/- header %> copyLibffiHeader stage + buildPath -/- "include" -/- header %> copyLibffiHeader (succStage stage) -- Static libraries. buildPath -/- "libCffi*.a" %> copyLibffiStatic stage @@ -54,7 +54,7 @@ withLibffi stage action = needLibffi stage -- See Note [Packaging libffi headers] in GHC.Driver.CodeOutput. copyLibffiHeader :: Stage -> FilePath -> Action () copyLibffiHeader stage header = do - useSystemFfi <- buildFlag UseSystemFfi stage + useSystemFfi <- buildFlag UseSystemFfi (succStage stage) (fromStr, headerDir) <- if useSystemFfi then ("system",) <$> libffiSystemHeaderDir stage else needLibffi stage @@ -129,7 +129,7 @@ rtsLibffiLibrary stage way = do needRtsLibffiTargets :: Stage -> Action [FilePath] needRtsLibffiTargets stage = do rtsPath <- rtsBuildPath stage - useSystemFfi <- buildFlag UseSystemFfi stage + useSystemFfi <- buildFlag UseSystemFfi (succStage stage) jsTarget <- isJsTarget stage -- Header files (in the rts build dir). ===================================== hadrian/src/Settings/Builders/Ghc.hs ===================================== @@ -107,7 +107,7 @@ ghcLinkArgs = builder (Ghc LinkHs) ? do context <- getContext distPath <- expr (Context.distDynDir context) - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) buildPath <- getBuildPath libffiName' <- libffiName debugged <- buildingCompilerStage' . ghcDebugged =<< expr flavour ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -298,7 +298,7 @@ rtsPackageArgs = package rts ? do way <- getWay path <- getBuildPath top <- expr topDirectory - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) ffiIncludeDir <- staged (buildSetting FfiIncludeDir) ffiLibraryDir <- staged (buildSetting FfiLibDir) libdwIncludeDir <- staged (\s -> queryTargetTarget s (Lib.includePath <=< tgtRTSWithLibdw)) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0b73a45ab14cf4dddc8c359ca6694d9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0b73a45ab14cf4dddc8c359ca6694d9… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] wasm: fix dyld handling for forward declared GOT.func items
by Marge Bot (＠marge-bot) 20 Sep '25

20 Sep '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 867c2675 by Cheng Shao at 2025-09-20T06:49:28-04:00 wasm: fix dyld handling for forward declared GOT.func items This patch fixes wasm shared linker's handling of forward declared GOT.func items, see linked issue for details. Also adds T26430 test to witness the fix. Fixes #26430. Co-authored-by: Codex <codex(a)openai.com> - - - - - 6 changed files: - + testsuite/tests/ghci-wasm/Makefile - + testsuite/tests/ghci-wasm/T26430.hs - + testsuite/tests/ghci-wasm/T26430A.c - + testsuite/tests/ghci-wasm/T26430B.c - + testsuite/tests/ghci-wasm/all.T - utils/jsffi/dyld.mjs Changes: ===================================== testsuite/tests/ghci-wasm/Makefile ===================================== @@ -0,0 +1,7 @@ +TOP=../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +T26430_setup : + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghciWayFlags) -shared T26430A.c -o libT26430A.so + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghciWayFlags) -shared -L. -lT26430A T26430B.c -o libT26430B.so ===================================== testsuite/tests/ghci-wasm/T26430.hs ===================================== @@ -0,0 +1 @@ +foreign import ccall unsafe "baz" main :: IO () ===================================== testsuite/tests/ghci-wasm/T26430A.c ===================================== @@ -0,0 +1,5 @@ +void foo(void); + +void bar(void (*)(void)); + +__attribute__((export_name("baz"))) void baz(void) { bar(foo); } ===================================== testsuite/tests/ghci-wasm/T26430B.c ===================================== @@ -0,0 +1,3 @@ +__attribute__((export_name("foo"))) void foo(void) {} + +__attribute__((export_name("bar"))) void bar(void (*f)(void)) { f(); } ===================================== testsuite/tests/ghci-wasm/all.T ===================================== @@ -0,0 +1,12 @@ +setTestOpts([ + unless(arch('wasm32'), skip), + only_ways(['ghci', 'ghci-opt']), + extra_ways(['ghci', 'ghci-opt']) +]) + +test('T26430', [ + extra_files(['T26430A.c', 'T26430B.c']), + pre_cmd('$MAKE -s --no-print-directory T26430_setup ghciWayFlags=' + config.ghci_way_flags), + extra_hc_opts('-L. -lT26430B')] +, compile_and_run, [''] +) ===================================== utils/jsffi/dyld.mjs ===================================== @@ -1013,10 +1013,13 @@ class DyLD { // anything, if it's required later a GOT.func entry will be // created on demand. if (this.#gotFunc[k]) { - // ghc-prim/ghc-internal may export functions imported by - // rts - console.assert(this.#gotFunc[k].value === DyLD.#poison); - this.#table.set(this.#gotFunc[k].value, v); + const got = this.#gotFunc[k]; + if (got.value === DyLD.#poison) { + const idx = this.#table.grow(1, v); + got.value = idx; + } else { + this.#table.set(got.value, v); + } } continue; } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/867c26755e8855c6df949e65df0c2ae… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/867c26755e8855c6df949e65df0c2ae… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Fix keyword in ExplicitNamespaces error message (#26418)
by Marge Bot (＠marge-bot) 20 Sep '25

20 Sep '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 4a8fed75 by Vladislav Zavialov at 2025-09-20T06:48:47-04:00 Fix keyword in ExplicitNamespaces error message (#26418) Consider this module header and the resulting error: {-# LANGUAGE NoExplicitNamespaces #-} module T26418 (data HeadC) where -- error: [GHC-47007] -- Illegal keyword 'type' Previously, the error message would mention 'type' (as shown above), even though the user wrote 'data'. This has now been fixed. The error location has also been corrected: it is now reported at the keyword position rather than at the position of the associated import/export item. - - - - - 9 changed files: - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/Types.hs - testsuite/tests/parser/should_fail/T16270h.stderr - + testsuite/tests/parser/should_fail/T26418.hs - + testsuite/tests/parser/should_fail/T26418.stderr - testsuite/tests/parser/should_fail/all.T Changes: ===================================== compiler/GHC/Parser.y ===================================== @@ -1078,11 +1078,11 @@ qcname_ext_w_wildcard :: { LocatedA ImpExpQcSpec } | '..' { sL1a $1 (ImpExpQcWildcard (epTok $1) NoEpTok) } qcname_ext :: { LocatedA ImpExpQcSpec } - : qcname { sL1a $1 (ImpExpQcName $1) } - | 'type' oqtycon {% do { n <- mkTypeImpExp $2 - ; return $ sLLa $1 $> (ImpExpQcType (epTok $1) n) }} - | 'data' qvarcon {% do { n <- mkDataImpExp $2 - ; return $ sLLa $1 $> (ImpExpQcData (epTok $1) n) }} + : qcname { sL1a $1 (mkPlainImpExp $1) } + | 'type' oqtycon {% do { imp_exp <- mkTypeImpExp (epTok $1) $2 + ; return $ sLLa $1 $> imp_exp }} + | 'data' qvarcon {% do { imp_exp <- mkDataImpExp (epTok $1) $2 + ; return $ sLLa $1 $> imp_exp }} qcname :: { LocatedN RdrName } -- Variable or type constructor : qvar { $1 } -- Things which look like functions ===================================== compiler/GHC/Parser/Errors/Ppr.hs ===================================== @@ -273,9 +273,14 @@ instance Diagnostic PsMessage where 2 (pprWithCommas ppr vs) , text "See https://gitlab.haskell.org/ghc/ghc/issues/16754 for details." ] - PsErrIllegalExplicitNamespace + PsErrIllegalExplicitNamespace kw -> mkSimpleDecorated $ - text "Illegal keyword 'type'" + text "Illegal keyword" <+> quotes kw_doc + where + kw_doc = case kw of + ExplicitTypeNamespace{} -> text "type" + ExplicitDataNamespace{} -> text "data" + PsErrUnallowedPragma prag -> mkSimpleDecorated $ @@ -619,7 +624,7 @@ instance Diagnostic PsMessage where PsErrNoSingleWhereBindInPatSynDecl{} -> ErrorWithoutFlag PsErrDeclSpliceNotAtTopLevel{} -> ErrorWithoutFlag PsErrMultipleNamesInStandaloneKindSignature{} -> ErrorWithoutFlag - PsErrIllegalExplicitNamespace -> ErrorWithoutFlag + PsErrIllegalExplicitNamespace{} -> ErrorWithoutFlag PsErrUnallowedPragma{} -> ErrorWithoutFlag PsErrImportPostQualified -> ErrorWithoutFlag PsErrImportQualifiedTwice -> ErrorWithoutFlag @@ -759,7 +764,7 @@ instance Diagnostic PsMessage where PsErrNoSingleWhereBindInPatSynDecl{} -> noHints PsErrDeclSpliceNotAtTopLevel{} -> noHints PsErrMultipleNamesInStandaloneKindSignature{} -> noHints - PsErrIllegalExplicitNamespace -> [suggestExtension LangExt.ExplicitNamespaces] + PsErrIllegalExplicitNamespace{} -> [suggestExtension LangExt.ExplicitNamespaces] PsErrUnallowedPragma{} -> noHints PsErrImportPostQualified -> [suggestExtension LangExt.ImportQualifiedPost] PsErrImportQualifiedTwice -> noHints ===================================== compiler/GHC/Parser/Errors/Types.hs ===================================== @@ -214,7 +214,7 @@ data PsMessage | PsErrImportPostQualified -- | Explicit namespace keyword without 'ExplicitNamespaces' - | PsErrIllegalExplicitNamespace + | PsErrIllegalExplicitNamespace !ExplicitNamespaceKeyword -- | Expecting a type constructor but found a variable | PsErrVarForTyCon !RdrName ===================================== compiler/GHC/Parser/PostProcess.hs ===================================== @@ -79,6 +79,7 @@ module GHC.Parser.PostProcess ( ImpExpSubSpec(..), ImpExpQcSpec(..), mkModuleImpExp, + mkPlainImpExp, mkTypeImpExp, mkDataImpExp, mkImpExpSubSpec, @@ -3241,9 +3242,7 @@ data ImpExpSubSpec = ImpExpAbs | ImpExpList [LocatedA ImpExpQcSpec] | ImpExpAllWith [LocatedA ImpExpQcSpec] -data ImpExpQcSpec = ImpExpQcName (LocatedN RdrName) - | ImpExpQcType (EpToken "type") (LocatedN RdrName) - | ImpExpQcData (EpToken "data") (LocatedN RdrName) +data ImpExpQcSpec = ImpExpQcName (Maybe ExplicitNamespaceKeyword) (LocatedN RdrName) | ImpExpQcWildcard (EpToken "..") (EpToken ",") mkModuleImpExp :: Maybe (LWarningTxt GhcPs) -> (EpToken "(", EpToken ")") -> LocatedA ImpExpQcSpec @@ -3287,30 +3286,37 @@ mkModuleImpExp warning (top, tcp) (L l specname) subs = do (PsErrVarForTyCon name) else return $ ieNameFromSpec specname - ieNameVal (ImpExpQcName ln) = unLoc ln - ieNameVal (ImpExpQcType _ ln) = unLoc ln - ieNameVal (ImpExpQcData _ ln) = unLoc ln + ieNameVal (ImpExpQcName _ ln) = unLoc ln ieNameVal ImpExpQcWildcard{} = panic "ieNameVal got wildcard" ieNameFromSpec :: ImpExpQcSpec -> IEWrappedName GhcPs - ieNameFromSpec (ImpExpQcName (L l n)) = IEName noExtField (L l n) - ieNameFromSpec (ImpExpQcType r (L l n)) = IEType r (L l n) - ieNameFromSpec (ImpExpQcData r (L l n)) = IEData r (L l n) - ieNameFromSpec ImpExpQcWildcard{} = panic "ieName got wildcard" + ieNameFromSpec (ImpExpQcName m_kw name) = case m_kw of + Nothing -> IEName noExtField name + Just (ExplicitTypeNamespace tok) -> IEType tok name + Just (ExplicitDataNamespace tok) -> IEData tok name + ieNameFromSpec ImpExpQcWildcard{} = panic "ieNameFromSpec got wildcard" wrapped = map (fmap ieNameFromSpec) -mkTypeImpExp :: LocatedN RdrName -- TcCls or Var name space - -> P (LocatedN RdrName) -mkTypeImpExp name = - do requireExplicitNamespaces (getLocA name) - return (fmap (`setRdrNameSpace` tcClsName) name) +mkPlainImpExp :: LocatedN RdrName -> ImpExpQcSpec +mkPlainImpExp name = ImpExpQcName Nothing name -mkDataImpExp :: LocatedN RdrName - -> P (LocatedN RdrName) -mkDataImpExp name = - do requireExplicitNamespaces (getLocA name) - return name +mkTypeImpExp :: EpToken "type" + -> LocatedN RdrName -- TcCls or Var name space + -> P ImpExpQcSpec +mkTypeImpExp tok name = do + let name' = fmap (`setRdrNameSpace` tcClsName) name + ns_kw = ExplicitTypeNamespace tok + requireExplicitNamespaces ns_kw + return (ImpExpQcName (Just ns_kw) name') + +mkDataImpExp :: EpToken "data" + -> LocatedN RdrName + -> P ImpExpQcSpec +mkDataImpExp tok name = do + let ns_kw = ExplicitDataNamespace tok + requireExplicitNamespaces ns_kw + return (ImpExpQcName (Just ns_kw) name) checkImportSpec :: LocatedLI [LIE GhcPs] -> P (LocatedLI [LIE GhcPs]) checkImportSpec ie@(L _ specs) = @@ -3368,11 +3374,15 @@ failOpFewArgs (L loc op) = ; addFatalError $ mkPlainErrorMsgEnvelope (locA loc) $ (PsErrOpFewArgs is_star_type op) } -requireExplicitNamespaces :: MonadP m => SrcSpan -> m () -requireExplicitNamespaces l = do +requireExplicitNamespaces :: MonadP m => ExplicitNamespaceKeyword -> m () +requireExplicitNamespaces kw = do allowed <- getBit ExplicitNamespacesBit unless allowed $ - addError $ mkPlainErrorMsgEnvelope l PsErrIllegalExplicitNamespace + addError $ mkPlainErrorMsgEnvelope loc $ PsErrIllegalExplicitNamespace kw + where + loc = case kw of + ExplicitTypeNamespace tok -> getEpTokenSrcSpan tok + ExplicitDataNamespace tok -> getEpTokenSrcSpan tok warnPatternNamespaceSpecifier :: MonadP m => SrcSpan -> m () warnPatternNamespaceSpecifier l = do ===================================== compiler/GHC/Parser/Types.hs ===================================== @@ -8,6 +8,7 @@ module GHC.Parser.Types , pprSumOrTuple , PatBuilder(..) , DataConBuilder(..) + , ExplicitNamespaceKeyword(..) ) where @@ -111,3 +112,7 @@ instance Outputable DataConBuilder where ppr lhs <+> ppr data_con <+> ppr rhs type instance Anno [LocatedA (StmtLR GhcPs GhcPs (LocatedA (PatBuilder GhcPs)))] = SrcSpanAnnLW + +data ExplicitNamespaceKeyword + = ExplicitTypeNamespace !(EpToken "type") + | ExplicitDataNamespace !(EpToken "data") \ No newline at end of file ===================================== testsuite/tests/parser/should_fail/T16270h.stderr ===================================== @@ -1,6 +1,5 @@ - -T16270h.hs:8:22: error: [GHC-47007] - Illegal keyword 'type' +T16270h.hs:8:17: error: [GHC-47007] + Illegal keyword ‘type’ Suggested fix: Perhaps you intended to use the ‘ExplicitNamespaces’ extension (implied by ‘TypeFamilies’ and ‘TypeOperators’) @@ -11,3 +10,4 @@ T16270h.hs:10:8: error: [GHC-21926] T16270h.hs:11:8: error: [GHC-21926] Parse error: ‘pkg!’ Version number or non-alphanumeric character in package name + ===================================== testsuite/tests/parser/should_fail/T26418.hs ===================================== @@ -0,0 +1,9 @@ +{-# LANGUAGE PatternSynonyms #-} +{-# LANGUAGE NoExplicitNamespaces #-} + +module T26418 (data HeadC) where + +pattern HeadC :: forall a. a -> [a] +pattern HeadC x <- x:_xs where + HeadC x = [x] + ===================================== testsuite/tests/parser/should_fail/T26418.stderr ===================================== @@ -0,0 +1,5 @@ +T26418.hs:4:16: error: [GHC-47007] + Illegal keyword ‘data’ + Suggested fix: + Perhaps you intended to use the ‘ExplicitNamespaces’ extension (implied by ‘TypeFamilies’ and ‘TypeOperators’) + ===================================== testsuite/tests/parser/should_fail/all.T ===================================== @@ -241,3 +241,4 @@ test('T25258a', normal, compile_fail, ['']) test('T25258b', normal, compile_fail, ['']) test('T25258c', normal, compile_fail, ['']) test('T25530', normal, compile_fail, ['']) +test('T26418', normal, compile_fail, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4a8fed75e2094f9ae2af27bf8629887… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4a8fed75e2094f9ae2af27bf8629887… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] compiler: move Binary instance of Map to GHC.Utils.Binary
by Marge Bot (＠marge-bot) 20 Sep '25

20 Sep '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 8b0940db by Cheng Shao at 2025-09-20T06:48:05-04:00 compiler: move Binary instance of Map to GHC.Utils.Binary This patch moves `Binary` instance of `Map` from `haddock-api` to `GHC.Utils.Binary`. This also allows us to remove a redundant instance defined for `NameEntityInfo`, which is a type synonym for `Map`. - - - - - 3 changed files: - compiler/GHC/Iface/Ext/Types.hs - compiler/GHC/Utils/Binary.hs - utils/haddock/haddock-api/src/Haddock/InterfaceFile.hs Changes: ===================================== compiler/GHC/Iface/Ext/Types.hs ===================================== @@ -96,10 +96,6 @@ data HieFile = HieFile type NameEntityInfo = M.Map Name (S.Set EntityInfo) -instance Binary NameEntityInfo where - put_ bh m = put_ bh $ M.toList m - get bh = fmap M.fromList (get bh) - instance Binary HieFile where put_ bh hf = do put_ bh $ hie_hs_file hf ===================================== compiler/GHC/Utils/Binary.hs ===================================== @@ -1965,6 +1965,13 @@ instance (Binary v) => Binary (IntMap v) where put_ bh m = put_ bh (IntMap.toAscList m) get bh = IntMap.fromAscList <$> get bh +instance (Ord k, Binary k, Binary v) => Binary (Map k v) where + put_ bh m = put_ bh $ Map.toList m + -- Unfortunately, we can't use fromAscList, since k is often + -- instantiated to Name which has a non-deterministic Ord instance + -- that only compares the Uniques, and the Uniques are likely + -- changed when deserializing! + get bh = Map.fromList <$> get bh {- Note [FingerprintWithValue] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== utils/haddock/haddock-api/src/Haddock/InterfaceFile.hs ===================================== @@ -40,7 +40,6 @@ import Data.Coerce (coerce) import Data.Function ((&)) import Data.IORef import Data.Map (Map) -import qualified Data.Map as Map import Data.Version import Data.Word import GHC hiding (NoLink) @@ -316,10 +315,6 @@ data BinDictionary = BinDictionary ------------------------------------------------------------------------------- -instance (Ord k, Binary k, Binary v) => Binary (Map k v) where - put_ bh m = put_ bh (Map.toList m) - get bh = fmap (Map.fromList) (get bh) - instance Binary PackageInfo where put_ bh PackageInfo{piPackageName, piPackageVersion} = do put_ bh (unPackageName piPackageName) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8b0940db86552f322834ea52e3cf048… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8b0940db86552f322834ea52e3cf048… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 3 commits: compiler: move Binary instance of Map to GHC.Utils.Binary
by Marge Bot (＠marge-bot) 20 Sep '25

20 Sep '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 51eef642 by Cheng Shao at 2025-09-20T00:07:29-04:00 compiler: move Binary instance of Map to GHC.Utils.Binary This patch moves `Binary` instance of `Map` from `haddock-api` to `GHC.Utils.Binary`. This also allows us to remove a redundant instance defined for `NameEntityInfo`, which is a type synonym for `Map`. - - - - - 347d2364 by Vladislav Zavialov at 2025-09-20T00:07:31-04:00 Fix keyword in ExplicitNamespaces error message (#26418) Consider this module header and the resulting error: {-# LANGUAGE NoExplicitNamespaces #-} module T26418 (data HeadC) where -- error: [GHC-47007] -- Illegal keyword 'type' Previously, the error message would mention 'type' (as shown above), even though the user wrote 'data'. This has now been fixed. The error location has also been corrected: it is now reported at the keyword position rather than at the position of the associated import/export item. - - - - - b5acbab6 by Cheng Shao at 2025-09-20T00:07:31-04:00 wasm: fix dyld handling for forward declared GOT.func items This patch fixes wasm shared linker's handling of forward declared GOT.func items, see linked issue for details. Also adds T26430 test to witness the fix. Fixes #26430. Co-authored-by: Codex <codex(a)openai.com> - - - - - 18 changed files: - compiler/GHC/Iface/Ext/Types.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/Types.hs - compiler/GHC/Utils/Binary.hs - + testsuite/tests/ghci-wasm/Makefile - + testsuite/tests/ghci-wasm/T26430.hs - + testsuite/tests/ghci-wasm/T26430A.c - + testsuite/tests/ghci-wasm/T26430B.c - + testsuite/tests/ghci-wasm/all.T - testsuite/tests/parser/should_fail/T16270h.stderr - + testsuite/tests/parser/should_fail/T26418.hs - + testsuite/tests/parser/should_fail/T26418.stderr - testsuite/tests/parser/should_fail/all.T - utils/haddock/haddock-api/src/Haddock/InterfaceFile.hs - utils/jsffi/dyld.mjs Changes: ===================================== compiler/GHC/Iface/Ext/Types.hs ===================================== @@ -96,10 +96,6 @@ data HieFile = HieFile type NameEntityInfo = M.Map Name (S.Set EntityInfo) -instance Binary NameEntityInfo where - put_ bh m = put_ bh $ M.toList m - get bh = fmap M.fromList (get bh) - instance Binary HieFile where put_ bh hf = do put_ bh $ hie_hs_file hf ===================================== compiler/GHC/Parser.y ===================================== @@ -1078,11 +1078,11 @@ qcname_ext_w_wildcard :: { LocatedA ImpExpQcSpec } | '..' { sL1a $1 (ImpExpQcWildcard (epTok $1) NoEpTok) } qcname_ext :: { LocatedA ImpExpQcSpec } - : qcname { sL1a $1 (ImpExpQcName $1) } - | 'type' oqtycon {% do { n <- mkTypeImpExp $2 - ; return $ sLLa $1 $> (ImpExpQcType (epTok $1) n) }} - | 'data' qvarcon {% do { n <- mkDataImpExp $2 - ; return $ sLLa $1 $> (ImpExpQcData (epTok $1) n) }} + : qcname { sL1a $1 (mkPlainImpExp $1) } + | 'type' oqtycon {% do { imp_exp <- mkTypeImpExp (epTok $1) $2 + ; return $ sLLa $1 $> imp_exp }} + | 'data' qvarcon {% do { imp_exp <- mkDataImpExp (epTok $1) $2 + ; return $ sLLa $1 $> imp_exp }} qcname :: { LocatedN RdrName } -- Variable or type constructor : qvar { $1 } -- Things which look like functions ===================================== compiler/GHC/Parser/Errors/Ppr.hs ===================================== @@ -273,9 +273,14 @@ instance Diagnostic PsMessage where 2 (pprWithCommas ppr vs) , text "See https://gitlab.haskell.org/ghc/ghc/issues/16754 for details." ] - PsErrIllegalExplicitNamespace + PsErrIllegalExplicitNamespace kw -> mkSimpleDecorated $ - text "Illegal keyword 'type'" + text "Illegal keyword" <+> quotes kw_doc + where + kw_doc = case kw of + ExplicitTypeNamespace{} -> text "type" + ExplicitDataNamespace{} -> text "data" + PsErrUnallowedPragma prag -> mkSimpleDecorated $ @@ -619,7 +624,7 @@ instance Diagnostic PsMessage where PsErrNoSingleWhereBindInPatSynDecl{} -> ErrorWithoutFlag PsErrDeclSpliceNotAtTopLevel{} -> ErrorWithoutFlag PsErrMultipleNamesInStandaloneKindSignature{} -> ErrorWithoutFlag - PsErrIllegalExplicitNamespace -> ErrorWithoutFlag + PsErrIllegalExplicitNamespace{} -> ErrorWithoutFlag PsErrUnallowedPragma{} -> ErrorWithoutFlag PsErrImportPostQualified -> ErrorWithoutFlag PsErrImportQualifiedTwice -> ErrorWithoutFlag @@ -759,7 +764,7 @@ instance Diagnostic PsMessage where PsErrNoSingleWhereBindInPatSynDecl{} -> noHints PsErrDeclSpliceNotAtTopLevel{} -> noHints PsErrMultipleNamesInStandaloneKindSignature{} -> noHints - PsErrIllegalExplicitNamespace -> [suggestExtension LangExt.ExplicitNamespaces] + PsErrIllegalExplicitNamespace{} -> [suggestExtension LangExt.ExplicitNamespaces] PsErrUnallowedPragma{} -> noHints PsErrImportPostQualified -> [suggestExtension LangExt.ImportQualifiedPost] PsErrImportQualifiedTwice -> noHints ===================================== compiler/GHC/Parser/Errors/Types.hs ===================================== @@ -214,7 +214,7 @@ data PsMessage | PsErrImportPostQualified -- | Explicit namespace keyword without 'ExplicitNamespaces' - | PsErrIllegalExplicitNamespace + | PsErrIllegalExplicitNamespace !ExplicitNamespaceKeyword -- | Expecting a type constructor but found a variable | PsErrVarForTyCon !RdrName ===================================== compiler/GHC/Parser/PostProcess.hs ===================================== @@ -79,6 +79,7 @@ module GHC.Parser.PostProcess ( ImpExpSubSpec(..), ImpExpQcSpec(..), mkModuleImpExp, + mkPlainImpExp, mkTypeImpExp, mkDataImpExp, mkImpExpSubSpec, @@ -3241,9 +3242,7 @@ data ImpExpSubSpec = ImpExpAbs | ImpExpList [LocatedA ImpExpQcSpec] | ImpExpAllWith [LocatedA ImpExpQcSpec] -data ImpExpQcSpec = ImpExpQcName (LocatedN RdrName) - | ImpExpQcType (EpToken "type") (LocatedN RdrName) - | ImpExpQcData (EpToken "data") (LocatedN RdrName) +data ImpExpQcSpec = ImpExpQcName (Maybe ExplicitNamespaceKeyword) (LocatedN RdrName) | ImpExpQcWildcard (EpToken "..") (EpToken ",") mkModuleImpExp :: Maybe (LWarningTxt GhcPs) -> (EpToken "(", EpToken ")") -> LocatedA ImpExpQcSpec @@ -3287,30 +3286,37 @@ mkModuleImpExp warning (top, tcp) (L l specname) subs = do (PsErrVarForTyCon name) else return $ ieNameFromSpec specname - ieNameVal (ImpExpQcName ln) = unLoc ln - ieNameVal (ImpExpQcType _ ln) = unLoc ln - ieNameVal (ImpExpQcData _ ln) = unLoc ln + ieNameVal (ImpExpQcName _ ln) = unLoc ln ieNameVal ImpExpQcWildcard{} = panic "ieNameVal got wildcard" ieNameFromSpec :: ImpExpQcSpec -> IEWrappedName GhcPs - ieNameFromSpec (ImpExpQcName (L l n)) = IEName noExtField (L l n) - ieNameFromSpec (ImpExpQcType r (L l n)) = IEType r (L l n) - ieNameFromSpec (ImpExpQcData r (L l n)) = IEData r (L l n) - ieNameFromSpec ImpExpQcWildcard{} = panic "ieName got wildcard" + ieNameFromSpec (ImpExpQcName m_kw name) = case m_kw of + Nothing -> IEName noExtField name + Just (ExplicitTypeNamespace tok) -> IEType tok name + Just (ExplicitDataNamespace tok) -> IEData tok name + ieNameFromSpec ImpExpQcWildcard{} = panic "ieNameFromSpec got wildcard" wrapped = map (fmap ieNameFromSpec) -mkTypeImpExp :: LocatedN RdrName -- TcCls or Var name space - -> P (LocatedN RdrName) -mkTypeImpExp name = - do requireExplicitNamespaces (getLocA name) - return (fmap (`setRdrNameSpace` tcClsName) name) +mkPlainImpExp :: LocatedN RdrName -> ImpExpQcSpec +mkPlainImpExp name = ImpExpQcName Nothing name -mkDataImpExp :: LocatedN RdrName - -> P (LocatedN RdrName) -mkDataImpExp name = - do requireExplicitNamespaces (getLocA name) - return name +mkTypeImpExp :: EpToken "type" + -> LocatedN RdrName -- TcCls or Var name space + -> P ImpExpQcSpec +mkTypeImpExp tok name = do + let name' = fmap (`setRdrNameSpace` tcClsName) name + ns_kw = ExplicitTypeNamespace tok + requireExplicitNamespaces ns_kw + return (ImpExpQcName (Just ns_kw) name') + +mkDataImpExp :: EpToken "data" + -> LocatedN RdrName + -> P ImpExpQcSpec +mkDataImpExp tok name = do + let ns_kw = ExplicitDataNamespace tok + requireExplicitNamespaces ns_kw + return (ImpExpQcName (Just ns_kw) name) checkImportSpec :: LocatedLI [LIE GhcPs] -> P (LocatedLI [LIE GhcPs]) checkImportSpec ie@(L _ specs) = @@ -3368,11 +3374,15 @@ failOpFewArgs (L loc op) = ; addFatalError $ mkPlainErrorMsgEnvelope (locA loc) $ (PsErrOpFewArgs is_star_type op) } -requireExplicitNamespaces :: MonadP m => SrcSpan -> m () -requireExplicitNamespaces l = do +requireExplicitNamespaces :: MonadP m => ExplicitNamespaceKeyword -> m () +requireExplicitNamespaces kw = do allowed <- getBit ExplicitNamespacesBit unless allowed $ - addError $ mkPlainErrorMsgEnvelope l PsErrIllegalExplicitNamespace + addError $ mkPlainErrorMsgEnvelope loc $ PsErrIllegalExplicitNamespace kw + where + loc = case kw of + ExplicitTypeNamespace tok -> getEpTokenSrcSpan tok + ExplicitDataNamespace tok -> getEpTokenSrcSpan tok warnPatternNamespaceSpecifier :: MonadP m => SrcSpan -> m () warnPatternNamespaceSpecifier l = do ===================================== compiler/GHC/Parser/Types.hs ===================================== @@ -8,6 +8,7 @@ module GHC.Parser.Types , pprSumOrTuple , PatBuilder(..) , DataConBuilder(..) + , ExplicitNamespaceKeyword(..) ) where @@ -111,3 +112,7 @@ instance Outputable DataConBuilder where ppr lhs <+> ppr data_con <+> ppr rhs type instance Anno [LocatedA (StmtLR GhcPs GhcPs (LocatedA (PatBuilder GhcPs)))] = SrcSpanAnnLW + +data ExplicitNamespaceKeyword + = ExplicitTypeNamespace !(EpToken "type") + | ExplicitDataNamespace !(EpToken "data") \ No newline at end of file ===================================== compiler/GHC/Utils/Binary.hs ===================================== @@ -1965,6 +1965,13 @@ instance (Binary v) => Binary (IntMap v) where put_ bh m = put_ bh (IntMap.toAscList m) get bh = IntMap.fromAscList <$> get bh +instance (Ord k, Binary k, Binary v) => Binary (Map k v) where + put_ bh m = put_ bh $ Map.toList m + -- Unfortunately, we can't use fromAscList, since k is often + -- instantiated to Name which has a non-deterministic Ord instance + -- that only compares the Uniques, and the Uniques are likely + -- changed when deserializing! + get bh = Map.fromList <$> get bh {- Note [FingerprintWithValue] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== testsuite/tests/ghci-wasm/Makefile ===================================== @@ -0,0 +1,7 @@ +TOP=../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +T26430_setup : + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghciWayFlags) -shared T26430A.c -o libT26430A.so + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghciWayFlags) -shared -L. -lT26430A T26430B.c -o libT26430B.so ===================================== testsuite/tests/ghci-wasm/T26430.hs ===================================== @@ -0,0 +1 @@ +foreign import ccall unsafe "baz" main :: IO () ===================================== testsuite/tests/ghci-wasm/T26430A.c ===================================== @@ -0,0 +1,5 @@ +void foo(void); + +void bar(void (*)(void)); + +__attribute__((export_name("baz"))) void baz(void) { bar(foo); } ===================================== testsuite/tests/ghci-wasm/T26430B.c ===================================== @@ -0,0 +1,3 @@ +__attribute__((export_name("foo"))) void foo(void) {} + +__attribute__((export_name("bar"))) void bar(void (*f)(void)) { f(); } ===================================== testsuite/tests/ghci-wasm/all.T ===================================== @@ -0,0 +1,12 @@ +setTestOpts([ + unless(arch('wasm32'), skip), + only_ways(['ghci', 'ghci-opt']), + extra_ways(['ghci', 'ghci-opt']) +]) + +test('T26430', [ + extra_files(['T26430A.c', 'T26430B.c']), + pre_cmd('$MAKE -s --no-print-directory T26430_setup ghciWayFlags=' + config.ghci_way_flags), + extra_hc_opts('-L. -lT26430B')] +, compile_and_run, [''] +) ===================================== testsuite/tests/parser/should_fail/T16270h.stderr ===================================== @@ -1,6 +1,5 @@ - -T16270h.hs:8:22: error: [GHC-47007] - Illegal keyword 'type' +T16270h.hs:8:17: error: [GHC-47007] + Illegal keyword ‘type’ Suggested fix: Perhaps you intended to use the ‘ExplicitNamespaces’ extension (implied by ‘TypeFamilies’ and ‘TypeOperators’) @@ -11,3 +10,4 @@ T16270h.hs:10:8: error: [GHC-21926] T16270h.hs:11:8: error: [GHC-21926] Parse error: ‘pkg!’ Version number or non-alphanumeric character in package name + ===================================== testsuite/tests/parser/should_fail/T26418.hs ===================================== @@ -0,0 +1,9 @@ +{-# LANGUAGE PatternSynonyms #-} +{-# LANGUAGE NoExplicitNamespaces #-} + +module T26418 (data HeadC) where + +pattern HeadC :: forall a. a -> [a] +pattern HeadC x <- x:_xs where + HeadC x = [x] + ===================================== testsuite/tests/parser/should_fail/T26418.stderr ===================================== @@ -0,0 +1,5 @@ +T26418.hs:4:16: error: [GHC-47007] + Illegal keyword ‘data’ + Suggested fix: + Perhaps you intended to use the ‘ExplicitNamespaces’ extension (implied by ‘TypeFamilies’ and ‘TypeOperators’) + ===================================== testsuite/tests/parser/should_fail/all.T ===================================== @@ -241,3 +241,4 @@ test('T25258a', normal, compile_fail, ['']) test('T25258b', normal, compile_fail, ['']) test('T25258c', normal, compile_fail, ['']) test('T25530', normal, compile_fail, ['']) +test('T26418', normal, compile_fail, ['']) ===================================== utils/haddock/haddock-api/src/Haddock/InterfaceFile.hs ===================================== @@ -40,7 +40,6 @@ import Data.Coerce (coerce) import Data.Function ((&)) import Data.IORef import Data.Map (Map) -import qualified Data.Map as Map import Data.Version import Data.Word import GHC hiding (NoLink) @@ -316,10 +315,6 @@ data BinDictionary = BinDictionary ------------------------------------------------------------------------------- -instance (Ord k, Binary k, Binary v) => Binary (Map k v) where - put_ bh m = put_ bh (Map.toList m) - get bh = fmap (Map.fromList) (get bh) - instance Binary PackageInfo where put_ bh PackageInfo{piPackageName, piPackageVersion} = do put_ bh (unPackageName piPackageName) ===================================== utils/jsffi/dyld.mjs ===================================== @@ -1013,10 +1013,13 @@ class DyLD { // anything, if it's required later a GOT.func entry will be // created on demand. if (this.#gotFunc[k]) { - // ghc-prim/ghc-internal may export functions imported by - // rts - console.assert(this.#gotFunc[k].value === DyLD.#poison); - this.#table.set(this.#gotFunc[k].value, v); + const got = this.#gotFunc[k]; + if (got.value === DyLD.#poison) { + const idx = this.#table.grow(1, v); + got.value = idx; + } else { + this.#table.set(got.value, v); + } } continue; } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/88f159e2cc4d4703dd89561bd95dd8… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/88f159e2cc4d4703dd89561bd95dd8… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/rts-no-gnuc
by Cheng Shao (＠TerrorJack) 20 Sep '25

20 Sep '25

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

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 14 commits: StgToByteCode: Don't assume that data con workers are nullary
by Marge Bot (＠marge-bot) 19 Sep '25

19 Sep '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: d1d9e39e by Ben Gamari at 2025-09-19T18:24:52-04:00 StgToByteCode: Don't assume that data con workers are nullary Previously StgToByteCode assumed that all data-con workers were of a nullary representation. This is not a valid assumption, as seen in #23210, where an unsaturated application of a unary data constructor's worker resulted in invalid bytecode. Sadly, I have not yet been able to reduce a minimal testcase for this. Fixes #23210. - - - - - 3eeecd50 by Ben Gamari at 2025-09-19T18:24:53-04:00 testsuite: Mark T23146* as unbroken - - - - - 2e73f342 by sheaf at 2025-09-19T18:24:53-04:00 Add test for #26216 - - - - - c2efb912 by Sven Tennie at 2025-09-19T18:25:36-04:00 Generate correct test header This increases convenience when copying & pasting... - - - - - d2fb811e by Sven Tennie at 2025-09-19T18:25:36-04:00 foundation test: Fix shift amount (#26248) Shift primops' results are only defined for shift amounts of 0 to word size - 1. The approach is similar to testing div-like operations (which have a constraint regarding zero operands.) This was partly vibe coded (https://github.com/supersven/ghc/pull/1) but then heavily refactored. - - - - - a62ce115 by Andreas Klebinger at 2025-09-19T18:26:18-04:00 Tweak jspace test I've given it a longer timeout, and tweaked the test file generation to speed it up a bit. Hopefully that is enough to make it constentily pass. Last but not least it now also always uses three threads. - - - - - 0f034942 by Cheng Shao at 2025-09-19T18:26:59-04:00 rts: remove obsolete CC_SUPPORTS_TLS logic This patch removes obsolete CC_SUPPORTS_TLS logic throughout the rts, given __thread is now uniformly supported by C toolchains of all platforms we currently support. - - - - - ef705655 by Cheng Shao at 2025-09-19T18:27:41-04:00 rts: remove obsolete HAS_VISIBILITY_HIDDEN logic This patch removes obsolete HAS_VISIBILITY_HIDDEN logic throughout the rts, given __attribute__((visibility("hidden"))) is uniformly supported by C toolchains of all platforms we currently support. - - - - - 9fdc1f7d by Cheng Shao at 2025-09-19T18:28:21-04:00 rts: remove -O3 pragma hack in Hash.c This patch removes an obsolete gcc pragma to specify -O3 in Hash.c. Hadrian already passes the right flag. - - - - - b8cfa8f7 by Cheng Shao at 2025-09-19T18:29:01-04:00 rts: remove obsolete COMPILING_WINDOWS_DLL logic This patch removes obsolete COMPILING_WINDOWS_DLL logic throughout the rts. They were once used for compiling to win32 DLLs, but we haven't been able to compile Haskell units to win32 DLLs for many years now, due to PE format's restriction of no more than 65536 exported symbols in a single DLL. - - - - - bb760611 by Cheng Shao at 2025-09-19T18:29:42-04:00 wasm: bump browser_wasi_shim to 0.4.2 This patch bumps the browser_wasi_shim dependency of wasm dyld script to 0.4.2. - - - - - b3a1a0ab by Cheng Shao at 2025-09-19T19:02:29-04:00 compiler: move Binary instance of Map to GHC.Utils.Binary This patch moves `Binary` instance of `Map` from `haddock-api` to `GHC.Utils.Binary`. This also allows us to remove a redundant instance defined for `NameEntityInfo`, which is a type synonym for `Map`. - - - - - c77d889a by Vladislav Zavialov at 2025-09-19T19:02:30-04:00 Fix keyword in ExplicitNamespaces error message (#26418) Consider this module header and the resulting error: {-# LANGUAGE NoExplicitNamespaces #-} module T26418 (data HeadC) where -- error: [GHC-47007] -- Illegal keyword 'type' Previously, the error message would mention 'type' (as shown above), even though the user wrote 'data'. This has now been fixed. The error location has also been corrected: it is now reported at the keyword position rather than at the position of the associated import/export item. - - - - - 88f159e2 by Cheng Shao at 2025-09-19T19:02:31-04:00 wasm: fix dyld handling for forward declared GOT.func items This patch fixes wasm shared linker's handling of forward declared GOT.func items, see linked issue for details. Also adds T26430 test to witness the fix. Fixes #26430. Co-authored-by: Codex <codex(a)openai.com> - - - - - 55 changed files: - compiler/GHC/Builtin/primops.txt.pp - compiler/GHC/Iface/Ext/Types.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/Types.hs - compiler/GHC/StgToByteCode.hs - compiler/GHC/Utils/Binary.hs - − m4/fp_visibility_hidden.m4 - rts/BeginPrivate.h - rts/EndPrivate.h - rts/Hash.c - rts/Interpreter.c - − rts/RtsDllMain.c - − rts/RtsDllMain.h - rts/RtsSymbols.c - rts/StgMiscClosures.cmm - rts/Task.c - rts/Task.h - rts/configure.ac - rts/include/Rts.h - rts/include/RtsAPI.h - rts/include/rts/OSThreads.h - rts/include/stg/DLL.h - rts/posix/OSThreads.c - rts/rts.cabal - rts/sm/Evac.c - rts/sm/GCTDecl.h - rts/sm/GCThread.h - rts/sm/Storage.c - rts/win32/OSThreads.c - + testsuite/tests/bytecode/T26216.hs - + testsuite/tests/bytecode/T26216.script - + testsuite/tests/bytecode/T26216.stdout - + testsuite/tests/bytecode/T26216_aux.hs - testsuite/tests/bytecode/all.T - testsuite/tests/codeGen/should_run/T23146/all.T - testsuite/tests/driver/j-space/Makefile - testsuite/tests/driver/j-space/all.T - testsuite/tests/driver/j-space/genJspace - + testsuite/tests/ghci-wasm/Makefile - + testsuite/tests/ghci-wasm/T26430.hs - + testsuite/tests/ghci-wasm/T26430A.c - + testsuite/tests/ghci-wasm/T26430B.c - + testsuite/tests/ghci-wasm/all.T - testsuite/tests/numeric/should_run/foundation.hs - testsuite/tests/parser/should_fail/T16270h.stderr - + testsuite/tests/parser/should_fail/T26418.hs - + testsuite/tests/parser/should_fail/T26418.stderr - testsuite/tests/parser/should_fail/all.T - utils/genprimopcode/Main.hs - utils/genprimopcode/Syntax.hs - utils/haddock/haddock-api/src/Haddock/InterfaceFile.hs - utils/jsffi/dyld.mjs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/72d6dabeaed5e7764256c0bd98e11f… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/72d6dabeaed5e7764256c0bd98e11f… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] wasm: bump browser_wasi_shim to 0.4.2
by Marge Bot (＠marge-bot) 19 Sep '25

19 Sep '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: bb760611 by Cheng Shao at 2025-09-19T18:29:42-04:00 wasm: bump browser_wasi_shim to 0.4.2 This patch bumps the browser_wasi_shim dependency of wasm dyld script to 0.4.2. - - - - - 1 changed file: - utils/jsffi/dyld.mjs Changes: ===================================== utils/jsffi/dyld.mjs ===================================== @@ -308,7 +308,7 @@ if (isNode) { } catch {} } else { wasi = await import( - "https://cdn.jsdelivr.net/npm/@bjorn3/browser_wasi_shim@0.4.1/dist/index.js" + "https://cdn.jsdelivr.net/npm/@bjorn3/browser_wasi_shim@0.4.2/dist/index.js" ); } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bb760611630402a1349b1952e345d87… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bb760611630402a1349b1952e345d87… You're receiving this email because of your account on gitlab.haskell.org.

1 0