X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmInfo.hs;h=49a77e29fd348ea8ebf18a7e48329a2c7aee71c9;hb=1241c26f3552a2037263769e5ef7fa68d9f3be36;hp=520566d693e8c778f3a84beee531858359f7047a;hpb=3704620a9078bbcc429229e29242b7352647ee89;p=ghc-hetmet.git

diff --git a/compiler/cmm/CmmInfo.hs b/compiler/cmm/CmmInfo.hs
index 520566d..49a77e2 100644
--- a/compiler/cmm/CmmInfo.hs
+++ b/compiler/cmm/CmmInfo.hs
@@ -1,3 +1,10 @@
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module CmmInfo (
   cmmToRawCmm,
   mkInfoTable
@@ -7,7 +14,6 @@ module CmmInfo (
 
 import Cmm
 import CmmUtils
-import PprCmm
 
 import CLabel
 import MachOp
@@ -21,7 +27,6 @@ import SMRep
 
 import Constants
 import StaticFlags
-import DynFlags
 import Unique
 import UniqSupply
 import Panic
@@ -78,12 +83,8 @@ mkInfoTable uniq (CmmProc (CmmInfo _ _ info) entry_label arguments blocks) =
 
       CmmInfoTable (ProfilingInfo ty_prof cl_prof) type_tag type_info ->
           let info_label = entryLblToInfoLbl entry_label
-              ty_prof' = if tablesNextToCode
-                         then makeRelativeRefTo info_label ty_prof
-                         else                              ty_prof
-              cl_prof' = if tablesNextToCode
-                         then makeRelativeRefTo info_label cl_prof
-                         else                              cl_prof
+              ty_prof' = makeRelativeRefTo info_label ty_prof
+              cl_prof' = makeRelativeRefTo info_label cl_prof
           in case type_info of
           -- | A function entry point.
           FunInfo (ptrs, nptrs) srt fun_type fun_arity pap_bitmap slow_entry ->
@@ -149,15 +150,15 @@ mkInfoTableAndCode :: CLabel
                    -> [CmmLit]
                    -> [CmmLit]
                    -> CLabel
-                   -> CmmFormals
-                   -> [CmmBasicBlock]
+                   -> CmmFormalsWithoutKinds
+                   -> ListGraph CmmStmt
                    -> [RawCmmTop]
 mkInfoTableAndCode info_lbl std_info extra_bits entry_lbl args blocks
   | tablesNextToCode 	-- Reverse the extra_bits; and emit the top-level proc
   = [CmmProc (map CmmStaticLit (reverse extra_bits ++ std_info))
              entry_lbl args blocks]
 
-  | null blocks -- No actual code; only the info table is significant
+  | ListGraph [] <- blocks -- No code; only the info table is significant
   =		-- Use a zero place-holder in place of the 
 		-- entry-label in the info table
     [mkRODataLits info_lbl (zeroCLit : std_info ++ extra_bits)]
@@ -221,8 +222,8 @@ mkLiveness uniq live =
     is_non_ptr Nothing = True
     is_non_ptr (Just reg) =
         case localRegGCFollow reg of
-          KindNonPtr -> True
-          KindPtr -> False
+          GCKindNonPtr -> True
+          GCKindPtr -> False
 
     bits :: [Bool]
     bits = mkBits live
@@ -274,3 +275,7 @@ mkStdInfoTable type_descr closure_descr cl_type srt_len layout_lit
 	| otherwise	     = []
 
     type_lit = packHalfWordsCLit cl_type srt_len
+
+
+_unused :: FS.FastString -- stops a warning
+_unused = undefined