From ac7a7eb93397a2343402f77f1a8a8b4a0e0298df Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 2 Oct 2011 01:31:05 +0100 Subject: More CPP removal: pprDynamicLinkerAsmLabel in CLabel And some knock-on changes --- compiler/codeGen/StgCmmClosure.hs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'compiler/codeGen/StgCmmClosure.hs') diff --git a/compiler/codeGen/StgCmmClosure.hs b/compiler/codeGen/StgCmmClosure.hs index 712263a156..ede24a5c6f 100644 --- a/compiler/codeGen/StgCmmClosure.hs +++ b/compiler/codeGen/StgCmmClosure.hs @@ -80,6 +80,7 @@ import TcType import TyCon import BasicTypes import Outputable +import Platform import Constants import DynFlags @@ -757,19 +758,19 @@ isToplevClosure (ClosureInfo { closureLFInfo = lf_info }) -- Label generation -------------------------------------- -staticClosureLabel :: ClosureInfo -> CLabel -staticClosureLabel = toClosureLbl . closureInfoLabel +staticClosureLabel :: Platform -> ClosureInfo -> CLabel +staticClosureLabel platform = toClosureLbl platform . closureInfoLabel -closureRednCountsLabel :: ClosureInfo -> CLabel -closureRednCountsLabel = toRednCountsLbl . closureInfoLabel +closureRednCountsLabel :: Platform -> ClosureInfo -> CLabel +closureRednCountsLabel platform = toRednCountsLbl platform . closureInfoLabel -closureSlowEntryLabel :: ClosureInfo -> CLabel -closureSlowEntryLabel = toSlowEntryLbl . closureInfoLabel +closureSlowEntryLabel :: Platform -> ClosureInfo -> CLabel +closureSlowEntryLabel platform = toSlowEntryLbl platform . closureInfoLabel -closureLocalEntryLabel :: ClosureInfo -> CLabel -closureLocalEntryLabel - | tablesNextToCode = toInfoLbl . closureInfoLabel - | otherwise = toEntryLbl . closureInfoLabel +closureLocalEntryLabel :: Platform -> ClosureInfo -> CLabel +closureLocalEntryLabel platform + | tablesNextToCode = toInfoLbl platform . closureInfoLabel + | otherwise = toEntryLbl platform . closureInfoLabel mkClosureInfoTableLabel :: Id -> LambdaFormInfo -> CLabel mkClosureInfoTableLabel id lf_info -- cgit v1.2.1