summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Eisenberg <eir@cis.upenn.edu>2014-03-22 13:13:26 -0400
committerRichard Eisenberg <eir@cis.upenn.edu>2014-03-22 18:38:41 -0400
commitc99941cfeee033fca2df45e9523b65c83be20d31 (patch)
tree5888e7dd0a2e1e5d3b12f63dc1794e8d261b2419
parent47796026ca35a2438f7a7dc337add2ec3b14f06c (diff)
downloadhaskell-c99941cfeee033fca2df45e9523b65c83be20d31.tar.gz
Fix #8917.
FamInstEnv.normaliseTcApp should normalise arguments even when the top-level tycon isn't a type family. This was a regression from 7.6 -- not sure when it happened, but it was probably my fault. Fixed now, in any case.
-rw-r--r--compiler/types/FamInstEnv.lhs6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/types/FamInstEnv.lhs b/compiler/types/FamInstEnv.lhs
index 0421f48a58..50ced7d323 100644
--- a/compiler/types/FamInstEnv.lhs
+++ b/compiler/types/FamInstEnv.lhs
@@ -959,9 +959,9 @@ normaliseTcApp env role tc tys
| otherwise -- No unique matching family instance exists;
-- we do not do anything
- = (Refl role ty, ty)
- where
- ty = mkTyConApp tc tys
+ = let (co, ntys) = normaliseTcArgs env role tc tys in
+ (co, mkTyConApp tc ntys)
+
---------------
normaliseTcArgs :: FamInstEnvs -- environment with family instances