[commit: ghc] wip/tdammers/D4394's head updated: Fix rebasing mistake (318ce2a)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

Branch 'wip/tdammers/D4394' now includes:

     0a778eb Revert "rts, base: Refactor stats.c to improve --machine-readable report"
     abaf43d Fix seq# case of exprOkForSpeculation
     49ac3f0 Fix #14869 by being more mindful of Type vs. Constraint
     411a97e Allow as-patterns in unidirectional patttern synonyms
     3446cee Fix two obscure bugs in rule matching
     a38a2b8 Applying patch suggested in #11735 to improve coercionKind perf
     38ee99b Added SCCs to hunt down #14683
     ecc0716 Refactored coercionKindsRole (as per #11735)
     28ff8db Simplification as per #11735
     4c94815 Caching coercion roles in NthCo (#11735)
     b2b5d3a Make mkNthCo take a Role parameter.
     6148776 Caching coercion roles in NthCo and coercionKindsRole refactoring (#11735)
     28b59e4 Fixed NthCo Note (discussion in D4385)
     766ae47 Documented invariant on cached roles
     c678314 Tighten cached role in NthCo
     8e673eb NthCo handling, assertions and documentation improvements
     4fa4034 Fixes to Coercion.hs
     091d72d Removed dead code
     0869056 Refactored setNominalRole_maybe to avoid dragging role through recursion
     c1d5e19 Another fix as per D4394
     fe5a03c Fixed unused variables
     5ab47c0 Refactor mkCoCast
     1af89d5 Fix test to reflect changed NthCo ctor
     8d7503a Increased allocation limit for T5321 on OS X
     318ce2a Fix rebasing mistake