Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

• 2b8baada
  by sheaf at 2025-10-08T18:23:37-04:00

  Improvements to 'mayLookIdentical'
  
  This commit makes significant improvements to the machinery that decides
  when we should pretty-print the "invisible bits" of a type, such as:
  
    - kind applications, e.g. '@k' in 'Proxy @k ty'
    - RuntimeReps, e.g. 'TYPE r'
    - multiplicities and linear arrows 'a %1 -> b'
  
  To do this, this commit refactors 'mayLookIdentical' to return **which**
  of the invisible bits don't match up, e.g. in
  
    (a %1 -> b) ~ (a %Many -> b)
  
  we find that the invisible bit that doesn't match up is a multiplicity,
  so we should set 'sdocLinearTypes = True' when pretty-printing, and with
  e.g.
  
    Proxy @k1 ~ Proxy @k2
  
  we find that the invisible bit that doesn't match up is an invisible
  TyCon argument, so we set 'sdocPrintExplicitKinds = True'.
  
  We leverage these changes to remove the ad-hoc treatment of linearity
  of data constructors with 'dataConDisplayType' and 'dataConNonLinearType'.
  This is now handled by the machinery of 'pprWithInvisibleBits'.
  
  Fixes #26335 #26340
  

• 129ce32d
  by sheaf at 2025-10-08T18:23:37-04:00

  Store SDoc context in SourceError
  
  This commits modifies the SourceError datatype which is used for
  throwing and then reporting exceptions by storing all the info we need
  to be able to print the SDoc, including whether we should print with
  explicit kinds, explicit runtime-reps, etc.
  
  This is done using the new datatype:
  
    data SourceErrorContext
      = SEC
          !DiagOpts
          !(DiagnosticOpts GhcMessage)
  
  Now, when we come to report an error (by handling the exception), we
  have access to the full context we need.
  
  Fixes #26387
  

69 changed files:

• compiler/GHC.hs
• compiler/GHC/Core/Multiplicity.hs
• compiler/GHC/Core/TyCo/Compare.hs
• compiler/GHC/Core/TyCo/Ppr.hs
• compiler/GHC/Driver/Backpack.hs
• compiler/GHC/Driver/Downsweep.hs
• compiler/GHC/Driver/Env/Types.hs
• compiler/GHC/Driver/Errors.hs
• compiler/GHC/Driver/Main.hs
• compiler/GHC/Driver/Make.hs
• compiler/GHC/Driver/MakeFile.hs
• compiler/GHC/Driver/Monad.hs
• compiler/GHC/Driver/Pipeline/Execute.hs
• compiler/GHC/Hs/Decls.hs
• compiler/GHC/Hs/Type.hs
• compiler/GHC/Iface/Decl.hs
• compiler/GHC/Iface/Ext/Ast.hs
• compiler/GHC/Iface/Load.hs
• compiler/GHC/Iface/Make.hs
• compiler/GHC/Iface/Type.hs
• compiler/GHC/Parser/Header.hs
• compiler/GHC/Tc/Errors/Ppr.hs
• compiler/GHC/Tc/Errors/Types.hs
• compiler/GHC/Tc/Gen/HsType.hs
• compiler/GHC/Tc/Gen/Splice.hs
• compiler/GHC/Tc/Module.hs
• compiler/GHC/Tc/Solver/Equality.hs
• compiler/GHC/Tc/TyCl.hs
• compiler/GHC/Tc/Types/CtLoc.hs
• compiler/GHC/Tc/Types/Origin.hs
• compiler/GHC/Tc/Utils/TcMType.hs
• compiler/GHC/Tc/Utils/TcType.hs
• compiler/GHC/Tc/Utils/Unify.hs
• compiler/GHC/Tc/Utils/Unify.hs-boot
• compiler/GHC/Types/SourceError.hs
• compiler/GHC/Types/TyThing/Ppr.hs
• compiler/GHC/Utils/Error.hs
• compiler/GHC/Utils/Outputable.hs
• ghc/GHCi/UI.hs
• testsuite/tests/cpranal/should_compile/T18174.stderr
• testsuite/tests/driver/T11429c.stderr
• testsuite/tests/driver/T21682.stderr
• testsuite/tests/ghc-api/T10942.hs
• testsuite/tests/ghc-api/annotations-literals/literals.hs
• testsuite/tests/indexed-types/should_fail/T14887.stderr
• testsuite/tests/linear/should_fail/T19361.stderr
• testsuite/tests/roles/should_compile/Roles13.stderr
• testsuite/tests/simplCore/should_compile/OpaqueNoCastWW.stderr
• testsuite/tests/simplCore/should_compile/T17673.stderr
• testsuite/tests/simplCore/should_compile/T18078.stderr
• testsuite/tests/simplCore/should_compile/T18995.stderr
• testsuite/tests/simplCore/should_compile/T19890.stderr
• testsuite/tests/simplCore/should_compile/T21948.stderr
• testsuite/tests/simplCore/should_compile/T21960.stderr
• testsuite/tests/simplCore/should_compile/T24808.stderr
• − testsuite/tests/simplCore/should_compile/T25713.stderr
• testsuite/tests/simplCore/should_compile/T4201.stdout
• testsuite/tests/simplCore/should_compile/T8331.stderr
• testsuite/tests/typecheck/no_skolem_info/T20232.stderr
• testsuite/tests/typecheck/should_fail/T11672.stderr
• testsuite/tests/typecheck/should_fail/T12373.stderr
• testsuite/tests/typecheck/should_fail/T15807.stderr
• testsuite/tests/typecheck/should_fail/T16074.stderr
• testsuite/tests/typecheck/should_fail/T18357a.stderr
• testsuite/tests/typecheck/should_fail/T19627.stderr
• testsuite/tests/typecheck/should_fail/T21530a.stderr
• testsuite/tests/typecheck/should_fail/VisFlag1.stderr
• utils/check-exact/Parsers.hs
• utils/check-exact/Preprocess.hs

The diff was not included because it is too large.