- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: llvmGen: Fix built-in variable predicate
by Marge Bot (＠marge-bot) 08 May '25

08 May '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 350d26d2 by Ben Gamari at 2025-05-08T00:10:36-04:00 llvmGen: Fix built-in variable predicate Previously the predicate to identify LLVM builtin global variables was checking for `$llvm` rather than `@llvm` as it should. - - - - - 43396402 by Ben Gamari at 2025-05-08T00:10:36-04:00 llvmGen: Fix linkage of built-in arrays LLVM now insists that built-in arrays use Appending linkage, not Internal. Fixes #25769. - - - - - 4dbf5b41 by sheaf at 2025-05-08T00:10:41-04:00 Use mkTrAppChecked in ds_ev_typeable This change avoids violating the invariant of mkTrApp according to which the argument should not be a fully saturated function type. This ensures we don't return false negatives for type equality involving function types. Fixes #25998 - - - - - 0c7147d2 by Ryan Hendrickson at 2025-05-08T00:10:45-04:00 haddock: Preserve indentation in multiline examples Intended for use with :{ :}, but doesn't look for those characters. Any consecutive lines with birdtracks will only have initial whitespace stripped up to the column of the first line. - - - - - 3b5267fd by Cheng Shao at 2025-05-08T00:10:46-04:00 ci: re-enable chrome for wasm ghci browser tests Currently only firefox is enabled for wasm ghci browser tests, for some reason testing with chrome works on my machine but gets stuck on gitlab instance runners. This patch re-enables testing with chrome by passing `--no-sandbox`, since chrome sandboxing doesn't work in containers without `--cap-add=SYS_ADMIN`. - - - - - 11 changed files: - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - compiler/GHC/Builtin/Names.hs - compiler/GHC/CmmToLlvm/Base.hs - compiler/GHC/CmmToLlvm/Data.hs - compiler/GHC/HsToCore/Binds.hs - + testsuite/tests/typecheck/should_run/T25998.hs - + testsuite/tests/typecheck/should_run/T25998.stdout - testsuite/tests/typecheck/should_run/all.T - utils/haddock/haddock-library/src/Documentation/Haddock/Parser.hs - utils/haddock/haddock-library/test/Documentation/Haddock/ParserSpec.hs Changes: ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -1322,6 +1322,7 @@ cross_jobs = [ modifyJobs ( -- See Note [Testing wasm ghci browser mode] setVariable "FIREFOX_LAUNCH_OPTS" "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}" + . setVariable "CHROME_LAUNCH_OPTS" "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}" . setVariable "HADRIAN_ARGS" "--docs=no-sphinx-pdfs --docs=no-sphinx-man" . delVariable "INSTALL_CONFIGURE_ARGS" ) ===================================== .gitlab/jobs.yaml ===================================== @@ -1786,6 +1786,7 @@ "BIGNUM_BACKEND": "gmp", "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf", + "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}", "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check", "CROSS_TARGET": "wasm32-wasi", "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}", @@ -1851,6 +1852,7 @@ "BIGNUM_BACKEND": "native", "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf", + "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}", "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check", "CROSS_TARGET": "wasm32-wasi", "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}", @@ -1916,6 +1918,7 @@ "BIGNUM_BACKEND": "gmp", "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf", + "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}", "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check", "CROSS_TARGET": "wasm32-wasi", "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}", @@ -6031,6 +6034,7 @@ "BIGNUM_BACKEND": "gmp", "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf", + "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}", "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check", "CROSS_TARGET": "wasm32-wasi", "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}", @@ -6096,6 +6100,7 @@ "BIGNUM_BACKEND": "native", "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf", + "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}", "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check", "CROSS_TARGET": "wasm32-wasi", "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}", @@ -6161,6 +6166,7 @@ "BIGNUM_BACKEND": "gmp", "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf", + "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}", "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check", "CROSS_TARGET": "wasm32-wasi", "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}", ===================================== compiler/GHC/Builtin/Names.hs ===================================== @@ -245,7 +245,7 @@ basicKnownKeyNames typeRepIdName, mkTrTypeName, mkTrConName, - mkTrAppName, + mkTrAppCheckedName, mkTrFunName, typeSymbolTypeRepName, typeNatTypeRepName, typeCharTypeRepName, trGhcPrimModuleName, @@ -1356,7 +1356,7 @@ typeableClassName , someTypeRepDataConName , mkTrTypeName , mkTrConName - , mkTrAppName + , mkTrAppCheckedName , mkTrFunName , typeRepIdName , typeNatTypeRepName @@ -1371,7 +1371,7 @@ someTypeRepDataConName = dcQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "SomeTypeR typeRepIdName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "typeRep#") typeRepIdKey mkTrTypeName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrType") mkTrTypeKey mkTrConName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrCon") mkTrConKey -mkTrAppName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrApp") mkTrAppKey +mkTrAppCheckedName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrAppChecked") mkTrAppCheckedKey mkTrFunName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrFun") mkTrFunKey typeNatTypeRepName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "typeNatTypeRep") typeNatTypeRepKey typeSymbolTypeRepName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "typeSymbolTypeRep") typeSymbolTypeRepKey @@ -2499,7 +2499,7 @@ proxyHashKey = mkPreludeMiscIdUnique 502 mkTyConKey , mkTrTypeKey , mkTrConKey - , mkTrAppKey + , mkTrAppCheckedKey , mkTrFunKey , typeNatTypeRepKey , typeSymbolTypeRepKey @@ -2509,7 +2509,7 @@ mkTyConKey mkTyConKey = mkPreludeMiscIdUnique 503 mkTrTypeKey = mkPreludeMiscIdUnique 504 mkTrConKey = mkPreludeMiscIdUnique 505 -mkTrAppKey = mkPreludeMiscIdUnique 506 +mkTrAppCheckedKey = mkPreludeMiscIdUnique 506 typeNatTypeRepKey = mkPreludeMiscIdUnique 507 typeSymbolTypeRepKey = mkPreludeMiscIdUnique 508 typeCharTypeRepKey = mkPreludeMiscIdUnique 509 ===================================== compiler/GHC/CmmToLlvm/Base.hs ===================================== @@ -526,10 +526,10 @@ generateExternDecls = do modifyEnv $ \env -> env { envAliases = emptyUniqSet } return (concat defss, []) --- | Is a variable one of the special @$llvm@ globals? +-- | Is a variable one of the special @\@llvm@ globals? isBuiltinLlvmVar :: LlvmVar -> Bool isBuiltinLlvmVar (LMGlobalVar lbl _ _ _ _ _) = - "$llvm" `isPrefixOf` unpackFS lbl + "llvm." `isPrefixOf` unpackFS lbl isBuiltinLlvmVar _ = False -- | Here we take a global variable definition, rename it with a ===================================== compiler/GHC/CmmToLlvm/Data.hs ===================================== @@ -125,7 +125,7 @@ genGlobalLabelArray var_nm clbls = do prio = LMStaticLit $ LMIntLit 0xffff i32 in LMStaticStrucU [prio, fn, null] entry_ty - arr_var = LMGlobalVar var_nm arr_ty Internal Nothing Nothing Global + arr_var = LMGlobalVar var_nm arr_ty Appending Nothing Nothing Global mkFunTy lbl = LMFunction $ LlvmFunctionDecl lbl ExternallyVisible CC_Ccc LMVoid FixedArgs [] Nothing entry_ty = LMStructU [i32, LMPointer $ mkFunTy $ fsLit "placeholder", LMPointer i8] arr_ty = LMArray (length clbls) entry_ty ===================================== compiler/GHC/HsToCore/Binds.hs ===================================== @@ -1850,14 +1850,14 @@ ds_ev_typeable ty (EvTypeableTyApp ev1 ev2) | Just (t1,t2) <- splitAppTy_maybe ty = do { e1 <- getRep ev1 t1 ; e2 <- getRep ev2 t2 - ; mkTrApp <- dsLookupGlobalId mkTrAppName - -- mkTrApp :: forall k1 k2 (a :: k1 -> k2) (b :: k1). - -- TypeRep a -> TypeRep b -> TypeRep (a b) + ; mkTrAppChecked <- dsLookupGlobalId mkTrAppCheckedName + -- mkTrAppChecked :: forall k1 k2 (a :: k1 -> k2) (b :: k1). + -- TypeRep a -> TypeRep b -> TypeRep (a b) ; let (_, k1, k2) = splitFunTy (typeKind t1) -- drop the multiplicity, -- since it's a kind - ; let expr = mkApps (mkTyApps (Var mkTrApp) [ k1, k2, t1, t2 ]) + ; let expr = mkApps (mkTyApps (Var mkTrAppChecked) [ k1, k2, t1, t2 ]) [ e1, e2 ] - -- ; pprRuntimeTrace "Trace mkTrApp" (ppr expr) expr + -- ; pprRuntimeTrace "Trace mkTrAppChecked" (ppr expr) expr ; return expr } ===================================== testsuite/tests/typecheck/should_run/T25998.hs ===================================== @@ -0,0 +1,21 @@ +{-# LANGUAGE Haskell2010 #-} +{-# LANGUAGE KindSignatures #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TypeApplications #-} + +module Main where + +import Data.Kind +import Type.Reflection + +test :: forall (a :: Type) (b :: Type). TypeRep a -> TypeRep b -> String +test a b = case eqTypeRep a b of + Just _ -> "Equal!\n" + Nothing -> "Not equal:\n" <> show a <> "\n" <> show b <> "\n" + +combine :: forall (t :: Type -> Type -> Type). Typeable t => TypeRep (t Bool Int) +combine = typeRep + +main :: IO () +main = do + putStrLn $ test (typeRep @(Bool -> Int)) (combine @(->)) ===================================== testsuite/tests/typecheck/should_run/T25998.stdout ===================================== @@ -0,0 +1,2 @@ +Equal! + ===================================== testsuite/tests/typecheck/should_run/all.T ===================================== @@ -173,6 +173,7 @@ test('T23761', normal, compile_and_run, ['']) test('T25529', normal, compile_and_run, ['']) test('T23761b', normal, compile_and_run, ['']) test('T17594e', normal, compile_and_run, ['']) +test('T25998', normal, compile_and_run, ['']) # Tests for expanding do before typechecking (Impredicative + RebindableSyntax) test('T18324', normal, compile_and_run, ['']) ===================================== utils/haddock/haddock-library/src/Documentation/Haddock/Parser.hs ===================================== @@ -795,31 +795,33 @@ stripSpace = fromMaybe <*> mapM strip' -- | Parses examples. Examples are a paragraph level entity (separated by an empty line). -- Consecutive examples are accepted. examples :: Parser (DocH mod a) -examples = DocExamples <$> (many (try (skipHorizontalSpace *> "\n")) *> go) +examples = DocExamples <$> (many (try (skipHorizontalSpace *> "\n")) *> go Nothing) where - go :: Parser [Example] - go = do + go :: Maybe Text -> Parser [Example] + go mbInitialIndent = do prefix <- takeHorizontalSpace <* ">>>" + initialIndent <- maybe takeHorizontalSpace pure mbInitialIndent expr <- takeLine - (rs, es) <- resultAndMoreExamples - return (makeExample prefix expr rs : es) + (rs, es) <- resultAndMoreExamples (Just initialIndent) + return (makeExample prefix initialIndent expr rs : es) + + resultAndMoreExamples :: Maybe Text -> Parser ([Text], [Example]) + resultAndMoreExamples mbInitialIndent = choice' [moreExamples, result, pure ([], [])] where - resultAndMoreExamples :: Parser ([Text], [Example]) - resultAndMoreExamples = choice' [moreExamples, result, pure ([], [])] - where - moreExamples :: Parser ([Text], [Example]) - moreExamples = (,) [] <$> go + moreExamples :: Parser ([Text], [Example]) + moreExamples = (,) [] <$> go mbInitialIndent - result :: Parser ([Text], [Example]) - result = first . (:) <$> nonEmptyLine <*> resultAndMoreExamples + result :: Parser ([Text], [Example]) + result = first . (:) <$> nonEmptyLine <*> resultAndMoreExamples Nothing - makeExample :: Text -> Text -> [Text] -> Example - makeExample prefix expression res = - Example (T.unpack (T.strip expression)) result + makeExample :: Text -> Text -> Text -> [Text] -> Example + makeExample prefix indent expression res = + Example (T.unpack (tryStripIndent (T.stripEnd expression))) result where result = map (T.unpack . substituteBlankLine . tryStripPrefix) res tryStripPrefix xs = fromMaybe xs (T.stripPrefix prefix xs) + tryStripIndent = liftA2 fromMaybe T.stripStart (T.stripPrefix indent) substituteBlankLine "<BLANKLINE>" = "" substituteBlankLine xs = xs ===================================== utils/haddock/haddock-library/test/Documentation/Haddock/ParserSpec.hs ===================================== @@ -864,6 +864,29 @@ spec = do it "accepts unicode in examples" $ do ">>> 灼眼\nシャナ" `shouldParseTo` DocExamples [Example "灼眼" ["シャナ"]] + it "preserves indentation in consecutive example lines" $ do + unlines + [ ">>> line 1" + , ">>> line 2" + , ">>> line 3" + ] + `shouldParseTo` DocExamples + [ Example "line 1" [] + , Example " line 2" [] + , Example "line 3" [] + ] + + it "resets indentation after results" $ do + unlines + [ ">>> line 1" + , "result" + , ">>> line 2" + ] + `shouldParseTo` DocExamples + [ Example "line 1" ["result"] + , Example "line 2" [] + ] + context "when prompt is prefixed by whitespace" $ do it "strips the exact same amount of whitespace from result lines" $ do unlines View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6836f724f2b10bb2d527f6ca026cb2… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6836f724f2b10bb2d527f6ca026cb2… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/int-index/enforce-namespaces] refactor: mkSubordinateError
by Vladislav Zavialov (＠int-index) 07 May '25

