X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FRegAlloc%2FGraph%2FSpillCost.hs;fp=compiler%2FnativeGen%2FRegAlloc%2FGraph%2FSpillCost.hs;h=97995871af92d005492783d681585a42b49fb5a6;hb=e17cf7ff32778f4e6b3622855f25426251e843d6;hp=5932d3100d55f849388b5da563ca97363e19ff7d;hpb=028c032b60567b8cd501e9d7248e4aa86088a19b;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs b/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
index 5932d31..9799587 100644
--- a/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
@@ -93,13 +93,7 @@ slurpSpillCostInfo cmm
 		= return ()
 
 	-- skip over comment and delta pseudo instrs
-	countLIs rsLive (SPILL{} : lis)
-		= countLIs rsLive lis
-		
-	countLIs rsLive (RELOAD{} : lis)
-		= countLIs rsLive lis
-
-	countLIs rsLive (Instr instr Nothing : lis)
+	countLIs rsLive (LiveInstr instr Nothing : lis)
 		| isMetaInstr instr
 		= countLIs rsLive lis
 
@@ -107,7 +101,7 @@ slurpSpillCostInfo cmm
 		= pprPanic "RegSpillCost.slurpSpillCostInfo"
 			(text "no liveness information on instruction " <> ppr instr)
 
-	countLIs rsLiveEntry (Instr instr (Just live) : lis)
+	countLIs rsLiveEntry (LiveInstr instr (Just live) : lis)
 	 = do
 		-- increment the lifetime counts for regs live on entry to this instr
 		mapM_ incLifetime $ uniqSetToList rsLiveEntry