X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcInstDcls.lhs;h=d2132a5acaf5105b76b960566a6db3788e4d3bc5;hb=cbdeae8fc8a1c72d20d89241acae8a313214b51c;hp=ad60526c7357719c94558b4edc3e5b3e7842c926;hpb=c7e7bc25c21e28651194d9d37a53a8820932fba7;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcInstDcls.lhs b/ghc/compiler/typecheck/TcInstDcls.lhs
index ad60526..d2132a5 100644
--- a/ghc/compiler/typecheck/TcInstDcls.lhs
+++ b/ghc/compiler/typecheck/TcInstDcls.lhs
@@ -32,7 +32,7 @@ import TcEnv		( TcEnv, tcExtendGlobalValEnv,
 			  tcExtendTyVarEnvForMeths, 
 			  tcAddImportedIdInfo, tcLookupClass,
  			  InstInfo(..), pprInstInfo, simpleInstInfoTyCon, 
-			  simpleInstInfoTy, newDFunName, tcExtendTyVarEnv,
+			  simpleInstInfoTy, newDFunName,
 			  isLocalThing,
 			)
 import InstEnv		( InstEnv, extendInstEnv )
@@ -52,7 +52,7 @@ import FunDeps		( checkInstFDs )
 import Generics		( validGenericInstanceType )
 import Module		( Module, foldModuleEnv )
 import Name		( getSrcLoc )
-import NameSet		( emptyNameSet, unitNameSet, nameSetToList )
+import NameSet		( unitNameSet, nameSetToList )
 import PrelInfo		( eRROR_ID )
 import PprType		( pprClassPred, pprPred )
 import TyCon		( TyCon, isSynTyCon )
@@ -65,6 +65,7 @@ import Type		( splitDFunTy, isTyVarTy,
 import Subst		( mkTopTyVarSubst, substTheta )
 import VarSet		( varSetElems )
 import TysWiredIn	( genericTyCons, isFFIArgumentTy, isFFIImportResultTy )
+import ForeignCall	( Safety(..) )
 import PrelNames	( cCallableClassKey, cReturnableClassKey, hasKey )
 import Name             ( Name )
 import SrcLoc           ( SrcLoc )
@@ -814,7 +815,7 @@ checkInstHead dflags theta clas inst_taus
     maybe_tycon_app	  = splitTyConApp_maybe first_inst_tau
     Just (tycon, arg_tys) = maybe_tycon_app
 
-    ccallable_type   dflags ty = isFFIArgumentTy dflags False {- Not safe call -} ty
+    ccallable_type   dflags ty = isFFIArgumentTy dflags PlayRisky ty
     creturnable_type        ty = isFFIImportResultTy dflags ty
 	
 check_tyvars dflags clas inst_taus