[commit: ghc] master: INFO_TABLE_RET should generate a CmmRetInfoLabel, not a CmmInfoLabel (4444dd8)
Simon Marlow <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/4444dd88a2021cc8acb05550a16110a20d95c017 >--------------------------------------------------------------- commit 4444dd88a2021cc8acb05550a16110a20d95c017 Author: Simon Marlow <[email protected]> Date: Mon Oct 29 13:49:57 2012 +0000 INFO_TABLE_RET should generate a CmmRetInfoLabel, not a CmmInfoLabel Fixes this, when building unregisterised: rts/dist/build/AutoApply.hc:87:1: error: ‘stg_ap_v_entry’ undeclared (first use in this function) >--------------------------------------------------------------- compiler/cmm/CmmParse.y | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index c483502..a02e742 100644 --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -482,7 +482,7 @@ info :: { CmmParse (CLabel, Maybe CmmInfoTable, [LocalReg]) } do let prof = NoProfilingInfo rep = mkRTSRep (fromIntegral $5) $ mkStackRep [] return (mkCmmRetLabel pkg $3, - Just $ CmmInfoTable { cit_lbl = mkCmmInfoLabel pkg $3 + Just $ CmmInfoTable { cit_lbl = mkCmmRetInfoLabel pkg $3 , cit_rep = rep , cit_prof = prof, cit_srt = NoC_SRT }, []) } @@ -497,7 +497,7 @@ info :: { CmmParse (CLabel, Maybe CmmInfoTable, [LocalReg]) } bitmap = mkLiveness dflags (map Just (drop 1 live)) rep = mkRTSRep (fromIntegral $5) $ mkStackRep bitmap return (mkCmmRetLabel pkg $3, - Just $ CmmInfoTable { cit_lbl = mkCmmInfoLabel pkg $3 + Just $ CmmInfoTable { cit_lbl = mkCmmRetInfoLabel pkg $3 , cit_rep = rep , cit_prof = prof, cit_srt = NoC_SRT }, live) } _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc