[commit: ghc] wip/T14880: Fix egregious error from last commit (3caf3dd)

[git at git.haskell.org]

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

On branch  : wip/T14880
Link       : http://ghc.haskell.org/trac/ghc/changeset/3caf3dd4b3a73c019d6767d10a218c353a3f8ca7/ghc

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

commit 3caf3dd4b3a73c019d6767d10a218c353a3f8ca7
Author: Richard Eisenberg <rae at cs.brynmawr.edu>
Date:   Fri Jun 15 21:51:05 2018 -0400

    Fix egregious error from last commit
    
    I accidentally reversed the polarity of a key test in the Type
    module.


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

3caf3dd4b3a73c019d6767d10a218c353a3f8ca7
 compiler/types/Type.hs                                | 2 +-
 testsuite/tests/simplCore/should_compile/T3234.stderr | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/types/Type.hs b/compiler/types/Type.hs
index 3c58b3f..dffbaf3 100644
--- a/compiler/types/Type.hs
+++ b/compiler/types/Type.hs
@@ -2042,7 +2042,7 @@ isValidJoinPointType arity ty
   where
     valid_under tvs arity ty
       | arity == 0
-      = tvs `intersectsVarSet` tyCoVarsOfType ty
+      = not (tvs `intersectsVarSet` tyCoVarsOfType ty)
       | Just (t, ty') <- splitForAllTy_maybe ty
       = valid_under (tvs `extendVarSet` t) (arity-1) ty'
       | Just (_, res_ty) <- splitFunTy_maybe ty
diff --git a/testsuite/tests/simplCore/should_compile/T3234.stderr b/testsuite/tests/simplCore/should_compile/T3234.stderr
index 223650a..6468463 100644
--- a/testsuite/tests/simplCore/should_compile/T3234.stderr
+++ b/testsuite/tests/simplCore/should_compile/T3234.stderr
@@ -58,8 +58,8 @@ Total ticks:     52
   1 b
   1 c
   1 n
-  1 b
   1 a
+  1 b
   1 k
   1 z
   1 g