From ea9fe633d8eb7e986832519e3d4923a6e694ebbb Mon Sep 17 00:00:00 2001 From: "simonpj@microsoft.com" Date: Wed, 26 Nov 2008 12:55:26 +0000 Subject: [PATCH] Fix build following codegen patch --- compiler/codeGen/StgCmmBind.hs | 3 +-- compiler/codeGen/StgCmmClosure.hs | 14 +------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/compiler/codeGen/StgCmmBind.hs b/compiler/codeGen/StgCmmBind.hs index a78abc7..ad1b3e2 100644 --- a/compiler/codeGen/StgCmmBind.hs +++ b/compiler/codeGen/StgCmmBind.hs @@ -619,8 +619,7 @@ link_caf cl_info is_upd = do ; return hp_rel } where bh_cl_info :: ClosureInfo - bh_cl_info | is_upd = cafBlackHoleClosureInfo cl_info - | otherwise = seCafBlackHoleClosureInfo cl_info + bh_cl_info = cafBlackHoleClosureInfo cl_info ind_static_info :: CmmExpr ind_static_info = mkLblExpr mkIndStaticInfoLabel diff --git a/compiler/codeGen/StgCmmClosure.hs b/compiler/codeGen/StgCmmClosure.hs index b425163..81656fc 100644 --- a/compiler/codeGen/StgCmmClosure.hs +++ b/compiler/codeGen/StgCmmClosure.hs @@ -58,7 +58,7 @@ module StgCmmClosure ( closureValDescr, closureTypeDescr, -- profiling isStaticClosure, - cafBlackHoleClosureInfo, seCafBlackHoleClosureInfo, + cafBlackHoleClosureInfo, staticClosureNeedsLink, clHasCafRefs ) where @@ -759,18 +759,6 @@ cafBlackHoleClosureInfo (ClosureInfo { closureName = nm, closureCafs = cafs } cafBlackHoleClosureInfo _ = panic "cafBlackHoleClosureInfo" -seCafBlackHoleClosureInfo :: ClosureInfo -> ClosureInfo -seCafBlackHoleClosureInfo (ClosureInfo { closureName = nm, - closureType = ty, - closureCafs = cafs }) - = ClosureInfo { closureName = nm, - closureLFInfo = LFBlackHole mkSECAFBlackHoleInfoTableLabel, - closureSMRep = BlackHoleRep, - closureSRT = NoC_SRT, - closureType = ty, - closureDescr = "", - closureCafs = cafs } -seCafBlackHoleClosureInfo _ = panic "seCafBlackHoleClosureInfo" -------------------------------------- -- Extracting ClosureTypeInfo -- 1.7.10.4