X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FcodeGen%2FCgExpr.lhs;h=904dd5504e47b8e8e697f8d2f34b718e0afcea43;hb=8a98445c043fc954dedcca7ce01c17434b8e44b1;hp=5026a31ea7590fdea89730fdf288008120138fdb;hpb=89ea5818c80084440ea779bc93e6930a7a34752e;p=ghc-hetmet.git

diff --git a/ghc/compiler/codeGen/CgExpr.lhs b/ghc/compiler/codeGen/CgExpr.lhs
index 5026a31..904dd55 100644
--- a/ghc/compiler/codeGen/CgExpr.lhs
+++ b/ghc/compiler/codeGen/CgExpr.lhs
@@ -8,12 +8,9 @@
 %********************************************************
 
 \begin{code}
-#include "HsVersions.h"
-
 module CgExpr ( cgExpr, getPrimOpArgAmodes ) where
 
-IMP_Ubiq(){-uitous-}
-IMPORT_DELOOPER(CgLoop2)	-- here for paranoia-checking
+#include "HsVersions.h"
 
 import Constants	( mAX_SPEC_SELECTEE_SIZE )
 import StgSyn
@@ -38,22 +35,21 @@ import CLabel		( mkPhantomInfoTableLabel, mkInfoTableVecTblLabel )
 import ClosureInfo	( mkClosureLFInfo, mkSelectorLFInfo, mkVapLFInfo,
 			  layOutDynCon )
 import CostCentre	( sccAbleCostCentre, isDictCC, isSccCountCostCentre )
-import HeapOffs		( SYN_IE(VirtualSpBOffset), intOffsetIntoGoods )
+import HeapOffs		( VirtualSpBOffset, intOffsetIntoGoods )
 import Id		( dataConTyCon, idPrimRep, getIdArity, 
 			  mkIdSet, unionIdSets, GenId{-instance Outputable-},
-			  SYN_IE(Id)
+			  Id
 			)
 import IdInfo		( ArityInfo(..) )
 import Name		( isLocallyDefined )
-import Outputable	( PprStyle(..), Outputable(..) )
-import Pretty		( Doc )
 import PrimOp		( primOpCanTriggerGC, primOpHeapReq, HeapRequirement(..),
 			  getPrimOpResultInfo, PrimOp(..), PrimOpResultInfo(..)
 			)
 import PrimRep		( getPrimRepSize, PrimRep(..) )
 import TyCon		( tyConDataCons, maybeTyConSingleCon  )
 import Maybes		( assocMaybe, maybeToBool )
-import Util		( panic, isIn, pprPanic, assertPanic )
+import Util		( isIn )
+import Outputable
 \end{code}
 
 This module provides the support code for @StgToAbstractC@ to deal
@@ -191,7 +187,7 @@ cgExpr x@(StgPrim op args live_vars)
 			    mkIntCLit (length rs)) -- for ticky-ticky only
 
     	    	      ReturnInHeap
-			-> pprPanic "CgExpr: can't return prim in heap:" (ppr PprDebug data_con)
+			-> pprPanic "CgExpr: can't return prim in heap:" (ppr data_con)
 			  -- Never used, and no point in generating
 			  -- the code for it!
   where