summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorsimonpj@microsoft.com <unknown>2009-03-04 09:19:13 +0000
committersimonpj@microsoft.com <unknown>2009-03-04 09:19:13 +0000
commit25a327cfe5f619a7923d268a7c68f197922f95a0 (patch)
tree9c41da1f595889aa1dc1c0e7ca28cd90bb456c48 /compiler
parent43213e90f8f17b0fd55f030aac64453249a3af16 (diff)
downloadhaskell-25a327cfe5f619a7923d268a7c68f197922f95a0.tar.gz
Fix a long-standing latent bug (and the build): check res_ty not sig_ty
Diffstat (limited to 'compiler')
-rw-r--r--compiler/typecheck/TcForeign.lhs10
1 files changed, 6 insertions, 4 deletions
diff --git a/compiler/typecheck/TcForeign.lhs b/compiler/typecheck/TcForeign.lhs
index d3a24a0630..5e877bb36e 100644
--- a/compiler/typecheck/TcForeign.lhs
+++ b/compiler/typecheck/TcForeign.lhs
@@ -108,10 +108,12 @@ tcCheckFIType _ arg_tys res_ty (DNImport spec) = do
_ -> return ()
return (DNImport (withDNTypes spec (map toDNType arg_tys) (toDNType res_ty)))
-tcCheckFIType sig_ty _ _ idecl@(CImport _ _ _ _ (CLabel _)) = do
- checkCg checkCOrAsm
- check (isFFILabelTy sig_ty) (illegalForeignTyErr empty sig_ty)
- return idecl
+tcCheckFIType sig_ty arg_tys res_ty idecl@(CImport _ _ _ _ (CLabel _))
+ = ASSERT( null arg_tys )
+ do { checkCg checkCOrAsm
+ ; check (isFFILabelTy res_ty) (illegalForeignTyErr empty sig_ty)
+ ; return idecl } -- NB check res_ty not sig_ty!
+ -- In case sig_ty is (forall a. ForeignPtr a)
tcCheckFIType sig_ty arg_tys res_ty idecl@(CImport cconv _ _ _ CWrapper) = do
-- Foreign wrapper (former f.e.d.)