X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcTyClsDecls.lhs;h=d67ae90d8494231c42012318a18007160f29036f;hb=a4c34367ce3e836f52f0ffb1e379ce81b8d65316;hp=3cf6145a5c764ed2d0b5e7df3acf0b55ccee98bf;hpb=3e83dfb21b2f2220dce97427fff5c19459ae68d1;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcTyClsDecls.lhs b/compiler/typecheck/TcTyClsDecls.lhs
index 3cf6145..d67ae90 100644
--- a/compiler/typecheck/TcTyClsDecls.lhs
+++ b/compiler/typecheck/TcTyClsDecls.lhs
@@ -36,14 +36,16 @@ import TcMType		( newKindVar, checkValidTheta, checkValidType,
 import TcType		( TcKind, TcType, Type, tyVarsOfType, mkPhiTy,
 			  mkArrowKind, liftedTypeKind, mkTyVarTys, 
 			  tcSplitSigmaTy, tcEqTypes, tcGetTyVar_maybe )
-import Type		( PredType(..), splitTyConApp_maybe, mkTyVarTy
+import Type		( PredType(..), splitTyConApp_maybe, mkTyVarTy,
+                          newTyConInstRhs
 			  -- pprParendType, pprThetaArrow
 			)
 import Generics		( validGenericMethodType, canDoGenerics )
 import Class		( Class, className, classTyCon, DefMeth(..), classBigSig, classTyVars )
 import TyCon		( TyCon, AlgTyConRhs( AbstractTyCon ),
 			  tyConDataCons, mkForeignTyCon, isProductTyCon, isRecursiveTyCon,
-			  tyConStupidTheta, synTyConRhs, isSynTyCon, tyConName )
+			  tyConStupidTheta, synTyConRhs, isSynTyCon, tyConName,
+                          isNewTyCon )
 import DataCon		( DataCon, dataConUserType, dataConName, 
 			  dataConFieldLabels, dataConTyCon, dataConAllTyVars,
 			  dataConFieldType, dataConResTys )
@@ -598,19 +600,28 @@ argStrictness unbox_strict tycon bangs arg_tys
 -- We attempt to unbox/unpack a strict field when either:
 --   (i)  The field is marked '!!', or
 --   (ii) The field is marked '!', and the -funbox-strict-fields flag is on.
-
+--
+-- We have turned off unboxing of newtypes because coercions make unboxing 
+-- and reboxing more complicated
 chooseBoxingStrategy :: Bool -> TyCon -> TcType -> HsBang -> StrictnessMark
 chooseBoxingStrategy unbox_strict_fields tycon arg_ty bang
   = case bang of
 	HsNoBang				    -> NotMarkedStrict
-	HsStrict | unbox_strict_fields && can_unbox -> MarkedUnboxed
-	HsUnbox  | can_unbox			    -> MarkedUnboxed
+	HsStrict | unbox_strict_fields 
+                   && can_unbox arg_ty 		    -> MarkedUnboxed
+	HsUnbox  | can_unbox arg_ty		    -> MarkedUnboxed
 	other					    -> MarkedStrict
   where
-    can_unbox = case splitTyConApp_maybe arg_ty of
-		   Nothing 	       -> False
-		   Just (arg_tycon, _) -> not (isRecursiveTyCon tycon) &&
-					  isProductTyCon arg_tycon
+    -- we can unbox if the type is a chain of newtypes with a product tycon
+    -- at the end
+    can_unbox arg_ty = case splitTyConApp_maybe arg_ty of
+		   Nothing 	       		-> False
+		   Just (arg_tycon, tycon_args) -> 
+                       not (isRecursiveTyCon tycon) &&
+		       isProductTyCon arg_tycon &&
+                       (if isNewTyCon arg_tycon then 
+                            can_unbox (newTyConInstRhs arg_tycon tycon_args)
+                        else True)
 \end{code}
 
 %************************************************************************