[commit: ghc] wip/new-flatten-skolems-Aug14: Merge branch 'wip/new-flatten-skolems-Aug14' of https://git.haskell.org/ghc into wip/new-flatten-skolems-Aug14 (c5f6308)

[git at git.haskell.org]

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

On branch  : wip/new-flatten-skolems-Aug14
Link       : http://ghc.haskell.org/trac/ghc/changeset/c5f6308d43461de436756f1b396b1287eee6598b/ghc

>---------------------------------------------------------------

commit c5f6308d43461de436756f1b396b1287eee6598b
Merge: 9b5c9af 286637a
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Sep 26 16:51:20 2014 +0100

    Merge branch 'wip/new-flatten-skolems-Aug14' of https://git.haskell.org/ghc into wip/new-flatten-skolems-Aug14
    
    Conflicts:
    	testsuite/tests/indexed-types/should_fail/T7729a.hs



>---------------------------------------------------------------

c5f6308d43461de436756f1b396b1287eee6598b
 compiler/typecheck/Flattening-notes                | 62 +++++++++++++---------
 compiler/typecheck/TcInteract.lhs                  | 19 +++++--
 compiler/typecheck/TcSMonad.lhs                    |  2 +-
 .../tests/indexed-types/should_fail/GADTwrong1.hs  | 11 ++++
 .../tests/indexed-types/should_fail/T7729a.hs      |  7 +++
 .../typecheck/should_compile/TcTypeNatSimple.hs    | 10 +---
 6 files changed, 72 insertions(+), 39 deletions(-)

diff --cc testsuite/tests/indexed-types/should_fail/T7729a.hs
index ea36e32,7fad7ea..ad3fca5
--- a/testsuite/tests/indexed-types/should_fail/T7729a.hs
+++ b/testsuite/tests/indexed-types/should_fail/T7729a.hs
@@@ -34,3 -26,9 +34,10 @@@ instance MonadTrans Rand wher
  instance MonadPrim m => MonadPrim (Rand m) where
    type BasePrimMonad (Rand m) = BasePrimMonad m
    liftPrim x = liftPrim (lift x)   -- This line changed from T7729
+ 
+ {-
+   liftPrim :: BasePrimMonad (Rand m) a -> Rand m a
+             = BasePrimMonad m -> Rand m a
+ 
+ -}
++