X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FRegAlloc%2FGraph%2FSpill.hs;h=f9a2586f5a8c5b83bea991996673ec918089c909;hb=335b9f366ac440259318777c4c07e4fa42fbbec6;hp=e6e5622a0251af4edeb053c71162c002905745b0;hpb=b04a210e26ca57242fd052f2aa91011a80b76299;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/RegAlloc/Graph/Spill.hs b/compiler/nativeGen/RegAlloc/Graph/Spill.hs
index e6e5622..f9a2586 100644
--- a/compiler/nativeGen/RegAlloc/Graph/Spill.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/Spill.hs
@@ -22,7 +22,6 @@ import UniqSupply
 import Outputable
 
 import Data.List
-import Data.Maybe
 
 
 -- | Spill all these virtual regs to memory
@@ -37,7 +36,7 @@ regSpill
 	:: Instruction instr
 	=> [LiveCmmTop instr]		-- ^ the code
 	-> UniqSet Int			-- ^ available stack slots
-	-> UniqSet Reg			-- ^ the regs to spill
+	-> UniqSet VirtualReg		-- ^ the regs to spill
 	-> UniqSM
 		([LiveCmmTop instr]	-- code will spill instructions
 		, UniqSet Int		-- left over slots
@@ -190,7 +189,9 @@ patchInstr
 
 patchInstr reg instr
  = do	nUnique		<- newUnique
- 	let nReg	= renameVirtualReg nUnique reg
+ 	let nReg	= case reg of 
+				RegVirtual vr 	-> RegVirtual (renameVirtualReg nUnique vr)
+				RegReal{}	-> panic "RegAlloc.Graph.Spill.patchIntr: not patching real reg"
 	let instr'	= patchReg1 reg nReg instr
 	return		(instr', nReg)