GitLab

Teo Camarasu pushed to branch wip/T26832 at Glasgow Haskell Compiler / GHC

Commits:

23516844

by Teo Camarasu at 2026-01-26T20:42:39+00:00

ghc-internal: move considerAccessible to GHC.Internal.Magic

Previously it lived in GHC.Internal.Exts, but it really deserves to live
along with the other magic function, which are already re-exported from .Exts

f5cee207

by Teo Camarasu at 2026-01-26T20:51:24+00:00

ghc-internal: move maxTupleSize to GHC.Internal.Tuple

This previously lived in GHC.Internal.Exts but a comment already said it
should be moved to .Tuple

4 changed files:

compiler/GHC/Builtin/Names.hs
libraries/ghc-internal/src/GHC/Internal/Exts.hs
libraries/ghc-internal/src/GHC/Internal/Magic.hs
libraries/ghc-internal/src/GHC/Internal/Tuple.hs

Changes:

compiler/GHC/Builtin/Names.hs

@@ -1063,7 +1063,7 @@ alternativeClassKey = mkPreludeMiscIdUnique 754
  -- Functions for GHC extensions
  considerAccessibleName :: Name
 -considerAccessibleName = varQual gHC_INTERNAL_EXTS (fsLit "considerAccessible") considerAccessibleIdKey
 +considerAccessibleName = varQual gHC_MAGIC (fsLit "considerAccessible") considerAccessibleIdKey
  -- Random GHC.Internal.Base functions
  fromStringName, otherwiseIdName, foldrName, buildName, augmentName,

libraries/ghc-internal/src/GHC/Internal/Exts.hs

@@ -321,10 +321,7 @@ import GHC.Internal.Data.Data
  import GHC.Internal.Data.Ord
  import qualified GHC.Internal.Debug.Trace
  import GHC.Internal.Unsafe.Coerce ( unsafeCoerce# ) -- just for re-export
+-
 --- XXX This should really be in Data.Tuple, where the definitions are
 -maxTupleSize :: Int
 -maxTupleSize = 64
 +import GHC.Internal.Tuple (maxTupleSize)
  -- | 'the' ensures that all the elements of the list are identical
  -- and then returns that unique element
@@ -444,27 +441,3 @@ resizeSmallMutableArray# arr0 szNew a s0 =
            (# s2, arr1 #) -> case copySmallMutableArray# arr0 0# arr1 0# szOld s2 of
              s3 -> (# s3, arr1 #)
          else (# s1, arr0 #)
+-
 --- | Semantically, @considerAccessible = True@. But it has special meaning
 --- to the pattern-match checker, which will never flag the clause in which
 --- 'considerAccessible' occurs as a guard as redundant or inaccessible.
 --- Example:
 ---
 --- > case (x, x) of
 --- >   (True,  True)  -> 1
 --- >   (False, False) -> 2
 --- >   (True,  False) -> 3 -- Warning: redundant
 ---
 --- The pattern-match checker will warn here that the third clause is redundant.
 --- It will stop doing so if the clause is adorned with 'considerAccessible':
 ---
 --- > case (x, x) of
 --- >   (True,  True)  -> 1
 --- >   (False, False) -> 2
 --- >   (True,  False) | considerAccessible -> 3 -- No warning
 ---
 --- Put 'considerAccessible' as the last statement of the guard to avoid get
 --- confusing results from the pattern-match checker, which takes \"consider
 --- accessible\" by word.
 -considerAccessible :: Bool
 -considerAccessible = True

libraries/ghc-internal/src/GHC/Internal/Magic.hs

@@ -24,7 +24,7 @@
  --
  -----------------------------------------------------------------------------
 -module GHC.Internal.Magic ( inline, noinline, lazy, oneShot, runRW#, DataToTag(..) ) where
 +module GHC.Internal.Magic ( inline, noinline, lazy, oneShot, runRW#, DataToTag(..), considerAccessible ) where
  --------------------------------------------------
  --        See Note [magicIds] in GHC.Types.Id.Make
@@ -34,7 +34,7 @@ module GHC.Internal.Magic ( inline, noinline, lazy, oneShot, runRW#, DataToTag(.
  -- because TYPE is not exported by the source Haskell module generated by
  -- genprimops which Haddock will typecheck (#15935).
  import GHC.Internal.Prim (State#, realWorld#, RealWorld, Int#)
 -import GHC.Internal.Types (RuntimeRep(BoxedRep), TYPE, Levity, Constraint)
 +import GHC.Internal.Types (RuntimeRep(BoxedRep), TYPE, Levity, Constraint, Bool(True))
  -- | The call @inline f@ arranges that @f@ is inlined, regardless of
  -- its size. More precisely, the call @inline f@ rewrites to the
@@ -137,3 +137,27 @@ type DataToTag :: forall {lev :: Levity}. TYPE (BoxedRep lev) -> Constraint
  -- So it does not get its own Unsafe module, unlike WithDict.
  class DataToTag a where
    dataToTag# :: a -> Int#
++
 +-- | Semantically, @considerAccessible = True@. But it has special meaning
 +-- to the pattern-match checker, which will never flag the clause in which
 +-- 'considerAccessible' occurs as a guard as redundant or inaccessible.
 +-- Example:
 +--
 +-- > case (x, x) of
 +-- >   (True,  True)  -> 1
 +-- >   (False, False) -> 2
 +-- >   (True,  False) -> 3 -- Warning: redundant
 +--
 +-- The pattern-match checker will warn here that the third clause is redundant.
 +-- It will stop doing so if the clause is adorned with 'considerAccessible':
 +--
 +-- > case (x, x) of
 +-- >   (True,  True)  -> 1
 +-- >   (False, False) -> 2
 +-- >   (True,  False) | considerAccessible -> 3 -- No warning
 +--
 +-- Put 'considerAccessible' as the last statement of the guard to avoid get
 +-- confusing results from the pattern-match checker, which takes \"consider
 +-- accessible\" by word.
 +considerAccessible :: Bool
 +considerAccessible = True

libraries/ghc-internal/src/GHC/Internal/Tuple.hs

@@ -27,10 +27,11 @@ module GHC.Internal.Tuple (
    Tuple40(..), Tuple41(..), Tuple42(..), Tuple43(..), Tuple44(..), Tuple45(..), Tuple46(..), Tuple47(..), Tuple48(..), Tuple49(..),
    Tuple50(..), Tuple51(..), Tuple52(..), Tuple53(..), Tuple54(..), Tuple55(..), Tuple56(..), Tuple57(..), Tuple58(..), Tuple59(..),
    Tuple60(..), Tuple61(..), Tuple62(..), Tuple63(..), Tuple64(..),
 +  maxTupleSize,
  ) where
  -- See W1 of Note [Tracking dependencies on primitives] in GHC.Internal.Base
 -import GHC.Internal.Types ()
 +import GHC.Internal.Types (Int)
  default () -- Double and Integer aren't available yet
@@ -598,3 +599,6 @@ data Tuple64 a b c d e f g h i j k l m n o p q r s t u v w x y z a1 b1 c1 d1 e1
        r1 s1 t1 u1 v1 w1 x1 y1 z1 a2 b2 c2 d2 e2 f2 g2 h2 i2 j2 k2 l2
    = (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,a1,b1,c1,d1,e1,f1,g1,h1,i1,j1,k1,l1,m1,n1,o1,p1,q1,
       r1,s1,t1,u1,v1,w1,x1,y1,z1,a2,b2,c2,d2,e2,f2,g2,h2,i2,j2,k2,l2)
++
 +maxTupleSize :: Int
 +maxTupleSize = 64