diff options
| author | Jose Pedro Magalhaes <jpm@cs.uu.nl> | 2011-05-12 13:26:03 +0200 |
|---|---|---|
| committer | Jose Pedro Magalhaes <jpm@cs.uu.nl> | 2011-05-12 13:26:03 +0200 |
| commit | 1b381af863d64aaa0a4dd9c816170c58e6131a9e (patch) | |
| tree | 52fa1f1af2d5256e5f475e3c6dd00630d53fb35d /compiler/vectorise/Vectorise.hs | |
| parent | c25b934ef544fa3eba0a9f9da41b363c470156cb (diff) | |
| parent | c8c2f6bb7d79a2a6aeaa3233363fdf0bbbfad205 (diff) | |
| download | haskell-1b381af863d64aaa0a4dd9c816170c58e6131a9e.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
Resolved conflicts:
compiler/typecheck/TcTyClsDecls.lhs
Diffstat (limited to 'compiler/vectorise/Vectorise.hs')
| -rw-r--r-- | compiler/vectorise/Vectorise.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index ca6766ad29..4994e3f165 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -19,7 +19,6 @@ import PprCore import CoreSyn import CoreMonad ( CoreM, getHscEnv ) import Type -import Var import Id import OccName import DynFlags @@ -190,7 +189,7 @@ vectTopBinder var inline expr ; case vectDecl of Nothing -> return () Just (vdty, _) - | coreEqType vty vdty -> return () + | eqType vty vdty -> return () | otherwise -> cantVectorise ("Type mismatch in vectorisation pragma for " ++ show var) $ (text "Expected type" <+> ppr vty) |