summaryrefslogtreecommitdiff
path: root/compiler/codeGen/CgInfoTbls.hs
diff options
context:
space:
mode:
authorMe at work <simonmar-work@simonmar-laptop.(none)>2012-02-14 11:49:53 +0000
committerMe at work <simonmar-work@simonmar-laptop.(none)>2012-02-14 11:49:53 +0000
commit1e07bd74037127d3b9c90f7e7246c6761fced953 (patch)
treef8b976de22b854bd1c98e73a54bc8cb464eb9335 /compiler/codeGen/CgInfoTbls.hs
parent8fb67a2a9c798976cefecb8d69d73fde5383c4f1 (diff)
parent5cf9c0191566a3fd806a12e58b93ee813d4528f9 (diff)
downloadhaskell-1e07bd74037127d3b9c90f7e7246c6761fced953.tar.gz
Merge remote-tracking branch 'laptop/newcg' into newcg
Diffstat (limited to 'compiler/codeGen/CgInfoTbls.hs')
-rw-r--r--compiler/codeGen/CgInfoTbls.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs
index 7a31f49240..f98d579e62 100644
--- a/compiler/codeGen/CgInfoTbls.hs
+++ b/compiler/codeGen/CgInfoTbls.hs
@@ -232,10 +232,10 @@ emitAlgReturnTarget name branches mb_deflt fam_sz
-- global labels, so we can't use them at the 'call site'
--------------------------------
-emitReturnInstr :: Code
-emitReturnInstr
- = do { info_amode <- getSequelAmode
- ; stmtC (CmmJump (entryCode info_amode) []) }
+emitReturnInstr :: Maybe [GlobalReg] -> Code
+emitReturnInstr live
+ = do { info_amode <- getSequelAmode
+ ; stmtC (CmmJump (entryCode info_amode) live) }
-----------------------------------------------------------------------------
--