X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmCPSGen.hs;h=da72b541baf893b6e18c45fcefcea4f79584f67d;hb=7bfd7890bcf6f27d601604a0964975ba2e4ea2eb;hp=abea84f952f63fe86d1025aaba4dcf970958e7aa;hpb=e3db6d843740426b77367542363986d051d19ad7;p=ghc-hetmet.git diff --git a/compiler/cmm/CmmCPSGen.hs b/compiler/cmm/CmmCPSGen.hs index abea84f..da72b54 100644 --- a/compiler/cmm/CmmCPSGen.hs +++ b/compiler/cmm/CmmCPSGen.hs @@ -17,6 +17,7 @@ import CmmCallConv import CgProf (curCCS, curCCSAddr) import CgUtils (cmmOffsetW) +import CgInfoTbls (entryCode) import SMRep import ForeignCall @@ -178,7 +179,7 @@ continuationToProc (max_stack, update_frame_size, formats) stack_use uniques FinalSwitch expr targets -> [CmmSwitch expr targets] FinalReturn arguments -> tail_call curr_stack - (CmmLoad (CmmReg spReg) wordRep) + (entryCode (CmmLoad (CmmReg spReg) wordRep)) arguments FinalJump target arguments -> tail_call curr_stack target arguments @@ -393,7 +394,7 @@ pack_continuation allow_header_set _ -> isJust cont_id maybe_header = if allow_header_set && needs_header_set - then maybe Nothing (Just . CmmLit . CmmLabel) cont_id + then maybe Nothing (Just . CmmLit . CmmLabel . entryLblToInfoLbl) cont_id else Nothing pack_frame :: WordOff -- ^ Current frame size