- ghc-commits - Haskell.org

[Git][ghc/ghc] Deleted branch wip/juhp-hp2ps-libstdh
by Jens Petersen (＠juhp) 02 May '26

02 May '26

Jens Petersen deleted branch wip/juhp-hp2ps-libstdh at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Deleted branch juhp-ghc-9.10-patch-56735
by Jens Petersen (＠juhp) 02 May '26

02 May '26

Jens Petersen deleted branch juhp-ghc-9.10-patch-56735 at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Deleted branch wip/juhp-disable-hadrian-selftest
by Jens Petersen (＠juhp) 02 May '26

02 May '26

Jens Petersen deleted branch wip/juhp-disable-hadrian-selftest at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Deleted branch juhp-ghc-9.12-genSym-backports
by Jens Petersen (＠juhp) 02 May '26

02 May '26

Jens Petersen deleted branch juhp-ghc-9.12-genSym-backports at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26989] Wibbles
by Simon Peyton Jones (＠simonpj) 02 May '26

02 May '26

Simon Peyton Jones pushed to branch wip/T26989 at Glasgow Haskell Compiler / GHC Commits: 3925e6fb by Simon Peyton Jones at 2026-05-02T13:15:55+01:00 Wibbles - - - - - 4 changed files: - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/SimpleOpt.hs - compiler/GHC/Data/List/SetOps.hs - compiler/GHC/Types/Id/Make.hs Changes: ===================================== compiler/GHC/Core/Opt/Simplify/Iteration.hs ===================================== @@ -2052,7 +2052,7 @@ Note [Avoiding simplifying repeatedly] One way in which we can get exponential behaviour is if we simplify a big expression, and then re-simplify it -- and then this happens in a deeply-nested way. So we must be jolly careful about re-simplifying -an expression (#26989). +an expression (#26989). Example: f BIG, where f has a RULE @@ -2359,7 +2359,8 @@ simplInId env var cont , isLazyDataConRep dc -- See Note [Fast path for lazy data constructors] = rebuild env (Var var) cont | otherwise - = case substId env var of + = assertPpr (not (isCoVar var)) (ppr var) $ + case substId env var of ContEx se e mco -> do { cont' <- pushCastMCo env mco cont ; simplExprF (se `setInScopeFromE` env) e cont' } ===================================== compiler/GHC/Core/SimpleOpt.hs ===================================== @@ -326,8 +326,7 @@ simple_opt_expr env expr = go expr (env', b') = subst_opt_bndr env b ---------------------- - go_co co = pprTrace "add_cast" (ppr (optCoercionEnabled $ so_co_opts (soe_opts env)) $$ ppr co) $ - optCoercion (so_co_opts (soe_opts env)) subst co + go_co co = optCoercion (so_co_opts (soe_opts env)) subst co ---------------------- go_alt env (Alt con bndrs rhs) ===================================== compiler/GHC/Data/List/SetOps.hs ===================================== @@ -40,7 +40,7 @@ import Data.List.NonEmpty (NonEmpty(..)) import Data.Ord (comparing) import qualified Data.Set as S -getNth :: Outputable a => [a] -> Int -> a +getNth :: (HasDebugCallStack, Outputable a) => [a] -> Int -> a getNth xs n = assertPpr (xs `lengthExceeds` n) (ppr n $$ ppr xs) $ xs !! n ===================================== compiler/GHC/Types/Id/Make.hs ===================================== @@ -564,7 +564,7 @@ dictSelRule :: Name -> Arity -> Int -> CoreRule -- sel_i t1..tk (D t1..tk op1 ... opm) = opi -- -- See Note [ClassOp/DFun selection] in GHC.Tc.TyCl.Instance -dictSelRule name val_index n_ty_args +dictSelRule name n_ty_args val_index = rule where rule = BuiltinRule { ru_name = fsLit "Class op " `appendFS` @@ -579,14 +579,25 @@ dictSelRule name val_index n_ty_args | (dict_arg : _) <- drop n_ty_args args , Just (_, floats, _, _, con_args) <- exprIsConApp_maybe in_scope_env dict_arg , let meth_e = getNth con_args val_index - meth_id = mkTemplateLocal 1 (exprType meth_e) = Just (RM { rm_floats = floats - , rm_rhs = Lam meth_id (Var meth_id) - , rm_args = [meth_e] - , rm_rule = rule }) + , rm_rhs = mkIdLam (exprType meth_e) + , rm_args = [meth_e] + , rm_rule = rule }) | otherwise = Nothing + +mkIdLam :: Type -> CoreExpr +-- Make an identity lambda (\(x::ty).x), already occ-analysed +mkIdLam ty + = Lam x (varToCoreExpr x) + where + x = mkTemplateLocal 1 ty + `setIdOccInfo` OneOcc { occ_in_lam = NotInsideLam + , occ_n_br = 1 + , occ_int_cxt = NotInteresting + , occ_tail = NoTailCallInfo } + {- ************************************************************************ * * View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3925e6fb140ca7c3a22c8746b025ea3… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3925e6fb140ca7c3a22c8746b025ea3… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T27022] iserv: recover/getQ/putQ should behave same as internal interpreter
by Teo Camarasu (＠teo) 02 May '26

02 May '26

Teo Camarasu pushed to branch wip/T27022 at Glasgow Haskell Compiler / GHC Commits: ab0e7b30 by Teo Camarasu at 2026-05-02T12:24:44+01:00 iserv: recover/getQ/putQ should behave same as internal interpreter The internal and external interpreter should behave the same when handling `recover`, the exeception recovery method of Q. In practice, they diverge. In case of failure, the internal interpreter only restores error message state to before the computation, wheras the external interperter restores error message state *and* the state of putQ/getQ. As far as I can tell this is a simple mistake in the implementation. Note [TH recover with -fexternal-interpreter] describes the correct behaviour but the implementation doesn't mirror this. This change restores the correct behaviour by keeping the effects of putQ in the erroring computation. This is a breaking change since it modifies the behaviour of programs that rely on recover ignoring putQ from failling computations when used with the external interpreter. Although I highly doubt anyone relies on this behaviour. This divergence was first introduced in d00c308633fe7d216d31a1087e00e63532d87d6d. As far as I can tell this was unintentional and tha commit was trying to solve a different bug. Resolves #27022 - - - - - 4 changed files: - + changelog.d/T27022 - libraries/ghci/GHCi/TH.hs - + testsuite/tests/th/T27022.hs - testsuite/tests/th/all.T Changes: ===================================== changelog.d/T27022 ===================================== @@ -0,0 +1,11 @@ +section: compiler +synopsis: Fix a divergence in the interaction between ``recover`` and ``putQ`` between the internal and external interpreter +description: The ``recover`` method in TemplateHaskell now behaves the same + with the internal and external interpreter. + In the past, when an error was encountered in a computation in a ``recover`` block, + the external interpreter would discard any state changes from ``putQ``, + whereas the internal interpreter would not. + This was a long-standing error in the implementation of the external interpreter. + Both now keep state changes from ``putQ`` in ``recover`` blocks. +mr: !15994 +issues: #27022 ===================================== libraries/ghci/GHCi/TH.hs ===================================== @@ -175,9 +175,7 @@ instance TH.Quasi GHCiQ where e <- try $ unmask $ runGHCiQ (a <* ghcCmd FailIfErrs) sRef remoteTHCall (qsPipe s) (EndRecover (isLeft e)) case e of - Left GHCiQException{} -> - -- in case of error, restore the state to the start of the `recover` block. - newIORef s >>= h + Left GHCiQException{} -> h sRef Right r -> return r qLookupName isType occ = ghcCmd (LookupName isType occ) qReify name = ghcCmd (Reify name) ===================================== testsuite/tests/th/T27022.hs ===================================== @@ -0,0 +1,8 @@ +{-# LANGUAGE TemplateHaskell #-} +-- | This tests the behaviour of TH's recover method. +-- It should behave the same in the internal and external interperter. +-- In the past, they have diverged, and the external interpreter would roll back the state of putQ/getQ whereas the internal interpreter would not. +module T27022 where + +import Language.Haskell.TH.Syntax +main = print $(putQ "0" >> recover (pure ()) (putQ "42" >> fail "oops") >> getQ @String >>= lift ) ===================================== testsuite/tests/th/all.T ===================================== @@ -650,3 +650,4 @@ test('GadtConSigs_th_dump1', normal, compile, ['-v0 -ddump-splices -dsuppress-un test('T26099', normal, compile_fail, ['']) test('T8306_th', only_ways(['ghci']), ghci_script, ['T8306_th.script']) test('T26862_th', only_ways(['ghci']), ghci_script, ['T26862_th.script']) +test('T27022', normal, compile, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ab0e7b306f6b009845c8f6a7f05a24f… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ab0e7b306f6b009845c8f6a7f05a24f… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T27022] iserv: recover/getQ/putQ should behave same as internal interpreter
by Teo Camarasu (＠teo) 02 May '26

02 May '26

Teo Camarasu pushed to branch wip/T27022 at Glasgow Haskell Compiler / GHC Commits: 9369b573 by Teo Camarasu at 2026-05-02T12:17:42+01:00 iserv: recover/getQ/putQ should behave same as internal interpreter The internal and external interpreter should behave the same when handling `recover`, the exeception recovery method of Q. In practice, they diverge. In case of failure, the internal interpreter only restores error message state to before the computation, wheras the external interperter restores error message state *and* the state of putQ/getQ. As far as I can tell this is a simple mistake in the implementation. Note [TH recover with -fexternal-interpreter] describes the correct behaviour but the implementation doesn't mirror this. This change restores the correct behaviour by keeping the effects of putQ in the erroring computation. This is a breaking change since it modifies the behaviour of programs that rely on recover ignoring putQ from failling computations when used with the external interpreter. Although I highly doubt anyone relies on this behaviour. Resolves #27022 - - - - - 4 changed files: - + changelog.d/T27022 - libraries/ghci/GHCi/TH.hs - + testsuite/tests/th/T27022.hs - testsuite/tests/th/all.T Changes: ===================================== changelog.d/T27022 ===================================== @@ -0,0 +1,11 @@ +section: compiler +synopsis: Fix a divergence in the interaction between ``recover`` and ``putQ`` between the internal and external interpreter +description: The ``recover`` method in TemplateHaskell now behaves the same + with the internal and external interpreter. + In the past, when an error was encountered in a computation in a ``recover`` block, + the external interpreter would discard any state changes from ``putQ``, + whereas the internal interpreter would not. + This was a long-standing error in the implementation of the external interpreter. + Both now keep state changes from ``putQ`` in ``recover`` blocks. +mr: !15994 +issues: #27022 ===================================== libraries/ghci/GHCi/TH.hs ===================================== @@ -175,9 +175,7 @@ instance TH.Quasi GHCiQ where e <- try $ unmask $ runGHCiQ (a <* ghcCmd FailIfErrs) sRef remoteTHCall (qsPipe s) (EndRecover (isLeft e)) case e of - Left GHCiQException{} -> - -- in case of error, restore the state to the start of the `recover` block. - newIORef s >>= h + Left GHCiQException{} -> h sRef Right r -> return r qLookupName isType occ = ghcCmd (LookupName isType occ) qReify name = ghcCmd (Reify name) ===================================== testsuite/tests/th/T27022.hs ===================================== @@ -0,0 +1,8 @@ +{-# LANGUAGE TemplateHaskell #-} +-- | This tests the behaviour of TH's recover method. +-- It should behave the same in the internal and external interperter. +-- In the past, they have diverged, and the external interpreter would roll back the state of putQ/getQ whereas the internal interpreter would not. +module T27022 where + +import Language.Haskell.TH.Syntax +main = print $(putQ "0" >> recover (pure ()) (putQ "42" >> fail "oops") >> getQ @String >>= lift ) ===================================== testsuite/tests/th/all.T ===================================== @@ -650,3 +650,4 @@ test('GadtConSigs_th_dump1', normal, compile, ['-v0 -ddump-splices -dsuppress-un test('T26099', normal, compile_fail, ['']) test('T8306_th', only_ways(['ghci']), ghci_script, ['T8306_th.script']) test('T26862_th', only_ways(['ghci']), ghci_script, ['T26862_th.script']) +test('T27022', normal, compile, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9369b5739826150b0fd067ac8bc1b00… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9369b5739826150b0fd067ac8bc1b00… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/T27022
by Teo Camarasu (＠teo) 02 May '26

02 May '26

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

1 0

[Git][ghc/ghc][master] Fix name of Note [Structure of dep_boot_mods]
by Marge Bot (＠marge-bot) 02 May '26

02 May '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 3b75cccd by fendor at 2026-05-02T03:40:14-04:00 Fix name of Note [Structure of dep_boot_mods] - - - - - 2 changed files: - compiler/GHC/Unit/Module/Deps.hs - testsuite/tests/linters/notes.stdout Changes: ===================================== compiler/GHC/Unit/Module/Deps.hs ===================================== @@ -96,7 +96,7 @@ data Dependencies = Deps , dep_boot_mods_ :: Set (UnitId, ModuleNameWithIsBoot) -- ^ All modules which have boot files below this one, and whether we -- should use the boot file or not. - -- This information is only used to populate the eps_is_boot field. + -- This information is only used to populate the 'eps_is_boot' field. -- See Note [Structure of dep_boot_mods] , dep_orphs_ :: [Module] @@ -605,7 +605,7 @@ hash of the module. The export hash is computed in `GHC.Iface.Recomp.addFingerpr -} {- -Note [Structure of dep_boot_deps] +Note [Structure of dep_boot_mods] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In `-c` mode we always need to know whether to load the normal or boot version of ===================================== testsuite/tests/linters/notes.stdout ===================================== @@ -27,7 +27,6 @@ ref compiler/GHC/Tc/Solver/Rewrite.hs:1020:7: Note [Stability of rewritin ref compiler/GHC/Tc/TyCl.hs:1662:6: Note [Unification variables need fresh Names] ref compiler/GHC/Tc/Types/Constraint.hs:209:9: Note [NonCanonical Semantics] ref compiler/GHC/Types/Demand.hs:304:25: Note [Preserving Boxity of results is rarely a win] -ref compiler/GHC/Unit/Module/Deps.hs:97:13: Note [Structure of dep_boot_mods] ref compiler/GHC/Utils/Monad.hs:415:34: Note [multiShotIO] ref compiler/Language/Haskell/Syntax/Binds.hs:206:31: Note [fun_id in Match] ref configure.ac:205:10: Note [Linking ghc-bin against threaded stage0 RTS] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3b75cccdd3fd27b1d2544f729ed62d0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3b75cccdd3fd27b1d2544f729ed62d0… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] 2 commits: testsuite: fix flaky foundation Divisible / mulIntMayOflo# tests (#27222)
by Marge Bot (＠marge-bot) 02 May '26

02 May '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 5c4c3bf4 by Sylvain Henry at 2026-05-02T03:39:28-04:00 testsuite: fix flaky foundation Divisible / mulIntMayOflo# tests (#27222) Since the LCG was widened to 64 bits and the seed randomised per CI run (commit 2d30f7d3400 "Vendor mini-QuickCheck for testsuite"), two latent bugs in the foundation test surface stochastically: * The Divisible property `(x `div` y) * y + (x `mod` y) == x` raises ArithException(Overflow) when (a, b) = (minBound, -1) for fixed-width signed Integral types. Split testNumber/testDivisible into Bounded and unbounded variants and skip just that one pair, gated by `(minBound :: a) < 0` so unsigned types lose no coverage. * The `mulIntMayOflo#` test compared raw Int# bit-for-bit, but the primop is only specified to return 0/non-zero -- the exact non-zero indicator legitimately differs between backends and inlining choices. Add a dedicated `testPrimopMayOflo` helper that only compares zero / non-zero. Also fix the long-standing typo "Dividible" -> "Divisible" in identifiers. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply(a)anthropic.com> - - - - - e242ce4f by Sylvain Henry at 2026-05-02T03:39:28-04:00 testsuite: catch and display exceptions in MiniQuickCheck Exceptions raised while evaluating a property are now caught and reported as a normal failure (with arguments and seed), instead of aborting the test. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply(a)anthropic.com> - - - - - 2 changed files: - testsuite/tests/MiniQuickCheck.hs - testsuite/tests/numeric/should_run/foundation.hs Changes: ===================================== testsuite/tests/MiniQuickCheck.hs ===================================== @@ -2,6 +2,7 @@ {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE GeneralisedNewtypeDeriving #-} {-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} -- | A minimal QuickCheck-like property testing framework for use in the GHC @@ -52,6 +53,8 @@ module MiniQuickCheck ) where -- base +import Control.Exception + ( SomeException, displayException, evaluate, try ) import Control.Monad.IO.Class ( liftIO ) import Data.Bits @@ -181,16 +184,39 @@ nest :: String -> ReaderT RunS IO a -> ReaderT RunS IO a nest c = local (\s -> s { depth = depth s + 1, context = c : context s }) runPropertyCheck :: PropertyCheck -> ReaderT RunS IO Result -runPropertyCheck (PropertyBinaryOp ok desc s1 s2) = - if ok - then return Success - else do - ctx <- context <$> ask - let msg = "Failure: " ++ s1 ++ " " ++ desc ++ " " ++ s2 - putMsg msg - return (Failure [msg : ctx]) -runPropertyCheck (PropertyAnd a b) = - (<>) <$> runPropertyCheck a <*> runPropertyCheck b +runPropertyCheck pcThunk = do + -- See Note [Catching exceptions in property evaluation]. + pcRes <- liftIO $ try @SomeException (evaluate pcThunk) + case pcRes of + Left e -> reportFailure ("Failure: exception: " ++ displayException e) + Right (PropertyAnd a b) -> + (<>) <$> runPropertyCheck a <*> runPropertyCheck b + Right (PropertyBinaryOp ok desc s1 s2) -> do + okRes <- liftIO $ try @SomeException (evaluate ok) + case okRes of + Right True -> return Success + Right False -> reportFailure ("Failure: " ++ s1 ++ " " ++ desc ++ " " ++ s2) + Left e -> reportFailure ("Failure: exception: " ++ displayException e) + +reportFailure :: String -> ReaderT RunS IO Result +reportFailure msg = do + ctx <- context <$> ask + putMsg msg + return (Failure [msg : ctx]) + +-- Note [Catching exceptions in property evaluation] +-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-- A property like `\a b -> let !r = a `div` 0 in r === b` builds a +-- `PropertyCheck` thunk whose forcing raises an exception -- in this case +-- already at the `PropertyBinaryOp` constructor, before its `ok` field is +-- ever inspected. Other properties may force `ok = (s1 == s2)` instead and +-- raise from there. +-- +-- To handle both, we `evaluate` first the `PropertyCheck` thunk and then +-- the `ok` field, each inside `try`, and report any exception through the +-- normal `reportFailure` path. The surrounding loop then still prints +-- "With arguments ... (Seed: ...)" and the test driver continues with +-- subsequent properties instead of aborting. runProperty :: Iterations -> Property -> ReaderT RunS IO Result runProperty (Iterations iters) (Prop p) = do ===================================== testsuite/tests/numeric/should_run/foundation.hs ===================================== @@ -77,13 +77,42 @@ testMultiplicative _ = Group "Multiplicative" , Property "a * b == Integer(a) * Integer(b)" $ \(a :: a) (b :: a) -> a * b === fromInteger (toInteger a * toInteger b) ] -testDividible :: forall a . (Show a, Eq a, Integral a, Num a, Arbitrary a, Typeable a) +-- | Divisibility test for Bounded Integral types (Int, Int{8,16,32,64}, +-- Word, Word{8,16,32,64}). +testDivisible :: forall a . (Show a, Eq a, Bounded a, Integral a, Num a, Arbitrary a, Typeable a) => Proxy a -> Test -testDividible _ = Group "Divisible" +testDivisible _ = Group "Divisible" + [ Property "(x `div` y) * y + (x `mod` y) == x" $ \(a :: a) (NonZero b) -> + -- See Note [Skipping minBound `div` (-1)]. + if (minBound :: a) < 0 && a == minBound && b == (-1) + then True === True + else a === (a `div` b) * b + (a `mod` b) + ] + +-- | Divisibility test for unbounded Integral types (Integer). No overflow +-- can occur here, so the property holds without exception for all NonZero b. +testDivisibleUnbounded :: forall a . (Show a, Eq a, Integral a, Num a, Arbitrary a, Typeable a) + => Proxy a -> Test +testDivisibleUnbounded _ = Group "Divisible" [ Property "(x `div` y) * y + (x `mod` y) == x" $ \(a :: a) (NonZero b) -> a === (a `div` b) * b + (a `mod` b) ] +-- Note [Skipping minBound `div` (-1)] +-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-- For a fixed-width *signed* Integral type, `minBound `div` (-1)` raises +-- ArithException(Overflow) because `-minBound` is not representable in the +-- type (e.g., for Int8, `-(-128)` would be 128, out of range). The div/mod +-- identity property cannot hold there, so we skip exactly that one pair. +-- +-- We detect "signed Bounded" with `(minBound :: a) < 0`: True for Int{N}, +-- False for Word{N}. This way unsigned Bounded types lose no coverage, +-- and only the genuine overflow sample is skipped for signed types. +-- +-- For the unbounded `Integer`, no overflow can occur and we use a separate +-- 'testDivisibleUnbounded' (without the Bounded constraint or the skip). +-- See #27222. + testOperatorPrecedence :: forall a . (Show a, Eq a, Prelude.Num a, Integral a, Num a, Arbitrary a, Typeable a) => Proxy a -> Test testOperatorPrecedence _ = Group "Precedence" @@ -101,14 +130,26 @@ testOperatorPrecedence _ = Group "Precedence" ] -testNumber :: (Show a, Eq a, Prelude.Num a, Integral a, Num a, Arbitrary a, Typeable a) +testNumber :: (Show a, Eq a, Prelude.Num a, Bounded a, Integral a, Num a, Arbitrary a, Typeable a) => String -> Proxy a -> Test testNumber name proxy = Group name [ testIntegral proxy , testEqOrd proxy , testAdditive proxy , testMultiplicative proxy - , testDividible proxy + , testDivisible proxy + , testOperatorPrecedence proxy + ] + +-- | Variant of 'testNumber' for unbounded Integral types (e.g., Integer). +testNumberUnbounded :: (Show a, Eq a, Prelude.Num a, Integral a, Num a, Arbitrary a, Typeable a) + => String -> Proxy a -> Test +testNumberUnbounded name proxy = Group name + [ testIntegral proxy + , testEqOrd proxy + , testAdditive proxy + , testMultiplicative proxy + , testDivisibleUnbounded proxy , testOperatorPrecedence proxy ] @@ -119,7 +160,7 @@ testNumberRefs = Group "ALL" , testNumber "Int16" (Proxy :: Proxy Int16) , testNumber "Int32" (Proxy :: Proxy Int32) , testNumber "Int64" (Proxy :: Proxy Int64) - , testNumber "Integer" (Proxy :: Proxy Integer) + , testNumberUnbounded "Integer" (Proxy :: Proxy Integer) , testNumber "Word" (Proxy :: Proxy Word) , testNumber "Word8" (Proxy :: Proxy Word8) , testNumber "Word16" (Proxy :: Proxy Word16) @@ -399,7 +440,7 @@ testPrimops = Group "primop" , testPrimop "-#" (Primop.-#) (Wrapper.-#) , testPrimop "*#" (Primop.*#) (Wrapper.*#) , testPrimop "timesInt2#" Primop.timesInt2# Wrapper.timesInt2# - , testPrimop "mulIntMayOflo#" Primop.mulIntMayOflo# Wrapper.mulIntMayOflo# + , testPrimopMayOflo "mulIntMayOflo#" Primop.mulIntMayOflo# Wrapper.mulIntMayOflo# , testPrimopDivLike "quotInt#" Primop.quotInt# Wrapper.quotInt# , testPrimopDivLike "remInt#" Primop.remInt# Wrapper.remInt# , testPrimopDivLike "quotRemInt#" Primop.quotRemInt# Wrapper.quotRemInt# @@ -497,6 +538,31 @@ instance TestPrimop (Int# -> Int# -> Int#) where testPrimopDivLike s l r = Property s $ twoNonZero $ \ (uInt#-> x0) (uInt#-> x1) -> wInt# (l x0 x1) === wInt# (r x0 x1) testPrimopShift s l r = Property s $ \ (uInt#-> x0) (BoundedShiftAmount @Int shift) -> wInt# (l x0 (uInt# shift)) === wInt# (r x0 (uInt# shift)) +-- | Compare two 'mulIntMayOflo#'-like primops only on whether their result +-- is zero. See Note [Comparing mulIntMayOflo# results]. +testPrimopMayOflo :: String + -> (Int# -> Int# -> Int#) + -> (Int# -> Int# -> Int#) + -> Test +testPrimopMayOflo s l r = + Property s $ \ (uInt# -> x0) (uInt# -> x1) -> + (wInt# (l x0 x1) == 0) === (wInt# (r x0 x1) == 0) + +-- Note [Comparing mulIntMayOflo# results] +-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-- The 'mulIntMayOflo#' primop is only specified to return 0 if the signed +-- multiplication does not overflow, and a non-zero value if it /may/ +-- overflow (see Note [MO_S_MulMayOflo significant width] in +-- GHC.Cmm.MachOp). The exact non-zero value is unspecified and legitimately +-- differs between backends and between inlined vs. non-inlined call sites +-- (e.g., the LLVM backend's `isSMulOK` returns `sext_signbit(low) - high`, +-- which is some arbitrary non-zero word on overflow). +-- +-- Comparing the raw Int# results bit-for-bit is therefore too strict and +-- causes spurious test failures whenever the random arguments happen to +-- overflow. We compare zero/non-zero instead, which matches the spec. +-- See #27222. + instance TestPrimop (Int# -> Int# -> (# Int#,Int# #)) where testPrimop s l r = Property s $ \ (uInt#-> x0) (uInt#-> x1) -> WTUP2(wInt#,wInt#, (l x0 x1)) === WTUP2(wInt#,wInt#, (r x0 x1)) testPrimopDivLike s l r = Property s $ twoNonZero $ \ (uInt#-> x0) (uInt#-> x1) -> WTUP2(wInt#,wInt#, (l x0 x1)) === WTUP2(wInt#,wInt#, (r x0 x1)) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/391413435eb02d9d8ed8bb85946de2… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/391413435eb02d9d8ed8bb85946de2… You're receiving this email because of your account on gitlab.haskell.org.

1 0