Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC

Commits:

• 00f1be8f
  by Simon Peyton Jones at 2025-09-05T13:58:41-04:00

  Refactor ForAllCo
  
  This is a pure refactor, addressing #26389.
  
  It arranges that the kind coercion in a ForAllCo is a MCoercion, rather
  than a plain Coercion, thus removing redundancy in the common case.
  See (FC8) in Note [ForAllCo]
  
  It's a nice cleanup.
  

• 530d242d
  by sheaf at 2025-09-05T13:58:53-04:00

  Use tcMkScaledFunTys in matchExpectedFunTys
  
  We should use tcMkScaledFunTys rather than mkScaledFunTys in
  GHC.Tc.Utils.Unify.matchExpectedFunTys, as the latter crashes
  when the kind of the result type is a bare metavariable.
  We know the result is always Type-like, so we don't need scaledFunTys
  to try to rediscover that from the kind.
  
  Fixes #26277
  

• 99c2648c
  by sheaf at 2025-09-05T13:58:58-04:00

  Revert "Remove hptAllFamInstances usage during upsweep"
  
  This reverts commit 3bf6720eff5e86e673568e756161e6d6150eb440.
  

• 30113c4e
  by soulomoon at 2025-09-05T13:58:58-04:00

  Family consistency checks: add test for #26154
  
  This commit adds the test T26154, to make sure that GHC doesn't crash
  when performing type family consistency checks. This test case
  was extracted from Agda.
  
  Fixes #26154
  

35 changed files:

• compiler/GHC/Core/Coercion.hs
• compiler/GHC/Core/Coercion.hs-boot
• compiler/GHC/Core/Coercion/Opt.hs
• compiler/GHC/Core/Lint.hs
• compiler/GHC/Core/Opt/Arity.hs
• compiler/GHC/Core/Reduction.hs
• compiler/GHC/Core/TyCo/FVs.hs
• compiler/GHC/Core/TyCo/Rep.hs
• compiler/GHC/Core/TyCo/Subst.hs
• compiler/GHC/Core/TyCo/Tidy.hs
• compiler/GHC/Core/Type.hs
• compiler/GHC/Core/Unify.hs
• compiler/GHC/CoreToIface.hs
• compiler/GHC/Driver/Env.hs
• compiler/GHC/Iface/Rename.hs
• compiler/GHC/Iface/Syntax.hs
• compiler/GHC/Iface/Type.hs
• compiler/GHC/IfaceToCore.hs
• compiler/GHC/Tc/Instance/Family.hs
• compiler/GHC/Tc/Module.hs
• compiler/GHC/Tc/TyCl/Utils.hs
• compiler/GHC/Tc/Utils/TcMType.hs
• compiler/GHC/Tc/Utils/TcType.hs
• compiler/GHC/Tc/Utils/Unify.hs
• compiler/GHC/Types/Id/Make.hs
• compiler/GHC/Unit/Home/Graph.hs
• compiler/GHC/Unit/Home/PackageTable.hs
• testsuite/tests/simplCore/should_compile/OpaqueNoCastWW.stderr
• + testsuite/tests/typecheck/should_compile/T26154.hs
• + testsuite/tests/typecheck/should_compile/T26154_A.hs
• + testsuite/tests/typecheck/should_compile/T26154_B.hs
• + testsuite/tests/typecheck/should_compile/T26154_B.hs-boot
• + testsuite/tests/typecheck/should_compile/T26154_Other.hs
• + testsuite/tests/typecheck/should_compile/T26277.hs
• testsuite/tests/typecheck/should_compile/all.T

The diff was not included because it is too large.