X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FsimplCore%2FSimplify.lhs;h=eba387c909f410a979b4bac18f80e6b5d9b8c729;hb=132c92f70c00bb465cfd33178338287eb587a63c;hp=5b0be27ccd6f9a9e84126a6180698fde1a3322ee;hpb=bd9eee136c2362fec5acc048bc29d1157a20d7b2;p=ghc-hetmet.git

diff --git a/ghc/compiler/simplCore/Simplify.lhs b/ghc/compiler/simplCore/Simplify.lhs
index 5b0be27..eba387c 100644
--- a/ghc/compiler/simplCore/Simplify.lhs
+++ b/ghc/compiler/simplCore/Simplify.lhs
@@ -275,10 +275,10 @@ simplExpr env (Prim op prim_args) args result_ty
   where
     -- PrimOps just need any types in them renamed.
 
-    simpl_op (CCallOp label is_asm may_gc arg_tys result_ty)
+    simpl_op (CCallOp label is_asm may_gc cconv arg_tys result_ty)
       = mapEager (simplTy env) arg_tys	`appEager` \ arg_tys' ->
 	simplTy env result_ty		`appEager` \ result_ty' ->
-	returnEager (CCallOp label is_asm may_gc arg_tys' result_ty')
+	returnEager (CCallOp label is_asm may_gc cconv arg_tys' result_ty')
 
     simpl_op other_op = returnEager other_op
 \end{code}
@@ -327,8 +327,8 @@ simplExpr env tylam@(Lam (TyBinder tyvar) body) [] result_ty
     returnSmpl (Lam (TyBinder tyvar') body')
 
 #ifdef DEBUG
-simplExpr env (Lam (TyBinder _) _) (_ : _) result_ty
-  = panic "simplExpr:TyLam with non-TyArg"
+simplExpr env e@(Lam (TyBinder _) _) args@(_ : _) result_ty
+  = pprPanic "simplExpr:TyLam with non-TyArg" (ppr e $$ ppr args)
 #endif
 \end{code}