- ghc-commits - Haskell.org

[Git][ghc/ghc] Pushed new branch wip/T17912-flaky
by Cheng Shao (＠TerrorJack) 30 Mar '26

30 Mar '26

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

1 0

[Git][ghc/ghc][wip/mangoiv/fix-static-001-darwin] Deleted 1 commit: REVERT: only run on beta
by Magnus (＠MangoIV) 30 Mar '26

30 Mar '26

Magnus pushed to branch wip/mangoiv/fix-static-001-darwin at Glasgow Haskell Compiler / GHC WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: 30216cc7 by mangoiv at 2026-03-28T18:53:15+01:00 REVERT: only run on beta - - - - - 2 changed files: - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml Changes: ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -301,8 +301,8 @@ runnerTag arch (Linux _) = Amd64 -> "x86_64-linux" AArch64 -> "aarch64-linux" I386 -> "x86_64-linux" -runnerTag AArch64 Darwin = "aarch64-darwin" -runnerTag Amd64 Darwin = "x86_64-darwin-m1" +runnerTag AArch64 Darwin = "beta" +runnerTag Amd64 Darwin = "beta" runnerTag Amd64 Windows = "new-x86_64-windows" runnerTag Amd64 FreeBSD14 = "x86_64-freebsd14" runnerTag _ _ = error "Invalid arch/opsys" ===================================== .gitlab/jobs.yaml ===================================== @@ -50,7 +50,7 @@ ], "stage": "full-build", "tags": [ - "aarch64-darwin" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -838,7 +838,7 @@ ], "stage": "full-build", "tags": [ - "aarch64-darwin" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -1638,7 +1638,7 @@ ], "stage": "full-build", "tags": [ - "x86_64-darwin-m1" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -3877,7 +3877,7 @@ ], "stage": "full-build", "tags": [ - "aarch64-darwin" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -4459,7 +4459,7 @@ ], "stage": "full-build", "tags": [ - "x86_64-darwin-m1" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -5561,7 +5561,7 @@ ], "stage": "full-build", "tags": [ - "x86_64-darwin-m1" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/30216cc7e5152b9b469abbc835bcdd0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/30216cc7e5152b9b469abbc835bcdd0… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Deleted branch wip/fix-9.12-wasm
by Cheng Shao (＠TerrorJack) 29 Mar '26

29 Mar '26

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

1 0

[Git][ghc/ghc][wip/sjakobi/elem-tests] Improve tests for `elem`
by Simon Jakobi (＠sjakobi2) 29 Mar '26

29 Mar '26

Simon Jakobi pushed to branch wip/sjakobi/elem-tests at Glasgow Haskell Compiler / GHC Commits: 0a50d9ab by Simon Jakobi at 2026-03-29T12:05:43+02:00 Improve tests for `elem` * Improve T17752 by including the Core output in golden files, checking all of -O0, -O1 and -O2. * Add tests for fusion and no-fusion cases. Fixes #27101. - - - - - 13 changed files: - + libraries/base/tests/perf/ElemFusionUnknownList.hs - + libraries/base/tests/perf/ElemFusionUnknownList_O1.stderr - + libraries/base/tests/perf/ElemFusionUnknownList_O2.stderr - + libraries/base/tests/perf/ElemNoFusion.hs - + libraries/base/tests/perf/ElemNoFusion_O1.stderr - + libraries/base/tests/perf/ElemNoFusion_O2.stderr - − libraries/base/tests/perf/Makefile - libraries/base/tests/perf/T17752.hs - − libraries/base/tests/perf/T17752.stdout - + libraries/base/tests/perf/T17752_O0.stderr - + libraries/base/tests/perf/T17752_O1.stderr - + libraries/base/tests/perf/T17752_O2.stderr - libraries/base/tests/perf/all.T Changes: ===================================== libraries/base/tests/perf/ElemFusionUnknownList.hs ===================================== @@ -0,0 +1,21 @@ +-- We expect `elem` to fuse with good producers such as `map`, `concatMap`, +-- and `filter`. +module ElemFusionUnknownList where + +fusionElemMap :: Int -> [Int] -> Bool +fusionElemMap x = elem x . map (+1) + +fusionNotElemMap :: Int -> [Int] -> Bool +fusionNotElemMap x = notElem x . map (+1) + +fusionElemConcatMap :: Int -> [Int] -> Bool +fusionElemConcatMap x = elem x . concatMap (\y -> [y + 1, y + 2]) + +fusionNotElemConcatMap :: Int -> [Int] -> Bool +fusionNotElemConcatMap x = notElem x . concatMap (\y -> [y + 1, y + 2]) + +fusionElemFilter :: Int -> [Int] -> Bool +fusionElemFilter x = elem x . filter odd + +fusionNotElemFilter :: Int -> [Int] -> Bool +fusionNotElemFilter x = notElem x . filter odd ===================================== libraries/base/tests/perf/ElemFusionUnknownList_O1.stderr ===================================== @@ -0,0 +1,124 @@ +fusionNotElemFilter + = \ x eta -> + joinrec { + go1 ds + = case ds of { + [] -> True; + : y ys -> + case y of { I# ipv -> + case remInt# ipv 2# of { + __DEFAULT -> + case x of { I# x1 -> + case ==# x1 ipv of { + __DEFAULT -> jump go1 ys; + 1# -> False + } + }; + 0# -> jump go1 ys + } + } + }; } in + jump go1 eta + +fusionElemFilter + = \ x eta -> + joinrec { + go1 ds + = case ds of { + [] -> False; + : y ys -> + case y of { I# ipv -> + case remInt# ipv 2# of { + __DEFAULT -> + case x of { I# x1 -> + case ==# x1 ipv of { + __DEFAULT -> jump go1 ys; + 1# -> True + } + }; + 0# -> jump go1 ys + } + } + }; } in + jump go1 eta + +fusionNotElemConcatMap + = \ x x1 -> + joinrec { + go1 ds + = case ds of { + [] -> True; + : y ys -> + case y of { I# x2 -> + case x of { I# x3 -> + case ==# x3 (+# x2 1#) of { + __DEFAULT -> + case ==# x3 (+# x2 2#) of { + __DEFAULT -> jump go1 ys; + 1# -> False + }; + 1# -> False + } + } + } + }; } in + jump go1 x1 + +fusionElemConcatMap + = \ x x1 -> + joinrec { + go1 ds + = case ds of { + [] -> False; + : y ys -> + case y of { I# x2 -> + case x of { I# x3 -> + case ==# x3 (+# x2 1#) of { + __DEFAULT -> + case ==# x3 (+# x2 2#) of { + __DEFAULT -> jump go1 ys; + 1# -> True + }; + 1# -> True + } + } + } + }; } in + jump go1 x1 + +fusionNotElemMap + = \ x eta -> + joinrec { + go1 ds + = case ds of { + [] -> True; + : y ys -> + case x of { I# x1 -> + case y of { I# x2 -> + case ==# x1 (+# x2 1#) of { + __DEFAULT -> jump go1 ys; + 1# -> False + } + } + } + }; } in + jump go1 eta + +fusionElemMap + = \ x eta -> + joinrec { + go1 ds + = case ds of { + [] -> False; + : y ys -> + case x of { I# x1 -> + case y of { I# x2 -> + case ==# x1 (+# x2 1#) of { + __DEFAULT -> jump go1 ys; + 1# -> True + } + } + } + }; } in + jump go1 eta + ===================================== libraries/base/tests/perf/ElemFusionUnknownList_O2.stderr ===================================== @@ -0,0 +1,206 @@ +fusionNotElemFilter + = \ x eta -> + joinrec { + go1 ds + = case ds of { + [] -> True; + : y ys -> + case y of { I# ipv -> + case remInt# ipv 2# of { + __DEFAULT -> + case x of { I# x1 -> + case ==# x1 ipv of { + __DEFAULT -> + joinrec { + go2 ds1 + = case ds1 of { + [] -> True; + : y1 ys1 -> + case y1 of { I# ipv1 -> + case remInt# ipv1 2# of { + __DEFAULT -> + case ==# x1 ipv1 of { + __DEFAULT -> jump go2 ys1; + 1# -> False + }; + 0# -> jump go2 ys1 + } + } + }; } in + jump go2 ys; + 1# -> False + } + }; + 0# -> jump go1 ys + } + } + }; } in + jump go1 eta + +fusionElemFilter + = \ x eta -> + joinrec { + go1 ds + = case ds of { + [] -> False; + : y ys -> + case y of { I# ipv -> + case remInt# ipv 2# of { + __DEFAULT -> + case x of { I# x1 -> + case ==# x1 ipv of { + __DEFAULT -> + joinrec { + go2 ds1 + = case ds1 of { + [] -> False; + : y1 ys1 -> + case y1 of { I# ipv1 -> + case remInt# ipv1 2# of { + __DEFAULT -> + case ==# x1 ipv1 of { + __DEFAULT -> jump go2 ys1; + 1# -> True + }; + 0# -> jump go2 ys1 + } + } + }; } in + jump go2 ys; + 1# -> True + } + }; + 0# -> jump go1 ys + } + } + }; } in + jump go1 eta + +fusionNotElemConcatMap + = \ x x1 -> + case x1 of { + [] -> True; + : y ys -> + case y of { I# x2 -> + case x of { I# x3 -> + case ==# x3 (+# x2 1#) of { + __DEFAULT -> + case ==# x3 (+# x2 2#) of { + __DEFAULT -> + joinrec { + go1 ds + = case ds of { + [] -> True; + : y1 ys1 -> + case y1 of { I# x4 -> + case ==# x3 (+# x4 1#) of { + __DEFAULT -> + case ==# x3 (+# x4 2#) of { + __DEFAULT -> jump go1 ys1; + 1# -> False + }; + 1# -> False + } + } + }; } in + jump go1 ys; + 1# -> False + }; + 1# -> False + } + } + } + } + +fusionElemConcatMap + = \ x x1 -> + case x1 of { + [] -> False; + : y ys -> + case y of { I# x2 -> + case x of { I# x3 -> + case ==# x3 (+# x2 1#) of { + __DEFAULT -> + case ==# x3 (+# x2 2#) of { + __DEFAULT -> + joinrec { + go1 ds + = case ds of { + [] -> False; + : y1 ys1 -> + case y1 of { I# x4 -> + case ==# x3 (+# x4 1#) of { + __DEFAULT -> + case ==# x3 (+# x4 2#) of { + __DEFAULT -> jump go1 ys1; + 1# -> True + }; + 1# -> True + } + } + }; } in + jump go1 ys; + 1# -> True + }; + 1# -> True + } + } + } + } + +fusionNotElemMap + = \ x eta -> + case eta of { + [] -> True; + : y ys -> + case x of { I# x1 -> + case y of { I# x2 -> + case ==# x1 (+# x2 1#) of { + __DEFAULT -> + joinrec { + go1 ds + = case ds of { + [] -> True; + : y1 ys1 -> + case y1 of { I# x3 -> + case ==# x1 (+# x3 1#) of { + __DEFAULT -> jump go1 ys1; + 1# -> False + } + } + }; } in + jump go1 ys; + 1# -> False + } + } + } + } + +fusionElemMap + = \ x eta -> + case eta of { + [] -> False; + : y ys -> + case x of { I# x1 -> + case y of { I# x2 -> + case ==# x1 (+# x2 1#) of { + __DEFAULT -> + joinrec { + go1 ds + = case ds of { + [] -> False; + : y1 ys1 -> + case y1 of { I# x3 -> + case ==# x1 (+# x3 1#) of { + __DEFAULT -> jump go1 ys1; + 1# -> True + } + } + }; } in + jump go1 ys; + 1# -> True + } + } + } + } + ===================================== libraries/base/tests/perf/ElemNoFusion.hs ===================================== @@ -0,0 +1,14 @@ +-- As of March 2026, we don't expect `elem` to fuse with `sort` or `NonEmpty.toList`. +-- `elem` isn't even specialized, and performs dictionary-passing, but that may +-- change: #27096 +module ElemNoFusion where + +import Data.List (sort) +import Data.List.NonEmpty (NonEmpty) +import qualified Data.List.NonEmpty as NonEmpty + +noFusionElemNonEmptyToList :: Int -> NonEmpty Int -> Bool +noFusionElemNonEmptyToList x = elem x . NonEmpty.toList + +noFusionElemSort :: Int -> [Int] -> Bool +noFusionElemSort x = elem x . sort ===================================== libraries/base/tests/perf/ElemNoFusion_O1.stderr ===================================== @@ -0,0 +1,5 @@ +noFusionElemSort = \ x x1 -> elem $fEqInt x (actualSort gtInt x1) + +noFusionElemNonEmptyToList + = \ x x1 -> case x1 of { :| a1 as -> elem $fEqInt x (: a1 as) } + ===================================== libraries/base/tests/perf/ElemNoFusion_O2.stderr ===================================== @@ -0,0 +1,5 @@ +noFusionElemSort = \ x x1 -> elem $fEqInt x (actualSort gtInt x1) + +noFusionElemNonEmptyToList + = \ x x1 -> case x1 of { :| a1 as -> elem $fEqInt x (: a1 as) } + ===================================== libraries/base/tests/perf/Makefile deleted ===================================== @@ -1,15 +0,0 @@ -# This Makefile runs the tests using GHC's testsuite framework. It -# assumes the package is part of a GHC build tree with the testsuite -# installed in ../../../testsuite. - -TOP=../../../../testsuite -include $(TOP)/mk/boilerplate.mk -include $(TOP)/mk/test.mk - - -T17752: - '$(TEST_HC)' $(TEST_HC_OPTS) -O --make T17752 -rtsopts -ddump-simpl -ddump-to-file -dsuppress-uniques -dsuppress-all - # All occurrences of elem should be optimized away. - # For strings these should result in loops after inlining foldCString. - # For lists it should result in a case expression. - echo $$(grep -A4 "elem" T17752.dump-simpl) ===================================== libraries/base/tests/perf/T17752.hs ===================================== @@ -6,7 +6,7 @@ module T17752 where -- Should compile to a pattern match if the rules fire isElemList x = x `elem` ['a','b','c'] -isNotElemList x = x `elem` ['x','y','z'] +isNotElemList x = x `notElem` ['x','y','z'] isOneOfThese x = x `elem` [1,2,3,4,5::Int] isNotOneOfThese x = x `notElem` [1,2,3,4,5::Int] ===================================== libraries/base/tests/perf/T17752.stdout deleted ===================================== @@ -1,2 +0,0 @@ -[1 of 1] Compiling T17752 ( T17752.hs, T17752.o ) - ===================================== libraries/base/tests/perf/T17752_O0.stderr ===================================== @@ -0,0 +1,47 @@ +isElemList + = \ x -> + elem + $fFoldableList + $fEqChar + x + (: (C# 'a'#) (: (C# 'b'#) (: (C# 'c'#) []))) + +isNotElemList + = \ x -> + notElem + $fFoldableList + $fEqChar + x + (: (C# 'x'#) (: (C# 'y'#) (: (C# 'z'#) []))) + +isOneOfThese + = \ x -> + elem + $fFoldableList + $fEqInt + x + (: (I# 1#) (: (I# 2#) (: (I# 3#) (: (I# 4#) (: (I# 5#) []))))) + +isNotOneOfThese + = \ x -> + notElem + $fFoldableList + $fEqInt + x + (: (I# 1#) (: (I# 2#) (: (I# 3#) (: (I# 4#) (: (I# 5#) []))))) + +isElemString + = \ x -> elem $fFoldableList $fEqChar x (unpackCString# "foo"#) + +isNotElemString + = \ x -> notElem $fFoldableList $fEqChar x (unpackCString# "bar"#) + +isElemStringUtf + = \ x -> + elem $fFoldableList $fEqChar x (unpackCStringUtf8# "fo\\195\\182"#) + +isNotElemStringUtf + = \ x -> + notElem + $fFoldableList $fEqChar x (unpackCStringUtf8# "b\\195\\164r"#) + ===================================== libraries/base/tests/perf/T17752_O1.stderr ===================================== @@ -0,0 +1,118 @@ +isElemList + = \ x -> + case x of { C# x1 -> + case x1 of { + __DEFAULT -> False; + 'a'# -> True; + 'b'# -> True; + 'c'# -> True + } + } + +isNotElemList + = \ x -> + case x of { C# x1 -> + case x1 of { + __DEFAULT -> True; + 'x'# -> False; + 'y'# -> False; + 'z'# -> False + } + } + +isOneOfThese + = \ x -> + case x of { I# x1 -> + case x1 of { + __DEFAULT -> False; + 1# -> True; + 2# -> True; + 3# -> True; + 4# -> True; + 5# -> True + } + } + +isNotOneOfThese + = \ x -> + case x of { I# x1 -> + case x1 of { + __DEFAULT -> True; + 1# -> False; + 2# -> False; + 3# -> False; + 4# -> False; + 5# -> False + } + } + +isElemString + = \ x -> + joinrec { + go addr z + = case indexCharOffAddr# addr 0# of ch { + __DEFAULT -> + case x of { C# x1 -> + case eqChar# x1 ch of { + __DEFAULT -> jump go (plusAddr# addr 1#) z; + 1# -> True + } + }; + '\NUL'# -> z + }; } in + jump go isElemString1 False + +isNotElemString + = \ x -> + joinrec { + go addr z + = case indexCharOffAddr# addr 0# of ch { + __DEFAULT -> + case x of { C# x1 -> + case eqChar# x1 ch of { + __DEFAULT -> jump go (plusAddr# addr 1#) z; + 1# -> False + } + }; + '\NUL'# -> + case z of { + False -> True; + True -> False + } + }; } in + jump go isNotElemString1 False + +isElemStringUtf + = \ x -> + unpackFoldrCStringUtf8# + isElemStringUtf1 + (\ y r -> + case x of { C# x1 -> + case y of { C# y1 -> + case eqChar# x1 y1 of { + __DEFAULT -> r; + 1# -> True + } + } + }) + False + +isNotElemStringUtf + = \ x -> + case unpackFoldrCStringUtf8# + isNotElemStringUtf1 + (\ y r -> + case x of { C# x1 -> + case y of { C# y1 -> + case eqChar# x1 y1 of { + __DEFAULT -> r; + 1# -> True + } + } + }) + False + of { + False -> True; + True -> False + } + ===================================== libraries/base/tests/perf/T17752_O2.stderr ===================================== @@ -0,0 +1,130 @@ +isElemList + = \ x -> + case x of { C# x1 -> + case x1 of { + __DEFAULT -> False; + 'a'# -> True; + 'b'# -> True; + 'c'# -> True + } + } + +isNotElemList + = \ x -> + case x of { C# x1 -> + case x1 of { + __DEFAULT -> True; + 'x'# -> False; + 'y'# -> False; + 'z'# -> False + } + } + +isOneOfThese + = \ x -> + case x of { I# x1 -> + case x1 of { + __DEFAULT -> False; + 1# -> True; + 2# -> True; + 3# -> True; + 4# -> True; + 5# -> True + } + } + +isNotOneOfThese + = \ x -> + case x of { I# x1 -> + case x1 of { + __DEFAULT -> True; + 1# -> False; + 2# -> False; + 3# -> False; + 4# -> False; + 5# -> False + } + } + +isElemString + = \ x -> + case indexCharOffAddr# isElemString1 0# of ch { + __DEFAULT -> + case x of { C# x1 -> + case eqChar# x1 ch of { + __DEFAULT -> + joinrec { + go addr z + = case indexCharOffAddr# addr 0# of ch1 { + __DEFAULT -> + case eqChar# x1 ch1 of { + __DEFAULT -> jump go (plusAddr# addr 1#) z; + 1# -> True + }; + '\NUL'# -> z + }; } in + jump go (plusAddr# isElemString1 1#) False; + 1# -> True + } + }; + '\NUL'# -> False + } + +isNotElemString + = \ x -> + case indexCharOffAddr# isNotElemString1 0# of ch { + __DEFAULT -> + case x of { C# x1 -> + case eqChar# x1 ch of { + __DEFAULT -> + joinrec { + $sgo sc + = case indexCharOffAddr# sc 0# of ch1 { + __DEFAULT -> + case eqChar# x1 ch1 of { + __DEFAULT -> jump $sgo (plusAddr# sc 1#); + 1# -> False + }; + '\NUL'# -> True + }; } in + jump $sgo (plusAddr# isNotElemString1 1#); + 1# -> False + } + }; + '\NUL'# -> True + } + +isElemStringUtf + = \ x -> + unpackFoldrCStringUtf8# + isElemStringUtf1 + (\ y r -> + case x of { C# x1 -> + case y of { C# y1 -> + case eqChar# x1 y1 of { + __DEFAULT -> r; + 1# -> True + } + } + }) + False + +isNotElemStringUtf + = \ x -> + case unpackFoldrCStringUtf8# + isNotElemStringUtf1 + (\ y r -> + case x of { C# x1 -> + case y of { C# y1 -> + case eqChar# x1 y1 of { + __DEFAULT -> r; + 1# -> True + } + } + }) + False + of { + False -> True; + True -> False + } + ===================================== libraries/base/tests/perf/all.T ===================================== @@ -2,10 +2,26 @@ setTestOpts(js_skip) #-------------------------------------- -# Check specialization of elem via rules +# Check optimization of `elem` #-------------------------------------- -test('T17752', [only_ways(['normal'])] , makefile_test, ['T17752']) +elemCoreFilter = "sed -En '/^(is|fusion|noFusion)[A-Za-z]*($| )/,/^$/p'" + +def elemCoreTest(test_name, module_name, opt): + test(test_name, + [only_ways(['normal']), extra_files([module_name + '.hs'])], + multimod_compile_filter, + [module_name, + f'{opt} -ddump-simpl -dsuppress-all -dsuppress-uniques -dno-typeable-binds', + elemCoreFilter]) + +elemCoreTest('T17752_O0', 'T17752', '-O0') +elemCoreTest('T17752_O1', 'T17752', '-O1') +elemCoreTest('T17752_O2', 'T17752', '-O2') +elemCoreTest('ElemFusionUnknownList_O1', 'ElemFusionUnknownList', '-O1') +elemCoreTest('ElemFusionUnknownList_O2', 'ElemFusionUnknownList', '-O2') +elemCoreTest('ElemNoFusion_O1', 'ElemNoFusion', '-O1') +elemCoreTest('ElemNoFusion_O2', 'ElemNoFusion', '-O2') #-------------------------------------- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0a50d9abba1f901554f18d1c96b413d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0a50d9abba1f901554f18d1c96b413d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/ani/no-ds-flag-cache] simplify get_Deepsubsumption_flag
by Apoorv Ingle (＠ani) 29 Mar '26

29 Mar '26

Apoorv Ingle pushed to branch wip/ani/no-ds-flag-cache at Glasgow Haskell Compiler / GHC Commits: 578a8de5 by Apoorv Ingle at 2026-03-28T20:33:48-05:00 simplify get_Deepsubsumption_flag - - - - - 1 changed file: - compiler/GHC/Tc/Utils/Unify.hs Changes: ===================================== compiler/GHC/Tc/Utils/Unify.hs ===================================== @@ -2075,12 +2075,10 @@ getDeepSubsumptionFlag_DataConHead app_head = if | user_ds -> Deep DeepSub | XExpr (ConLikeTc (RealDataCon {})) <- app_head - = Deep TopSub - | HsVar _ f <- app_head - , isDataConId (unLoc f) - = Deep TopSub + -> Deep TopSub | otherwise - = Shallow + -> Shallow + } -- | 'tc_sub_type_deep' is where the actual work happens for deep subsumption. -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/578a8de5f6d487277fa6fe6265d50cb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/578a8de5f6d487277fa6fe6265d50cb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/mangoiv/fix-static-001-darwin] 2 commits: testsuite: ignore stderr of static001
by Magnus (＠MangoIV) 29 Mar '26

