Make TcUnify warning-free

[ghc-hetmet.git] / compiler / nativeGen / RegLiveness.hs

diff --git a/compiler/nativeGen/RegLiveness.hs b/compiler/nativeGen/RegLiveness.hs
index 6bee0c8..50af2eb 100644 (file)
--- a/compiler/nativeGen/RegLiveness.hs
+++ b/compiler/nativeGen/RegLiveness.hs
@@ -30,8 +30,6 @@ module RegLiveness (
 
   ) where
 
-#include "HsVersions.h"
-
 import MachRegs
 import MachInstrs
 import PprMach
@@ -113,9 +111,9 @@ instance Outputable LiveInstr where
         =  ppr instr
                $$ (nest 8
                        $ vcat
-                       [ pprRegs (ptext SLIT("# born:    ")) (liveBorn live)
-                       , pprRegs (ptext SLIT("# r_dying: ")) (liveDieRead live)
-                       , pprRegs (ptext SLIT("# w_dying: ")) (liveDieWrite live) ]
+                       [ pprRegs (ptext (sLit "# born:    ")) (liveBorn live)
+                       , pprRegs (ptext (sLit "# r_dying: ")) (liveDieRead live)
+                       , pprRegs (ptext (sLit "# w_dying: ")) (liveDieWrite live) ]
                    $+$ space)
 
         where  pprRegs :: SDoc -> RegSet -> SDoc
@@ -206,7 +204,7 @@ slurpConflicts live
                = (consBag rsLiveEntry conflicts, moves)
 
                | otherwise
-               = error "RegLiveness.slurpBlock: bad block"
+               = panic "RegLiveness.slurpBlock: bad block"
 
        slurpLIs rsLive (conflicts, moves) []
                = (consBag rsLive conflicts, moves)
@@ -559,7 +557,7 @@ livenessSCCs blockmap done
                  concatMap tail $
                  groupBy (\(a1, _) (a2, _) -> eq a1 a2) $
                  iterate (\(a, _) -> f a b) $
-                 (a, error "RegisterAlloc.livenessSCCs")
+                 (a, panic "RegLiveness.livenessSCCs")
 
 
             linearLiveness :: BlockMap RegSet -> [NatBasicBlock]