[commit: ghc] master: Add a missing zonk in TcDerivInfer.simplifyDeriv (13fdca3)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/13fdca3d174ff15ac347c5db78370f457a3013ee/ghc

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

commit 13fdca3d174ff15ac347c5db78370f457a3013ee
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Oct 11 16:17:41 2017 +0100

    Add a missing zonk in TcDerivInfer.simplifyDeriv
    
    I'm astonished that anything worked without this!
    
    Fixes Trac #14339


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

13fdca3d174ff15ac347c5db78370f457a3013ee
 compiler/typecheck/TcDerivInfer.hs                |  2 ++
 testsuite/tests/deriving/should_compile/T14339.hs | 17 +++++++++++++++++
 testsuite/tests/deriving/should_compile/all.T     |  1 +
 3 files changed, 20 insertions(+)

diff --git a/compiler/typecheck/TcDerivInfer.hs b/compiler/typecheck/TcDerivInfer.hs
index f598e70..9095977 100644
--- a/compiler/typecheck/TcDerivInfer.hs
+++ b/compiler/typecheck/TcDerivInfer.hs
@@ -676,6 +676,8 @@ simplifyDeriv pred tvs thetas
        -- Simplify the constraints
        ; solved_implics <- runTcSDeriveds $ solveWantedsAndDrop
                                           $ unionsWC wanteds
+       -- It's not yet zonked!  Obviously zonk it before peering at it
+       ; solved_implics <- zonkWC solved_implics
 
        -- See [STEP DAC HOIST]
        -- Split the resulting constraints into bad and good constraints,
diff --git a/testsuite/tests/deriving/should_compile/T14339.hs b/testsuite/tests/deriving/should_compile/T14339.hs
new file mode 100644
index 0000000..e2521f2
--- /dev/null
+++ b/testsuite/tests/deriving/should_compile/T14339.hs
@@ -0,0 +1,17 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE UndecidableInstances #-}
+module Bug where
+
+import GHC.TypeLits
+
+newtype Baz = Baz Foo
+  deriving Bar
+
+newtype Foo = Foo Int
+
+class Bar a where
+  bar :: a
+
+instance (TypeError (Text "Boo")) => Bar Foo where
+  bar = undefined
diff --git a/testsuite/tests/deriving/should_compile/all.T b/testsuite/tests/deriving/should_compile/all.T
index 65c6d72..82cee03 100644
--- a/testsuite/tests/deriving/should_compile/all.T
+++ b/testsuite/tests/deriving/should_compile/all.T
@@ -96,3 +96,4 @@ test('T13919', normal, compile, [''])
 test('T13998', normal, compile, [''])
 test('T14045b', normal, compile, [''])
 test('T14094', normal, compile, [''])
+test('T14339', normal, compile, [''])