29 Mar '26

Magnus pushed to branch wip/mangoiv/fix-static-001-darwin at Glasgow Haskell Compiler / GHC Commits: 54728e0a by mangoiv at 2026-03-28T18:52:59+01:00 testsuite: ignore stderr of static001 This reactivates the test on x86_64 darwin as this should have been done long ago and ignores stderr since the warnings emitted by ranlib on newer version of the darwin toolchain are benign (no symbols for stub libraries. Fixes 27116. - - - - - 30216cc7 by mangoiv at 2026-03-28T18:53:15+01:00 REVERT: only run on beta - - - - - 3 changed files: - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - testsuite/tests/driver/all.T Changes: ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -301,8 +301,8 @@ runnerTag arch (Linux _) = Amd64 -> "x86_64-linux" AArch64 -> "aarch64-linux" I386 -> "x86_64-linux" -runnerTag AArch64 Darwin = "aarch64-darwin" -runnerTag Amd64 Darwin = "x86_64-darwin-m1" +runnerTag AArch64 Darwin = "beta" +runnerTag Amd64 Darwin = "beta" runnerTag Amd64 Windows = "new-x86_64-windows" runnerTag Amd64 FreeBSD14 = "x86_64-freebsd14" runnerTag _ _ = error "Invalid arch/opsys" ===================================== .gitlab/jobs.yaml ===================================== @@ -50,7 +50,7 @@ ], "stage": "full-build", "tags": [ - "aarch64-darwin" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -838,7 +838,7 @@ ], "stage": "full-build", "tags": [ - "aarch64-darwin" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -1638,7 +1638,7 @@ ], "stage": "full-build", "tags": [ - "x86_64-darwin-m1" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -3877,7 +3877,7 @@ ], "stage": "full-build", "tags": [ - "aarch64-darwin" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -4459,7 +4459,7 @@ ], "stage": "full-build", "tags": [ - "x86_64-darwin-m1" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -5561,7 +5561,7 @@ ], "stage": "full-build", "tags": [ - "x86_64-darwin-m1" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", ===================================== testsuite/tests/driver/all.T ===================================== @@ -121,8 +121,7 @@ else: only_darwin = skip test('static001', [extra_files(['Static001.hs']), - only_darwin, - when(arch('x86_64'), expect_broken(8127))], + only_darwin, ignore_stderr], makefile_test, ['static001']) test('dynHelloWorld', View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0da808865116bf06a063eeec2c82c7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0da808865116bf06a063eeec2c82c7… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/mangoiv/fix-static-001-darwin
by Magnus (＠MangoIV) 29 Mar '26

29 Mar '26

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

1 0

[Git][ghc/ghc] Pushed new branch wip/int-index/unify-wc-hole
by Vladislav Zavialov (＠int-index) 29 Mar '26

29 Mar '26

Vladislav Zavialov pushed new branch wip/int-index/unify-wc-hole at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/int-index/unify-wc-hole You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/mangoiv/allow-metric-decrease-i386
by Magnus (＠MangoIV) 28 Mar '26

28 Mar '26

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

1 0

[Git][ghc/ghc][wip/sjakobi/T27106] Fix -dsuppress-uniques for free variables in demand signatures
by Simon Jakobi (＠sjakobi2) 28 Mar '26

28 Mar '26

Simon Jakobi pushed to branch wip/sjakobi/T27106 at Glasgow Haskell Compiler / GHC Commits: 6a7faadc by Simon Jakobi at 2026-03-28T12:58:05+01:00 Fix -dsuppress-uniques for free variables in demand signatures Before: Str=b{sXyZ->S} With this patch: Str=b{S} T13143.stderr is updated accordingly. Fixes #27106. - - - - - 5 changed files: - compiler/GHC/Types/Demand.hs - testsuite/tests/dmdanal/should_compile/T13143.stderr - + testsuite/tests/dmdanal/should_compile/T27106.hs - + testsuite/tests/dmdanal/should_compile/T27106.stderr - testsuite/tests/dmdanal/should_compile/all.T Changes: ===================================== compiler/GHC/Types/Demand.hs ===================================== @@ -2830,7 +2830,10 @@ instance Outputable DmdEnv where = ppr div <> if null fv_elts then empty else braces (fsep (map pp_elt fv_elts)) where - pp_elt (uniq, dmd) = ppr uniq <> text "->" <> ppr dmd + pp_elt (uniq, dmd) = + sdocOption sdocSuppressUniques $ \case + True -> ppr dmd + False -> ppr uniq <> text "->" <> ppr dmd fv_elts = nonDetUFMToList fvs -- It's OK to use nonDetUFMToList here because we only do it for -- pretty printing ===================================== testsuite/tests/dmdanal/should_compile/T13143.stderr ===================================== @@ -1,13 +1,13 @@ ==================== Tidy Core ==================== Result size of Tidy Core - = {terms: 71, types: 40, coercions: 0, joins: 0/0} + = {terms: 59, types: 31, coercions: 0, joins: 0/0} Rec { -- RHS size: {terms: 4, types: 3, coercions: 0, joins: 0/0} T13143.$wf [InlPrag=NOINLINE, Occ=LoopBreaker] :: forall a. (# #) -> a -[GblId, Arity=1, Str=b{sBX->S}, Cpr=b, Unf=OtherCon []] +[GblId, Arity=1, Str=b{S}, Cpr=b, Unf=OtherCon []] T13143.$wf = \ (@a) _ [Occ=Dead] -> T13143.$wf @a GHC.Internal.Types.(##) end Rec } @@ -16,7 +16,7 @@ end Rec } f [InlPrag=NOINLINE[final]] :: forall a. Int -> a [GblId, Arity=1, - Str=b{sBX->S}, + Str=b{S}, Cpr=b, Unf=Unf{Src=StableSystem, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, @@ -26,100 +26,58 @@ f [InlPrag=NOINLINE[final]] :: forall a. Int -> a f = \ (@a) _ [Occ=Dead] -> T13143.$wf @a GHC.Internal.Types.(##) -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T13143.$trModule4 :: GHC.Internal.Prim.Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 20 0}] -T13143.$trModule4 = "main"# +$trModule1 :: GHC.Internal.Prim.Addr# +[GblId, Unf=OtherCon []] +$trModule1 = "main"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T13143.$trModule3 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T13143.$trModule3 = GHC.Internal.Types.TrNameS T13143.$trModule4 +$trModule2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$trModule2 = GHC.Internal.Types.TrNameS $trModule1 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T13143.$trModule2 :: GHC.Internal.Prim.Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 30 0}] -T13143.$trModule2 = "T13143"# +$trModule3 :: GHC.Internal.Prim.Addr# +[GblId, Unf=OtherCon []] +$trModule3 = "T13143"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T13143.$trModule1 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T13143.$trModule1 = GHC.Internal.Types.TrNameS T13143.$trModule2 +$trModule4 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$trModule4 = GHC.Internal.Types.TrNameS $trModule3 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -T13143.$trModule :: GHC.Internal.Types.Module -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T13143.$trModule - = GHC.Internal.Types.Module T13143.$trModule3 T13143.$trModule1 +T13143.$trModule [InlPrag=[~]] :: GHC.Internal.Types.Module +[GblId, Unf=OtherCon []] +T13143.$trModule = GHC.Internal.Types.Module $trModule2 $trModule4 --- RHS size: {terms: 2, types: 1, coercions: 0, joins: 0/0} +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} lvl :: Int -[GblId, Str=b{sBX->S}, Cpr=b] -lvl = T13143.$wf @Int GHC.Internal.Types.(##) +[GblId, Unf=OtherCon []] +lvl = GHC.Internal.Types.I# 1# + +-- RHS size: {terms: 2, types: 1, coercions: 0, joins: 0/0} +lvl1 :: Int +[GblId, Str=b{S}, Cpr=b] +lvl1 = T13143.$wf @Int GHC.Internal.Types.(##) Rec { -- RHS size: {terms: 28, types: 7, coercions: 0, joins: 0/0} -T13143.$wg [InlPrag=[2], Occ=LoopBreaker] - :: Bool -> Bool -> GHC.Internal.Prim.Int# -> GHC.Internal.Prim.Int# -[GblId[StrictWorker([!, !])], - Arity=3, - Str=<1L><1L><L>, - Unf=OtherCon []] -T13143.$wg - = \ (ds :: Bool) (ds1 :: Bool) (ww :: GHC.Internal.Prim.Int#) -> +g [Occ=LoopBreaker] :: Bool -> Bool -> Int -> Int +[GblId, Arity=3, Str=<1L><1L><L>, Unf=OtherCon []] +g = \ (ds :: Bool) (ds1 :: Bool) (p :: Int) -> case ds of { False -> case ds1 of { - False -> - T13143.$wg GHC.Internal.Types.False GHC.Internal.Types.True ww; - True -> GHC.Internal.Prim.+# ww 1# + False -> g GHC.Internal.Types.False GHC.Internal.Types.True p; + True -> + @Int GHC.Internal.Num.$fNumInt p lvl }; True -> case ds1 of { - False -> - T13143.$wg GHC.Internal.Types.True GHC.Internal.Types.True ww; - True -> case lvl of {} + False -> g GHC.Internal.Types.True GHC.Internal.Types.True p; + True -> lvl1 } } end Rec } --- RHS size: {terms: 14, types: 6, coercions: 0, joins: 0/0} -g [InlPrag=[2]] :: Bool -> Bool -> Int -> Int -[GblId, - Arity=3, - Str=<1L><1L><1!P(L)>, - Cpr=1, - Unf=Unf{Src=StableSystem, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=ALWAYS_IF(arity=3,unsat_ok=True,boring_ok=False) - Tmpl= \ (ds [Occ=Once1] :: Bool) - (ds1 [Occ=Once1] :: Bool) - (p [Occ=Once1!] :: Int) -> - case p of { GHC.Internal.Types.I# ww [Occ=Once1] -> - case T13143.$wg ds ds1 ww of ww1 [Occ=Once1] { __DEFAULT -> - GHC.Internal.Types.I# ww1 - } - }}] -g = \ (ds :: Bool) (ds1 :: Bool) (p :: Int) -> - case p of { GHC.Internal.Types.I# ww -> - case T13143.$wg ds ds1 ww of ww1 { __DEFAULT -> - GHC.Internal.Types.I# ww1 - } - } - ===================================== testsuite/tests/dmdanal/should_compile/T27106.hs ===================================== @@ -0,0 +1,5 @@ +module T27106 where + +{-# NOINLINE weird #-} +weird :: Int -> a +weird x = weird x ===================================== testsuite/tests/dmdanal/should_compile/T27106.stderr ===================================== @@ -0,0 +1,4 @@ +weird [InlPrag=NOINLINE[final]] :: forall a. Int -> a +[GblId, + Arity=1, + Str=b{S}, ===================================== testsuite/tests/dmdanal/should_compile/all.T ===================================== @@ -45,6 +45,13 @@ test('T13077a', normal, compile, ['']) # T13143: WW for NOINLINE function f test('T13143', [ grep_errmsg(r'^T13143\.\$wf') ], compile, ['-ddump-simpl -dsuppress-uniques']) +# Uniques in the free variable part of a demand signature should be +# suppressed by -dsuppress-uniques. +test('T27106', normal, multimod_compile_filter, + ['T27106', + '-v0 -O -ddump-simpl -dsuppress-uniques', + r"sed -n '/^weird /,/.* Str=/p'"]) + # T15627 # Absent bindings of unlifted types should be WW'ed away. # The idea is to check that both $wmutVar and $warray View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6a7faadcbe78ad826ab116b6191c7d0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6a7faadcbe78ad826ab116b6191c7d0… You're receiving this email because of your account on gitlab.haskell.org.

1 0