X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreUnfold.lhs;h=496d7a07e73b69c29b708ece5e46616a2e0e6563;hb=e3cb60d26917d7be1b34030b1e5a579fbef9d067;hp=d7ec4c718e7fe79edcfd25a66b5df36ea00ead38;hpb=c3fe0f3699fa59261a340686bba648c981b3511d;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/CoreUnfold.lhs b/compiler/coreSyn/CoreUnfold.lhs
index d7ec4c7..496d7a0 100644
--- a/compiler/coreSyn/CoreUnfold.lhs
+++ b/compiler/coreSyn/CoreUnfold.lhs
@@ -309,7 +309,7 @@ sizeExpr bOMB_OUT_SIZE top_args expr
       | fun `hasKey` buildIdKey   = buildSize
       | fun `hasKey` augmentIdKey = augmentSize
       | otherwise 
-      = case globalIdDetails fun of
+      = case idDetails fun of
 	  DataConWorkId dc -> conSizeN dc (valArgCount args)
 
 	  FCallId _    -> sizeN opt_UF_DearOp
@@ -634,14 +634,14 @@ callSiteInline dflags active_inline id lone_variable arg_infos cont_info
 		
     in    
     if dopt Opt_D_dump_inlinings dflags then
-	pprTrace "Considering inlining"
-		 (ppr id <+> vcat [text "active:" <+> ppr active_inline,
-			  	   text "arg infos" <+> ppr arg_infos,
-				   text "interesting continuation" <+> ppr cont_info,
-				   text "is value:" <+> ppr is_value,
-				   text "is cheap:" <+> ppr is_cheap,
-				   text "guidance" <+> ppr guidance,
-				   text "ANSWER =" <+> if yes_or_no then text "YES" else text "NO"])
+	pprTrace ("Considering inlining: " ++ showSDoc (ppr id))
+		 (vcat [text "active:" <+> ppr active_inline,
+			text "arg infos" <+> ppr arg_infos,
+			text "interesting continuation" <+> ppr cont_info,
+			text "is value:" <+> ppr is_value,
+			text "is cheap:" <+> ppr is_cheap,
+			text "guidance" <+> ppr guidance,
+			text "ANSWER =" <+> if yes_or_no then text "YES" else text "NO"])
 		  result
     else
     result
@@ -684,7 +684,7 @@ slow-down).  The motivation was test eyeball/inline1.hs; but that seems
 to work ok now.
 
 Note [Lone variables]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~
 The "lone-variable" case is important.  I spent ages messing about
 with unsatisfactory varaints, but this is nice.  The idea is that if a
 variable appears all alone