07 May '25

Vladislav Zavialov pushed to branch wip/int-index/enforce-namespaces at Glasgow Haskell Compiler / GHC Commits: 97ed302a by Vladislav Zavialov at 2025-05-08T02:28:13+03:00 refactor: mkSubordinateError - - - - - 1 changed file: - compiler/GHC/Rename/Names.hs Changes: ===================================== compiler/GHC/Rename/Names.hs ===================================== @@ -1382,16 +1382,7 @@ filterImports hsc_env iface decl_spec (Just (want_hiding, L l import_items)) -- to find 'b' and 'd'. So we make up an import item -- to report as failing, namely T( b, d ). -- c.f. #15413 - subordinate_err = - assertPpr (length unavailable + length nontype == length items) - (ppr items) $ - IsSubordinateError { subordinate_err_parent = gre - , subordinate_err_unavailable = unavailable - , subordinate_err_nontype = nontype } - unavailable = - [ (occNameFS . rdrNameOcc . ieWrappedName) wname - | LookupChildNotFound (L _ wname) <- children_errs ] - nontype = [ g | LookupChildNonType{lce_nontype_item = g} <- children_errs ] + subordinate_err = mkSubordinateError gre children_errs in bad_import_w ie subordinate_err let name' = replaceWrappedName rdr_tc name @@ -1447,6 +1438,22 @@ data IsSubordinateError , subordinate_err_nontype :: [GlobalRdrElt] } | IsNotSubordinate +mkSubordinateError :: GlobalRdrElt -> [LookupChildError] -> IsSubordinateError +mkSubordinateError gre children_errs = foldr add init_acc children_errs + where + init_acc :: IsSubordinateError + init_acc = IsSubordinateError gre [] [] + + add :: LookupChildError -> IsSubordinateError -> IsSubordinateError + add children_err sub@IsSubordinateError{} = + case children_err of + LookupChildNonType{lce_nontype_item = g} -> + sub { subordinate_err_nontype = g : subordinate_err_nontype sub } + LookupChildNotFound (L _ wname) -> + let fs = (occNameFS . rdrNameOcc . ieWrappedName) wname + in sub { subordinate_err_unavailable = fs : subordinate_err_unavailable sub } + add _ IsNotSubordinate = panic "mkSubordinateError: IsNotSubordinate" + data IELookupError = QualImportError RdrName | BadImport (IE GhcPs) IsSubordinateError View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/97ed302a40d8362975c7703d4e402bf… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/97ed302a40d8362975c7703d4e402bf… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/int-index/enforce-namespaces] formatting
by Vladislav Zavialov (＠int-index) 07 May '25

