[commit: ghc] master: avoid record selector error on closureProf (299d464)
Simon Marlow
marlowsd at gmail.com
Thu Aug 25 13:05:32 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/299d4645a54fc6083bf92034716ca225adce913e
>---------------------------------------------------------------
commit 299d4645a54fc6083bf92034716ca225adce913e
Author: Simon Marlow <marlowsd at gmail.com>
Date: Tue Aug 23 16:07:22 2011 +0100
avoid record selector error on closureProf
>---------------------------------------------------------------
compiler/codeGen/StgCmmClosure.hs | 6 +++++-
compiler/codeGen/StgCmmLayout.hs | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/compiler/codeGen/StgCmmClosure.hs b/compiler/codeGen/StgCmmClosure.hs
index 1bf726c..498aea8 100644
--- a/compiler/codeGen/StgCmmClosure.hs
+++ b/compiler/codeGen/StgCmmClosure.hs
@@ -54,7 +54,7 @@ module StgCmmClosure (
isStaticClosure,
cafBlackHoleClosureInfo,
- staticClosureNeedsLink, clHasCafRefs
+ staticClosureNeedsLink, clHasCafRefs, clProfInfo,
) where
#include "../includes/MachDeps.h"
@@ -683,6 +683,10 @@ clHasCafRefs :: ClosureInfo -> CafInfo
-- Backward compatibility; remove
clHasCafRefs = closureCafs
+clProfInfo :: ClosureInfo -> ProfilingInfo
+clProfInfo ClosureInfo{ closureProf = p } = p
+clProfInfo _ = NoProfilingInfo
+
--------------------------------------
-- Building ClosureInfos
--------------------------------------
diff --git a/compiler/codeGen/StgCmmLayout.hs b/compiler/codeGen/StgCmmLayout.hs
index c7156fa..953aa1c 100644
--- a/compiler/codeGen/StgCmmLayout.hs
+++ b/compiler/codeGen/StgCmmLayout.hs
@@ -405,7 +405,7 @@ mkCmmInfo :: ClosureInfo -> CmmInfoTable
mkCmmInfo cl_info
= CmmInfoTable { cit_lbl = infoTableLabelFromCI cl_info,
cit_rep = closureSMRep cl_info,
- cit_prof = closureProf cl_info,
+ cit_prof = clProfInfo cl_info,
cit_srt = closureSRT cl_info }
-----------------------------------------------------------------------------
More information about the Cvs-ghc
mailing list