summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Eisenberg <rae@cs.brynmawr.edu>2018-06-15 21:51:05 -0400
committerRichard Eisenberg <rae@cs.brynmawr.edu>2018-06-15 21:51:05 -0400
commit3caf3dd4b3a73c019d6767d10a218c353a3f8ca7 (patch)
tree8d1039ce1ed7754c70f9f791550d1d6a5179f98c
parent4d8f5c11032f68c54d71cc5d56a34fb98379280a (diff)
downloadhaskell-wip/T14880.tar.gz
Fix egregious error from last commitwip/T14880
I accidentally reversed the polarity of a key test in the Type module.
-rw-r--r--compiler/types/Type.hs2
-rw-r--r--testsuite/tests/simplCore/should_compile/T3234.stderr2
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/types/Type.hs b/compiler/types/Type.hs
index 3c58b3fc98..dffbaf31a4 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 223650af6d..64684631e5 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