07 May '25

Vladislav Zavialov pushed to branch wip/int-index/enforce-namespaces at Glasgow Haskell Compiler / GHC Commits: 14eaf5e4 by Vladislav Zavialov at 2025-05-08T02:00:49+03:00 formatting - - - - - 1 changed file: - compiler/GHC/Tc/Errors/Ppr.hs Changes: ===================================== compiler/GHC/Tc/Errors/Ppr.hs ===================================== @@ -5912,7 +5912,7 @@ pprImportLookup = \case BadImportNonTypeSubordinates gre nontype1 -> withContext [ what <+> text "called" <+> parent_name <+> text "is exported," - , sep [ text "but its subordinate" <+> "item" <> plural nontype <+> nontype_names + , sep [ text "but its subordinate item" <> plural nontype <+> nontype_names , isOrAre nontype <+> "not in the type namespace." ] ] where nontype = NE.toList nontype1 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/14eaf5e44be16b040a9200e0d48c640… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/14eaf5e44be16b040a9200e0d48c640… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T25992] WIP on unsued constraints [skip ci]
by Simon Peyton Jones (＠simonpj) 07 May '25

07 May '25

Simon Peyton Jones pushed to branch wip/T25992 at Glasgow Haskell Compiler / GHC Commits: 379158f7 by Simon Peyton Jones at 2025-05-07T23:36:44+01:00 WIP on unsued constraints [skip ci] - - - - - 1 changed file: - compiler/GHC/Tc/Solver/Solve.hs Changes: ===================================== compiler/GHC/Tc/Solver/Solve.hs ===================================== @@ -51,9 +51,10 @@ import GHC.Utils.Misc import GHC.Driver.Session -import Data.List( deleteFirstsBy ) import Control.Monad + +import Data.List( deleteFirstsBy ) import Data.Foldable ( traverse_ ) import Data.Maybe ( mapMaybe ) import qualified Data.Semigroup as S @@ -551,14 +552,18 @@ neededEvVars implic@(Implic { ic_given = givens = do { ev_binds <- TcS.getTcEvBindsMap ev_binds_var ; tcvs <- TcS.getTcEvTyCoVars ev_binds_var - ; let seeds1 = foldr add_implic_seeds old_needs implics - seeds2 = nonDetStrictFoldEvBindMap add_wanted seeds1 ev_binds - -- It's OK to use a non-deterministic fold here - -- because add_wanted is commutative - seeds3 = seeds2 `unionVarSet` tcvs - need_inner = findNeededEvVars ev_binds seeds3 - live_ev_binds = filterEvBindMap (needed_ev_bind need_inner) ev_binds - need_outer = varSetMinusEvBindMap need_inner live_ev_binds + ; let seeds_i = get_implic_needs normal_implics + seeds_w = nonDetStrictFoldEvBindMap add_wanted emptyVarSet ev_binds + -- It's OK to use a non-deterministic fold here + -- because add_wanted is commutative + all_seeds = old_needs `unionVarSet` seeds_i `unionVarSet` seeds_w `unionVarSet` tcvs + + need_inner_ignoring_dms = findNeededEvVars ev_binds all_seeds + need_inner_from_dms = findNeededEvVars ev_binds (get_implic_needs dm_implics) + need_inner_full = need_inner_ignoring_dms `unionVarSet` need_inner_from_dms + live_ev_binds = filterEvBindMap (needed_ev_bind need_inner_full) ev_binds + + need_outer = varSetMinusEvBindMap need_inner_full live_ev_binds `delVarSetList` givens ; TcS.setTcEvBindsMap ev_binds_var live_ev_binds @@ -566,23 +571,26 @@ neededEvVars implic@(Implic { ic_given = givens ; traceTcS "neededEvVars" $ vcat [ text "old_needs:" <+> ppr old_needs - , text "seeds3:" <+> ppr seeds3 + , text "all_seeds:" <+> ppr all_seeds , text "tcvs:" <+> ppr tcvs , text "ev_binds:" <+> ppr ev_binds , text "live_ev_binds:" <+> ppr live_ev_binds ] - ; return (implic { ic_need_inner = need_inner + ; return (implic { ic_need_inner = need_inner_ignoring_dms , ic_need_outer = need_outer }) } where - add_implic_seeds (Implic { ic_need_outer = needs, ic_info = skol_info }) acc - | MethSkol _ is_dm <- skol_info - , is_dm -- See Note [Ignore 'needs' from default methods] - = acc - | otherwise + (dm_implics, normal_implics) = partitionBag is_dm_implic implics + -- dm_implics is usually empty + + is_dm_implic (Implic { ic_info = skol_info }) + | MethSkol _ is_dm <- skol_info = is_dm + | otherwise = False + + get_implic_needs = foldr add_implic_seeds emptyVarSet + add_implic_seeds (Implic { ic_need_outer = needs }) acc = needs `unionVarSet` acc - needed_ev_bind needed (EvBind { eb_lhs = ev_var - , eb_info = info }) + needed_ev_bind needed (EvBind { eb_lhs = ev_var, eb_info = info }) | EvBindGiven{} <- info = ev_var `elemVarSet` needed | otherwise = True -- Keep all wanted bindings View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/379158f739fc50273fdf96c0f6bfdeb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/379158f739fc50273fdf96c0f6bfdeb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/int-index/enforce-namespaces] use NonEmpty, add comments, test cases
by Vladislav Zavialov (＠int-index) 07 May '25

07 May '25

Vladislav Zavialov pushed to branch wip/int-index/enforce-namespaces at Glasgow Haskell Compiler / GHC Commits: b313d5f4 by Vladislav Zavialov at 2025-05-08T01:34:50+03:00 use NonEmpty, add comments, test cases - - - - - 20 changed files: - compiler/GHC/Rename/Names.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - + testsuite/tests/rename/should_compile/T25983a.hs - testsuite/tests/rename/should_compile/T25983.stderr → testsuite/tests/rename/should_compile/T25983a.stderr - + testsuite/tests/rename/should_compile/T25983b.hs - + testsuite/tests/rename/should_compile/T25983b.stderr - + testsuite/tests/rename/should_compile/T25983c.hs - + testsuite/tests/rename/should_compile/T25983c.stderr - testsuite/tests/rename/should_compile/T25983.hs → testsuite/tests/rename/should_compile/T25983d.hs - + testsuite/tests/rename/should_compile/T25983d.stderr - + testsuite/tests/rename/should_compile/T25983e.hs - + testsuite/tests/rename/should_compile/T25983e.stderr - + testsuite/tests/rename/should_compile/T25983f.hs - + testsuite/tests/rename/should_compile/T25983f.stderr - + testsuite/tests/rename/should_compile/T25983g.hs - + testsuite/tests/rename/should_compile/T25983g.stderr - testsuite/tests/rename/should_compile/T25984a.stderr - testsuite/tests/rename/should_compile/all.T - testsuite/tests/rename/should_fail/T9006.stderr Changes: ===================================== compiler/GHC/Rename/Names.hs ===================================== @@ -1268,7 +1268,7 @@ filterImports hsc_env iface decl_spec (Just (want_hiding, L l import_items)) warning_msg (BadImportW ie sub) = do -- 'BadImportW' is only constructed below in 'bad_import_w', in -- the 'EverythingBut' case, so here we assume a 'hiding' clause. - (reason : _) <- badImportItemErr iface decl_spec ie sub all_avails + (reason :| _) <- badImportItemErr iface decl_spec ie sub all_avails pure (TcRnDodgyImports (DodgyImportsHiding reason)) warning_msg (DeprecatedExport n w) = pure $ TcRnPragmaWarning @@ -1281,14 +1281,14 @@ filterImports hsc_env iface decl_spec (Just (want_hiding, L l import_items)) run_lookup def m = case m of Failed err -> do msgs <- lookup_err_msgs err - mapM_ addErr [TcRnImportLookup msg | msg <- msgs] + forM_ msgs $ \msg -> addErr (TcRnImportLookup msg) return def Succeeded a -> return a lookup_err_msgs err = case err of BadImport ie sub -> badImportItemErr iface decl_spec ie sub all_avails - IllegalImport -> pure [ImportLookupIllegal] - QualImportError rdr -> pure [ImportLookupQualified rdr] + IllegalImport -> pure $ NE.singleton ImportLookupIllegal + QualImportError rdr -> pure $ NE.singleton (ImportLookupQualified rdr) -- For each import item, we convert its RdrNames to Names, -- and at the same time compute all the GlobalRdrElt corresponding @@ -1642,7 +1642,7 @@ lookupChildren :: [GlobalRdrElt] -> ( [LookupChildError] -- The ones for which the lookup failed , [LocatedA GlobalRdrElt] ) -- (lookupChildren all_kids rdr_items) maps each rdr_item to its --- corresponding Name all_kids, if the former exists +-- corresponding Name in all_kids, if the former exists -- The matching is done by FastString, not OccName, so that -- Cls( meth, AssocTy ) -- will correctly find AssocTy among the all_kids of Cls, even though @@ -1652,20 +1652,34 @@ lookupChildren all_kids rdr_items = (fails, successes) where mb_xs = map do_one rdr_items fails = [ err | Failed err <- mb_xs ] - successes = [ ok | Succeeded oks <- mb_xs, ok <- oks ] + successes = [ ok | Succeeded oks <- mb_xs, ok <- NE.toList oks ] - do_one :: LIEWrappedName GhcPs -> MaybeErr LookupChildError [LocatedA GlobalRdrElt] + do_one :: LIEWrappedName GhcPs -> MaybeErr LookupChildError (NonEmpty (LocatedA GlobalRdrElt)) do_one item@(L l r) = case r of - IEName{} | notNull val_gs -> Succeeded [L l g | g <- val_gs] - IEName{} | notNull typ_gs -> Succeeded [L l g | g <- typ_gs] - IEType{} | notNull typ_gs -> Succeeded [L l g | g <- typ_gs] - IEType{} | (g:_) <- val_gs -> Failed $ LookupChildNonType item g - _ -> Failed $ LookupChildNotFound item + IEName{} + -- IEName (unadorned name) places no restriction on the namespace of + -- the imported entity, so we look in both `val_gres` and `typ_gres`. + -- In case of conflict (punning), the value namespace takes priority. + -- See Note [Prioritise the value namespace in subordinate import lists] + | (gre:gres) <- val_gres -> Succeeded $ fmap (L l) (gre:|gres) + | (gre:gres) <- typ_gres -> Succeeded $ fmap (L l) (gre:|gres) + | otherwise -> Failed $ LookupChildNotFound item + + IEType{} + -- IEType ('type' namespace specifier) restricts the lookup to the + -- type namespace, i.e. to `typ_gres`. In case of failure, we check + -- `val_gres` to produce a more helpful error message. + | (gre:gres) <- typ_gres -> Succeeded $ fmap (L l) (gre:|gres) + | (gre:_) <- val_gres -> Failed $ LookupChildNonType item gre + | otherwise -> Failed $ LookupChildNotFound item + + IEPattern{} -> panic "lookupChildren: IEPattern" -- Never happens (invalid syntax) + IEDefault{} -> panic "lookupChildren: IEDefault" -- Never happens (invalid syntax) where fs = (occNameFS . rdrNameOcc . ieWrappedName) r - gs = fromMaybe [] (lookupFsEnv kid_env fs) - (val_gs, typ_gs) = partition (isValNameSpace . greNameSpace) gs + gres = fromMaybe [] (lookupFsEnv kid_env fs) + (val_gres, typ_gres) = partition (isValNameSpace . greNameSpace) gres -- See Note [Children for duplicate record fields] kid_env :: FastStringEnv [GlobalRdrElt] @@ -1673,6 +1687,38 @@ lookupChildren all_kids rdr_items = (fails, successes) [(occNameFS (occName x), [x]) | x <- all_kids] +{- Note [Prioritise the value namespace in subordinate import lists] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Consider this program that defines a class that has both an associated type +named (#) and a method named (#) + + module M_assoc where + class C a b where + type a # b + (#) :: a -> b -> () + module N_assoc where + import M_assoc( C((#)) ) + +In the import declaration, when we see the unadorned name (#) in the subordinate +import list of C, which children should we bring into scope? Our options are: + + a) only the method (#) + b) only the associated type (#) + c) both the method and the associated type + +To follow the precedent established by top-level items, we go with option (a). +Indeed, consider a slightly different program + + module M_top where + type family a # b + a # b = () + module N_top where + import M_top( (#) ) + +Here the import brings only the function (#) into scope, and one has to say +`type (#)` to get the type family. +-} + ------------------------------- {- @@ -2331,27 +2377,31 @@ badImportItemErr :: ModIface -> ImpDeclSpec -> IE GhcPs -> IsSubordinateError -> [AvailInfo] - -> TcRn [ImportLookupReason] -- non-empty + -> TcRn (NonEmpty ImportLookupReason) badImportItemErr iface decl_spec ie sub avails = do patsyns_enabled <- xoptM LangExt.PatternSynonyms expl_ns_enabled <- xoptM LangExt.ExplicitNamespaces + let import_lookup_bad :: BadImportKind -> ImportLookupReason + import_lookup_bad k = ImportLookupBad k iface decl_spec ie patsyns_enabled dflags <- getDynFlags hsc_env <- getTopEnv let rdr_env = mkGlobalRdrEnv $ gresFromAvails hsc_env (Just imp_spec) all_avails - pure [ImportLookupBad k iface decl_spec ie patsyns_enabled | k <- importErrorKind dflags rdr_env expl_ns_enabled ] + pure $ fmap import_lookup_bad (importErrorKind dflags rdr_env expl_ns_enabled) where + importErrorKind :: DynFlags -> GlobalRdrEnv -> Bool -> NonEmpty BadImportKind importErrorKind dflags rdr_env expl_ns_enabled | any checkIfTyCon avails = case sub of - IsNotSubordinate -> [BadImportAvailTyCon expl_ns_enabled] + IsNotSubordinate -> NE.singleton (BadImportAvailTyCon expl_ns_enabled) IsSubordinateError { subordinate_err_parent = gre , subordinate_err_unavailable = unavailable , subordinate_err_nontype = nontype } - -> [BadImportNotExportedSubordinates gre unavailable | notNull unavailable] ++ - [BadImportNonTypeSubordinates gre nontype | notNull nontype ] - | any checkIfVarName avails = [BadImportAvailVar] - | Just con <- find checkIfDataCon avails = [BadImportAvailDataCon (availOccName con)] - | otherwise = [BadImportNotExported suggs] + -> NE.fromList $ catMaybes $ + [ fmap (BadImportNotExportedSubordinates gre) (NE.nonEmpty unavailable) + , fmap (BadImportNonTypeSubordinates gre) (NE.nonEmpty nontype) ] + | any checkIfVarName avails = NE.singleton BadImportAvailVar + | Just con <- find checkIfDataCon avails = NE.singleton (BadImportAvailDataCon (availOccName con)) + | otherwise = NE.singleton (BadImportNotExported suggs) where suggs = similar_suggs ++ fieldSelectorSuggestions rdr_env rdr what_look = case sub of ===================================== compiler/GHC/Tc/Errors/Ppr.hs ===================================== @@ -119,6 +119,7 @@ import GHC.Data.List.SetOps ( nubOrdBy ) import GHC.Data.Maybe import GHC.Data.Pair import GHC.Settings.Constants (mAX_TUPLE_SIZE, mAX_CTUPLE_SIZE) +import GHC.Utils.Lexeme import GHC.Utils.Misc import GHC.Utils.Outputable import GHC.Utils.Panic @@ -5886,24 +5887,35 @@ pprImportLookup = \case where tycon_occ = rdrNameOcc $ ieName ie tycon = parenSymOcc tycon_occ (ppr tycon_occ) - BadImportNotExportedSubordinates gre unavailable -> + BadImportNotExportedSubordinates gre unavailable1 -> withContext [ what <+> text "called" <+> parent_name <+> text "is exported, but it does not export" , text "any" <+> what_children <+> text "called" <+> unavailable_names <> dot ] where + unavailable = NE.toList unavailable1 parent_name = (quotes . pprPrefixOcc . nameOccName . gre_name) gre unavailable_names = pprWithCommas (quotes . ppr) unavailable - (what, what_children) = case greInfo gre of - IAmTyCon ClassFlavour -> (text "a class", text "class methods or associated types") - IAmTyCon _ -> (text "a data type", text "constructors or record fields") - _ -> (text "an item", text "children") - BadImportNonTypeSubordinates gre nontype -> + any_names p = any (p . unpackFS) unavailable + what = case greInfo gre of + IAmTyCon ClassFlavour -> text "a class" + IAmTyCon _ -> text "a data type" + _ -> text "an item" + what_children = unquotedListWith "or" $ case greInfo gre of + IAmTyCon ClassFlavour -> + [text "class methods" | any_names okVarOcc ] ++ + [text "associated types" | any_names okTcOcc ] + IAmTyCon _ -> + [text "constructors" | any_names okConOcc ] ++ + [text "record fields" | any_names okVarOcc ] + _ -> [text "children"] + BadImportNonTypeSubordinates gre nontype1 -> withContext [ what <+> text "called" <+> parent_name <+> text "is exported," , sep [ text "but its subordinate" <+> "item" <> plural nontype <+> nontype_names , isOrAre nontype <+> "not in the type namespace." ] ] where + nontype = NE.toList nontype1 parent_name = (quotes . pprPrefixOcc . nameOccName . gre_name) gre nontype_names = pprWithCommas (quotes . pprPrefixOcc . nameOccName . gre_name) nontype what = case greInfo gre of ===================================== compiler/GHC/Tc/Errors/Types.hs ===================================== @@ -5837,9 +5837,9 @@ data BadImportKind -- @import Data.Maybe (Just)@ instead of @import Data.Maybe (Maybe(Just))@ | BadImportAvailDataCon OccName -- | The parent does not export the given children. - | BadImportNotExportedSubordinates !GlobalRdrElt [FastString] + | BadImportNotExportedSubordinates !GlobalRdrElt (NonEmpty FastString) -- | Incorrect @type@ keyword when importing subordinates that aren't types. - | BadImportNonTypeSubordinates !GlobalRdrElt [GlobalRdrElt] + | BadImportNonTypeSubordinates !GlobalRdrElt (NonEmpty GlobalRdrElt) -- | Incorrect @type@ keyword when importing something which isn't a type. | BadImportAvailVar deriving Generic ===================================== testsuite/tests/rename/should_compile/T25983a.hs ===================================== @@ -0,0 +1,5 @@ +{-# OPTIONS -Wdodgy-imports #-} + +module T25983a where + +import Prelude hiding (Bool(X,Y)) ===================================== testsuite/tests/rename/should_compile/T25983.stderr → testsuite/tests/rename/should_compile/T25983a.stderr ===================================== @@ -1,5 +1,5 @@ -T25983.hs:5:24: warning: [GHC-10237] [-Wdodgy-imports (in -Wextra)] +T25983a.hs:5:24: warning: [GHC-10237] [-Wdodgy-imports (in -Wextra)] In the import of ‘Prelude’: a data type called ‘Bool’ is exported, but it does not export - any constructors or record fields called ‘X’. + any constructors called ‘X’, ‘Y’. ===================================== testsuite/tests/rename/should_compile/T25983b.hs ===================================== @@ -0,0 +1,5 @@ +{-# OPTIONS -Wdodgy-imports #-} + +module T25983b where + +import Prelude hiding (Bool(fld1,fld2)) ===================================== testsuite/tests/rename/should_compile/T25983b.stderr ===================================== @@ -0,0 +1,5 @@ +T25983b.hs:5:24: warning: [GHC-10237] [-Wdodgy-imports (in -Wextra)] + In the import of ‘Prelude’: + a data type called ‘Bool’ is exported, but it does not export + any record fields called ‘fld1’, ‘fld2’. + ===================================== testsuite/tests/rename/should_compile/T25983c.hs ===================================== @@ -0,0 +1,5 @@ +{-# OPTIONS -Wdodgy-imports #-} + +module T25983c where + +import Prelude hiding (Bool(X,Y,fld1,fld2)) ===================================== testsuite/tests/rename/should_compile/T25983c.stderr ===================================== @@ -0,0 +1,5 @@ +T25983c.hs:5:24: warning: [GHC-10237] [-Wdodgy-imports (in -Wextra)] + In the import of ‘Prelude’: + a data type called ‘Bool’ is exported, but it does not export + any constructors or record fields called ‘X’, ‘Y’, ‘fld1’, ‘fld2’. + ===================================== testsuite/tests/rename/should_compile/T25983.hs → testsuite/tests/rename/should_compile/T25983d.hs ===================================== @@ -1,5 +1,5 @@ {-# OPTIONS -Wdodgy-imports #-} -module T25983 where +module T25983d where -import Prelude hiding (Bool(X)) +import Prelude hiding (Num((#))) ===================================== testsuite/tests/rename/should_compile/T25983d.stderr ===================================== @@ -0,0 +1,5 @@ +T25983d.hs:5:24: warning: [GHC-10237] [-Wdodgy-imports (in -Wextra)] + In the import of ‘Prelude’: + a class called ‘Num’ is exported, but it does not export + any class methods or associated types called ‘#’. + ===================================== testsuite/tests/rename/should_compile/T25983e.hs ===================================== @@ -0,0 +1,5 @@ +{-# OPTIONS -Wdodgy-imports #-} + +module T25983e where + +import Prelude hiding (Num(f,g)) ===================================== testsuite/tests/rename/should_compile/T25983e.stderr ===================================== @@ -0,0 +1,5 @@ +T25983e.hs:5:24: warning: [GHC-10237] [-Wdodgy-imports (in -Wextra)] + In the import of ‘Prelude’: + a class called ‘Num’ is exported, but it does not export + any class methods called ‘f’, ‘g’. + ===================================== testsuite/tests/rename/should_compile/T25983f.hs ===================================== @@ -0,0 +1,5 @@ +{-# OPTIONS -Wdodgy-imports #-} + +module T25983f where + +import Prelude hiding (Num(F,G)) ===================================== testsuite/tests/rename/should_compile/T25983f.stderr ===================================== @@ -0,0 +1,5 @@ +T25983f.hs:5:24: warning: [GHC-10237] [-Wdodgy-imports (in -Wextra)] + In the import of ‘Prelude’: + a class called ‘Num’ is exported, but it does not export + any associated types called ‘F’, ‘G’. + ===================================== testsuite/tests/rename/should_compile/T25983g.hs ===================================== @@ -0,0 +1,5 @@ +{-# OPTIONS -Wdodgy-imports #-} + +module T25983g where + +import Prelude hiding (Num(F,G,f,g)) ===================================== testsuite/tests/rename/should_compile/T25983g.stderr ===================================== @@ -0,0 +1,5 @@ +T25983g.hs:5:24: warning: [GHC-10237] [-Wdodgy-imports (in -Wextra)] + In the import of ‘Prelude’: + a class called ‘Num’ is exported, but it does not export + any class methods or associated types called ‘F’, ‘G’, ‘f’, ‘g’. + ===================================== testsuite/tests/rename/should_compile/T25984a.stderr ===================================== @@ -1,5 +1,5 @@ T25984a.hs:5:31: warning: [GHC-10237] [-Wdodgy-imports (in -Wextra)] In the import of ‘T25984a_helper’: a data type called ‘H’ is exported, but it does not export - any constructors or record fields called ‘C’. + any constructors called ‘C’. ===================================== testsuite/tests/rename/should_compile/all.T ===================================== @@ -233,5 +233,11 @@ test('T25182', [extra_files(['ReExportTuples.hs'])], multimod_compile, ['T25182' test('T22581c', [extra_files(['T22581c_helper.hs'])], multimod_compile, ['T22581c', '-v0']) test('T22581d', combined_output, ghci_script, ['T22581d.script']) test('T25991a', [extra_files(['T25991a_helper.hs'])], multimod_compile, ['T25991a', '-v0']) -test('T25983', normal, compile, ['']) +test('T25983a', normal, compile, ['']) +test('T25983b', normal, compile, ['']) +test('T25983c', normal, compile, ['']) +test('T25983d', normal, compile, ['']) +test('T25983e', normal, compile, ['']) +test('T25983f', normal, compile, ['']) +test('T25983g', normal, compile, ['']) test('T25984a', [extra_files(['T25984a_helper.hs'])], multimod_compile, ['T25984a', '-v0']) ===================================== testsuite/tests/rename/should_fail/T9006.stderr ===================================== @@ -1,5 +1,5 @@ T9006.hs:3:16: error: [GHC-10237] In the import of ‘T9006a’: a data type called ‘T’ is exported, but it does not export - any constructors or record fields called ‘T’. + any constructors called ‘T’. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b313d5f4d1aba23af64be3fd3f34139… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b313d5f4d1aba23af64be3fd3f34139… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/libffi-3.4.8
by Cheng Shao (＠TerrorJack) 07 May '25

07 May '25

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

1 0

[Git][ghc/ghc] Pushed new branch wip/wasm-fix-chrome-ci
by Cheng Shao (＠TerrorJack) 07 May '25

07 May '25

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

1 0

[Git][ghc/ghc] Deleted branch wip/fix-wasm-ci
by Cheng Shao (＠TerrorJack) 07 May '25

07 May '25

Cheng Shao deleted branch wip/fix-wasm-ci at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T25974] Test build wine!
by Serge S. Gulin (＠gulin.serge) 07 May '25

07 May '25

Serge S. Gulin pushed to branch wip/T25974 at Glasgow Haskell Compiler / GHC Commits: ec8d8f36 by Serge S. Gulin at 2025-05-07T19:05:08+03:00 Test build wine! - - - - - 3 changed files: - .gitlab-ci.yml - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -2,7 +2,7 @@ variables: GIT_SSL_NO_VERIFY: "1" # Commit of ghc/ci-images repository from which to pull Docker images - DOCKER_REV: 6e9f8f17086e56e83adae4a8a9d63e2fec3cb6c7 + DOCKER_REV: 14b23867eebc6d5f43e79dab32304175e2416797 # Sequential version number of all cached things. # Bump to invalidate GitLab CI cache. ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -110,9 +110,19 @@ data Opsys | FreeBSD14 | Windows deriving (Eq) +data WineMode + = OnlyTest + -- ^ Wine will be used only to test binaries after cross-compile + -- which means we do cross-compile from Linux to Windows + | FullBuild + -- ^ Wine will be used for full process of compilation + -- which means compilation itself will be executed under Wine. + -- It makes possible to run compilation for Windows environment at Linux machines. + deriving (Eq) + data LinuxDistro = Debian12 - | Debian12Wine + | Debian12Wine WineMode | Debian12Riscv | Debian11 | Debian11Js @@ -316,7 +326,7 @@ distroName Debian12 = "deb12" distroName Debian11 = "deb11" distroName Debian11Js = "deb11-emsdk-closure" distroName Debian12Riscv = "deb12-riscv" -distroName Debian12Wine = "deb12-wine" +distroName (Debian12Wine _) = "deb12-wine" distroName Debian10 = "deb10" distroName Debian9 = "deb9" distroName Fedora33 = "fedora33" @@ -360,6 +370,7 @@ testEnv arch opsys bc = , ["no_tntc" | not (tablesNextToCode bc) ] , ["cross_"++triple | Just triple <- pure $ crossTarget bc ] , [flavourString (mkJobFlavour bc)] + , if opsys == Linux (Debian12Wine FullBuild) then ["_wine_full_build"] else [] ] -- | The hadrian flavour string we are going to use for this build @@ -728,6 +739,7 @@ data ValidateRule | I386Backend -- ^ Run this job when the "i386" label is set | WinArm64 -- ^ Run this job when the "aarch64" and "Windows" labels are set together without "LLVM backend" | WinArm64LLVM -- ^ Run this job when the "aarch64" and "Windows" labels are set together with "LLVM backend" + | WineArm64 -- ^ Run this job when the "aarch64" and "Wine" labels are set deriving (Show, Ord, Eq) -- | Convert the state of the rule into a string that gitlab understand. @@ -781,6 +793,10 @@ validateRuleString WinArm64LLVM = and_all , labelString "Windows" , validateRuleString LLVMBackend ] +validateRuleString WineArm64 = and_all + [ labelString "aarch64" + , labelString "Wine" + ] --------------------------------------------------------------------- -- The Job type @@ -847,6 +863,16 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} } , "bash .gitlab/ci.sh build_hadrian" , "bash .gitlab/ci.sh test_hadrian" ] + | Linux (Debian12Wine FullBuild) <- opsys + = [ "sudo chown ghc:ghc -R ." + , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh setup" + , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh configure" + -- We have to trigger cabal build in an independent way to mitigate Wine hangs at MSYS2/Arm64EC + , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l -c './hadrian/build-cabal clean'" + , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian" + -- It builds, it is already a huge win at the moment of this commit + -- TODO: , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh test_hadrian" + ] | otherwise = [ "find libraries -name config.sub -exec cp config.sub {} \\;" | Darwin == opsys ] ++ [ "sudo chown ghc:ghc -R ." | Linux {} <- [opsys]] ++ @@ -897,6 +923,10 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} } ] in "RUNTEST_ARGS" =: unwords runtestArgs , if testsuiteUsePerf buildConfig then "RUNTEST_ARGS" =: "--config perf_path=perf" else mempty + -- TODO: move me to an appropriate way + , if crossTarget buildConfig == Just "aarch64-unknown-mingw32" && opsys == Linux (Debian12Wine FullBuild) + then "CONFIGURE_ARGS" =: "--build=x86_64-unknown-mingw32 --host=x86_64-unknown-mingw32" + else mempty ] jobArtifacts = Artifacts @@ -1277,51 +1307,73 @@ cross_jobs = [ -- Linux Aarch64 (Wine + FEX + MSYS64) => Windows Aarch64 , makeWinArmJobs $ addValidateRule WinArm64 - (validateBuilds AArch64 (Linux Debian12Wine) winAarch64Config) + (validateBuilds AArch64 (Linux (Debian12Wine OnlyTest)) winAarch64Config) , makeWinArmJobs $ addValidateRule WinArm64LLVM - (validateBuilds AArch64 (Linux Debian12Wine) (winAarch64Config {llvmBootstrap = True})) + (validateBuilds AArch64 (Linux (Debian12Wine OnlyTest)) (winAarch64Config {llvmBootstrap = True})) + , makeWineArmJobs + $ addValidateRule WineArm64 + (validateBuilds AArch64 (Linux (Debian12Wine FullBuild)) winAarch64Config) ] where javascriptConfig = (crossConfig "javascript-unknown-ghcjs" (Emulator "js-emulator") (Just "emconfigure")) { bignumBackend = Native } - makeWinArmJobs = modifyJobs - ( -- Cross compiler validate does not need any docs - setVariable "HADRIAN_ARGS" "--docs=none" - . setVariable "AR" (llvm_prefix ++ "llvm-ar") - . setVariable "CC" (llvm_prefix ++ "clang") - . setVariable "CXX" (llvm_prefix ++ "clang++") - . setVariable "NM" (llvm_prefix ++ "nm") - . setVariable "OBJCOPY" (llvm_prefix ++ "objcopy") - . setVariable "OBJDUMP" (llvm_prefix ++ "objdump") - . setVariable "RANLIB" (llvm_prefix ++ "llvm-ranlib") - . setVariable "SIZE" (llvm_prefix ++ "size") - . setVariable "STRINGS" (llvm_prefix ++ "strings") - . setVariable "STRIP" (llvm_prefix ++ "strip") - . setVariable "WindresCmd" (llvm_prefix ++ "windres") - . setVariable "LLVMAS" (llvm_prefix ++ "clang") - . setVariable "LD" (llvm_prefix ++ "ld") - -- See Note [Empty MergeObjsCmd] - -- Windows target require to make linker merge feature check disabled. - . setVariable "MergeObjsCmd" "" - -- Note [Wide Triple Windows] - -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -- LLVM MinGW Linux Toolchain expects to recieve "aarch64-w64-mingw32" - -- as a triple but we use more common "aarch64-unknown-mingw32". - -- Due of this we need configure ld manually for clang because - -- it will use system's ld otherwise when --target will be specified to - -- unexpected triple. - . setVariable "CFLAGS" cflags - . setVariable "CONF_CC_OPTS_STAGE2" cflags - ) where - llvm_prefix = "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-" - -- See Note [Windows Toolchain Standard Library Options] - cflags = "-fuse-ld=" ++ llvm_prefix ++ "ld --rtlib=compiler-rt" + addWindowsCrossArmVars llvm_prefix exe_suffix cflags = modifyJobs + ( -- Cross compiler validate does not need any docs + setVariable "HADRIAN_ARGS" "--docs=none" + . setVariable "AR" (llvm_prefix ++ "llvm-ar" ++ exe_suffix) + . setVariable "CC" (llvm_prefix ++ "clang") + . setVariable "CXX" (llvm_prefix ++ "clang++") + . setVariable "NM" (llvm_prefix ++ "nm" ++ exe_suffix) + . setVariable "OBJCOPY" (llvm_prefix ++ "objcopy") + . setVariable "OBJDUMP" (llvm_prefix ++ "objdump") + . setVariable "RANLIB" (llvm_prefix ++ "llvm-ranlib" ++ exe_suffix) + . setVariable "SIZE" (llvm_prefix ++ "size") + . setVariable "STRINGS" (llvm_prefix ++ "strings") + . setVariable "STRIP" (llvm_prefix ++ "strip") + . setVariable "WindresCmd" (llvm_prefix ++ "windres") + . setVariable "LLVMAS" (llvm_prefix ++ "clang") + . setVariable "LD" (llvm_prefix ++ "ld") + -- See Note [Empty MergeObjsCmd] + -- Windows target require to make linker merge feature check disabled. + . setVariable "MergeObjsCmd" "" + -- Note [Wide Triple Windows] + -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + -- LLVM MinGW Linux Toolchain expects to recieve "aarch64-w64-mingw32" + -- as a triple but we use more common "aarch64-unknown-mingw32". + -- Due of this we need configure ld manually for clang because + -- it will use system's ld otherwise when --target will be specified to + -- unexpected triple. + . setVariable "CFLAGS" cflags + . setVariable "CONF_CC_OPTS_STAGE2" cflags + ) + + makeWinArmJobs = + let + llvm_prefix = "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-" + -- See Note [Windows Toolchain Standard Library Options] + cflags = "-fuse-ld=" ++ llvm_prefix ++ "ld --rtlib=compiler-rt" + in addWindowsCrossArmVars llvm_prefix "" cflags winAarch64Config = (crossConfig "aarch64-unknown-mingw32" (Emulator "/opt/wine-arm64ec-msys2-deb12/bin/wine") Nothing) { bignumBackend = Native } + makeWineArmJobs = + let + llvm_path = "C:/msys64/opt/llvm-mingw-windows/bin" + llvm_prefix = llvm_path ++ "/aarch64-w64-mingw32-" + exe_suffix = ".exe" + -- See Note [Windows Toolchain Standard Library Options] + cflags = "-fuse-ld=" ++ (llvm_path ++ "/bin/ld.lld") ++ "ld --rtlib=compiler-rt -D_UCRT" + in modifyJobs + ( setVariable "TOOLCHAIN_SOURCE" "env" + . setVariable "DLLTOOL" (llvm_path ++ "/dlltool" ++ exe_suffix) + . setVariable "CC_STAGE0" (llvm_path ++ "/bin/x86_64-w64-mingw32-clang") + . setVariable "CONF_CC_OPTS_STAGE0" ("--target=x86_64-unknown-mingw32 " ++ cflags) + . setVariable "CONF_CC_OPTS_STAGE1" cflags + ) . (addWindowsCrossArmVars llvm_prefix exe_suffix cflags) + make_wasm_jobs cfg = modifyJobs ( -- See Note [Testing wasm ghci browser mode] @@ -1381,6 +1433,7 @@ platform_mapping = Map.map go combined_result , "x86_64-windows-validate" , "aarch64-linux-deb12-validate" , "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate" + , "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build" , "nightly-x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf" , "nightly-x86_64-linux-deb11-validate" , "nightly-x86_64-linux-deb12-validate" @@ -1389,6 +1442,7 @@ platform_mapping = Map.map go combined_result , "nightly-aarch64-linux-deb10-validate" , "nightly-aarch64-linux-deb12-validate" , "nightly-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate" + , "nightly-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build" , "nightly-x86_64-linux-alpine3_12-validate" , "nightly-x86_64-linux-deb10-validate" , "nightly-x86_64-linux-fedora33-release" ===================================== .gitlab/jobs.yaml ===================================== @@ -477,6 +477,92 @@ "WindresCmd": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-windres" } }, + "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build": { + "after_script": [ + ".gitlab/ci.sh save_cache", + ".gitlab/ci.sh save_test_output", + ".gitlab/ci.sh clean", + "cat ci_timings" + ], + "allow_failure": false, + "artifacts": { + "expire_in": "2 weeks", + "paths": [ + "ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build.tar.xz", + "junit.xml", + "unexpected-test-output.tar.gz" + ], + "reports": { + "junit": "junit.xml" + }, + "when": "always" + }, + "cache": { + "key": "aarch64-linux-deb12-wine-$CACHE_REV", + "paths": [ + "cabal-cache", + "toolchain" + ] + }, + "dependencies": [], + "image": "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb12-wine:$DOCKER_…", + "needs": [ + { + "artifacts": false, + "job": "hadrian-ghc-in-ghci" + } + ], + "rules": [ + { + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\baarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build(\\s|$).*/)) || (($ONLY_JOBS == null) && ((($CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/) || ($CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/) || ($CI_COMMIT_BRANCH == \"master\") || ($CI_COMMIT_BRANCH =~ /ghc-[0-9]+\\.[0-9]+/)) || (($CI_MERGE_REQUEST_LABELS =~ /.*aarch64.*/) && ($CI_MERGE_REQUEST_LABELS =~ /.*Wine.*/))))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "when": "on_success" + } + ], + "script": [ + "sudo chown ghc:ghc -R .", + "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh setup", + "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh configure", + "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l -c './hadrian/build-cabal clean'", + "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian" + ], + "stage": "full-build", + "tags": [ + "aarch64-linux" + ], + "variables": { + "AR": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-llvm-ar.exe", + "BIGNUM_BACKEND": "native", + "BIN_DIST_NAME": "ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build", + "BUILD_FLAVOUR": "validate", + "CC": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-clang", + "CC_STAGE0": "C:/msys64/opt/llvm-mingw-windows/bin/bin/x86_64-w64-mingw32-clang", + "CFLAGS": "-fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/bin/ld.lldld --rtlib=compiler-rt -D_UCRT", + "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check --build=x86_64-unknown-mingw32 --host=x86_64-unknown-mingw32", + "CONF_CC_OPTS_STAGE0": "--target=x86_64-unknown-mingw32 -fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/bin/ld.lldld --rtlib=compiler-rt -D_UCRT", + "CONF_CC_OPTS_STAGE1": "-fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/bin/ld.lldld --rtlib=compiler-rt -D_UCRT", + "CONF_CC_OPTS_STAGE2": "-fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/bin/ld.lldld --rtlib=compiler-rt -D_UCRT", + "CROSS_EMULATOR": "/opt/wine-arm64ec-msys2-deb12/bin/wine", + "CROSS_TARGET": "aarch64-unknown-mingw32", + "CXX": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-clang++", + "DLLTOOL": "C:/msys64/opt/llvm-mingw-windows/bin/dlltool.exe", + "HADRIAN_ARGS": "--docs=none", + "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", + "LD": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-ld", + "LLVMAS": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-clang", + "MergeObjsCmd": "", + "NM": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-nm.exe", + "OBJCOPY": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-objcopy", + "OBJDUMP": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-objdump", + "RANLIB": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-llvm-ranlib.exe", + "RUNTEST_ARGS": "", + "SIZE": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-size", + "STRINGS": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-strings", + "STRIP": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-strip", + "TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build", + "TOOLCHAIN_SOURCE": "env", + "WindresCmd": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-windres" + } + }, "i386-linux-alpine3_20-validate": { "after_script": [ ".gitlab/ci.sh save_cache", @@ -1148,6 +1234,93 @@ "XZ_OPT": "-9" } }, + "nightly-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build": { + "after_script": [ + ".gitlab/ci.sh save_cache", + ".gitlab/ci.sh save_test_output", + ".gitlab/ci.sh clean", + "cat ci_timings" + ], + "allow_failure": false, + "artifacts": { + "expire_in": "8 weeks", + "paths": [ + "ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build.tar.xz", + "junit.xml", + "unexpected-test-output.tar.gz" + ], + "reports": { + "junit": "junit.xml" + }, + "when": "always" + }, + "cache": { + "key": "aarch64-linux-deb12-wine-$CACHE_REV", + "paths": [ + "cabal-cache", + "toolchain" + ] + }, + "dependencies": [], + "image": "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb12-wine:$DOCKER_…", + "needs": [ + { + "artifacts": false, + "job": "hadrian-ghc-in-ghci" + } + ], + "rules": [ + { + "if": "(\"true\" == \"true\") && ($RELEASE_JOB != \"yes\") && ($NIGHTLY)", + "when": "on_success" + } + ], + "script": [ + "sudo chown ghc:ghc -R .", + "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh setup", + "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh configure", + "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l -c './hadrian/build-cabal clean'", + "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian" + ], + "stage": "full-build", + "tags": [ + "aarch64-linux" + ], + "variables": { + "AR": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-llvm-ar.exe", + "BIGNUM_BACKEND": "native", + "BIN_DIST_NAME": "ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build", + "BUILD_FLAVOUR": "validate", + "CC": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-clang", + "CC_STAGE0": "C:/msys64/opt/llvm-mingw-windows/bin/bin/x86_64-w64-mingw32-clang", + "CFLAGS": "-fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/bin/ld.lldld --rtlib=compiler-rt -D_UCRT", + "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check --build=x86_64-unknown-mingw32 --host=x86_64-unknown-mingw32", + "CONF_CC_OPTS_STAGE0": "--target=x86_64-unknown-mingw32 -fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/bin/ld.lldld --rtlib=compiler-rt -D_UCRT", + "CONF_CC_OPTS_STAGE1": "-fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/bin/ld.lldld --rtlib=compiler-rt -D_UCRT", + "CONF_CC_OPTS_STAGE2": "-fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/bin/ld.lldld --rtlib=compiler-rt -D_UCRT", + "CROSS_EMULATOR": "/opt/wine-arm64ec-msys2-deb12/bin/wine", + "CROSS_TARGET": "aarch64-unknown-mingw32", + "CXX": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-clang++", + "DLLTOOL": "C:/msys64/opt/llvm-mingw-windows/bin/dlltool.exe", + "HADRIAN_ARGS": "--docs=none", + "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", + "LD": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-ld", + "LLVMAS": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-clang", + "MergeObjsCmd": "", + "NM": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-nm.exe", + "OBJCOPY": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-objcopy", + "OBJDUMP": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-objdump", + "RANLIB": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-llvm-ranlib.exe", + "RUNTEST_ARGS": "", + "SIZE": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-size", + "STRINGS": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-strings", + "STRIP": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-strip", + "TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build", + "TOOLCHAIN_SOURCE": "env", + "WindresCmd": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-windres", + "XZ_OPT": "-9" + } + }, "nightly-i386-linux-alpine3_20-validate": { "after_script": [ ".gitlab/ci.sh save_cache", View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ec8d8f36c639925d7b43acaeb50942b… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ec8d8f36c639925d7b43acaeb50942b… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 8 commits: Refactor mkTopLevImportedEnv out of mkTopLevEnv
by Marge Bot (＠marge-bot) 07 May '25

07 May '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: e46c6b18 by Rodrigo Mesquita at 2025-05-06T09:01:57-04:00 Refactor mkTopLevImportedEnv out of mkTopLevEnv This makes the code clearer and allows the top-level import context to be fetched directly from the HomeModInfo through the API (e.g. useful for the debugger). - - - - - 0ce0d263 by Rodrigo Mesquita at 2025-05-06T09:01:57-04:00 Export sizeOccEnv from GHC.Types.Name.Occurrence Counts the number of OccNames in an OccEnv - - - - - 165f98d8 by Simon Peyton Jones at 2025-05-06T09:02:39-04:00 Fix a bad untouchability bug im simplifyInfer This patch addresses #26004. The root cause was that simplifyInfer was willing to unify variables "far out". The fix, in runTcSWithEvBinds', is to initialise the inert set given-eq level with the current level. See (TGE6) in Note [Tracking Given equalities] in GHC.Tc.Solver.InertSet Two loosely related refactors: * Refactored approximateWCX to return just the free type variables of the un-quantified constraints. That avoids duplication of work (these free vars are needed in simplifyInfer) and makes it clearer that the constraints themselves are irrelevant. * A little local refactor of TcSMode, which reduces the number of parameters to runTcSWithEvBinds - - - - - b36e638d by Andreas Klebinger at 2025-05-07T11:33:52-04:00 Interpreter: Add limited support for direct primop evaluation. This commit adds support for a number of primops directly to the interpreter. This avoids the indirection of going through the primop wrapper for those primops speeding interpretation of optimized code up massively. Code involving IntSet runs about 25% faster with optimized core and these changes. For core without breakpoints it's even more pronouced and I saw reductions in runtime by up to 50%. Running GHC itself in the interpreter was sped up by ~15% through this change. Additionally this comment does a few other related changes: testsuite: * Run foundation test in ghci and ghci-opt ways to test these primops. * Vastly expand the foundation test to cover all basic primops by comparing result with the result of calling the wrapper. Interpreter: * When pushing arguments for interpreted primops extend each argument to at least word with when pushing. This avoids some issues with big endian. We can revisit this if it causes performance issues. * Restructure the stack chunk check logic. There are now macros for read accesses which might cross stack chunk boundries and macros which omit the checks which are used when we statically know we access an address in the current stack chunk. - - - - - c35abe61 by Ben Gamari at 2025-05-07T11:33:55-04:00 testsuite: Always run T25653 in optasm As noted in the !14120, this manifests when optimisation is enabled. It makes sense to run it in the fast validation pipeline. - - - - - add4e54a by Ben Gamari at 2025-05-07T11:33:56-04:00 llvmGen: Fix built-in variable predicate Previously the predicate to identify LLVM builtin global variables was checking for `$llvm` rather than `@llvm` as it should. - - - - - 83354673 by Ben Gamari at 2025-05-07T11:33:56-04:00 llvmGen: Fix linkage of built-in arrays LLVM now insists that built-in arrays use Appending linkage, not Internal. Fixes #25769. - - - - - 6836f724 by sheaf at 2025-05-07T11:34:10-04:00 Use mkTrAppChecked in ds_ev_typeable This change avoids violating the invariant of mkTrApp according to which the argument should not be a fully saturated function type. This ensures we don't return false negatives for type equality involving function types. Fixes #25998 - - - - - 35 changed files: - compiler/GHC/Builtin/Names.hs - compiler/GHC/Builtin/primops.txt.pp - compiler/GHC/ByteCode/Asm.hs - compiler/GHC/ByteCode/Instr.hs - compiler/GHC/CmmToLlvm/Base.hs - compiler/GHC/CmmToLlvm/Data.hs - compiler/GHC/HsToCore/Binds.hs - compiler/GHC/HsToCore/Pmc/Solver/Types.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/StgToByteCode.hs - compiler/GHC/Tc/Solver.hs - compiler/GHC/Tc/Solver/InertSet.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/Types/Constraint.hs - compiler/GHC/Types/Name/Occurrence.hs - rts/Disassembler.c - rts/Interpreter.c - rts/include/rts/Bytecodes.h - testsuite/tests/codeGen/should_run/all.T - + testsuite/tests/ghci/all.T - + testsuite/tests/ghci/ghci-mem-primops.hs - + testsuite/tests/ghci/ghci-mem-primops.script - + testsuite/tests/ghci/ghci-mem-primops.stdout - testsuite/tests/numeric/should_run/all.T - testsuite/tests/numeric/should_run/foundation.hs - testsuite/tests/numeric/should_run/foundation.stdout - + testsuite/tests/typecheck/should_fail/T26004.hs - + testsuite/tests/typecheck/should_fail/T26004.stderr - testsuite/tests/typecheck/should_fail/T7453.stderr - testsuite/tests/typecheck/should_fail/all.T - + testsuite/tests/typecheck/should_run/T25998.hs - + testsuite/tests/typecheck/should_run/T25998.stdout - testsuite/tests/typecheck/should_run/all.T - utils/genprimopcode/Main.hs - utils/genprimopcode/Syntax.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/85fc3ef896ac45f2fed9757e5da474… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/85fc3ef896ac45f2fed9757e5da474… You're receiving this email because of your account on gitlab.haskell.org.

1 0