X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FRegLiveness.hs;h=50af2eb7a0f11f85b52c15419cd8340f847a13b3;hb=08652e67c4d5d9a40687f93c286021a867c1bca0;hp=9ee98971baf49e320983970c1a357f8b4dda386f;hpb=1370a4a360ec154b390c1da21d40e446739b24c8;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/RegLiveness.hs b/compiler/nativeGen/RegLiveness.hs
index 9ee9897..50af2eb 100644
--- 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
@@ -46,6 +44,7 @@ import UniqFM
 import UniqSupply
 import Bag
 import State
+import FastString
 
 import Data.List
 import Data.Maybe
@@ -112,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
@@ -205,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)
@@ -558,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]