X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FStgCmmClosure.hs;h=7e8f02c17e06b8e97ecd44af1d4cc3c073ebc8ef;hb=785e4ab34b25c6f023183d6fabf5e74b27b416f9;hp=b4251636b90e8a12406fc42a91832bb9702b51e2;hpb=e6243a818496aad82b6f47511d3bd9bc800f747d;p=ghc-hetmet.git diff --git a/compiler/codeGen/StgCmmClosure.hs b/compiler/codeGen/StgCmmClosure.hs index b425163..7e8f02c 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 @@ -337,8 +337,8 @@ tagForArity arity | isSmallFamily arity = arity lfDynTag :: LambdaFormInfo -> DynTag -- Return the tag in the low order bits of a variable bound -- to this LambdaForm -lfDynTag (LFCon con) = pprTrace "tagForCon" (ppr con <+> ppr (tagForCon con)) $ tagForCon con -lfDynTag (LFReEntrant _ arity _ _) = pprTrace "reentrant" (ppr arity) $ tagForArity arity +lfDynTag (LFCon con) = tagForCon con +lfDynTag (LFReEntrant _ arity _ _) = tagForArity arity lfDynTag _other = 0 @@ -508,8 +508,7 @@ getCallMethod name caf (LFReEntrant _ arity _ _) n_args | n_args == 0 = ASSERT( arity /= 0 ) ReturnIt -- No args at all | n_args < arity = SlowCall -- Not enough args - | otherwise = pprTrace "getCallMethod" (ppr name <+> ppr arity) $ - DirectEntry (enterIdLabel name caf) arity + | otherwise = DirectEntry (enterIdLabel name caf) arity getCallMethod _name _ LFUnLifted n_args = ASSERT( n_args == 0 ) ReturnIt @@ -759,18 +758,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