diff options
| author | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-01-07 13:56:17 -0800 |
|---|---|---|
| committer | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-01-07 13:56:17 -0800 |
| commit | f784eb7585901e2297d504dcf777ebc58d60aaa5 (patch) | |
| tree | 7bf8bc625882724f5db96121c327ee3e80ae781a /compiler/codeGen/ClosureInfo.lhs | |
| parent | 7655c718d56666a918c06f6d4e32d98482620b9c (diff) | |
| parent | a5b365ac3ea7277817541f8bc3341eecfb083490 (diff) | |
| download | haskell-f784eb7585901e2297d504dcf777ebc58d60aaa5.tar.gz | |
Merge remote-tracking branch 'origin/master' into type-nats
Diffstat (limited to 'compiler/codeGen/ClosureInfo.lhs')
| -rw-r--r-- | compiler/codeGen/ClosureInfo.lhs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/compiler/codeGen/ClosureInfo.lhs b/compiler/codeGen/ClosureInfo.lhs index 682d76096b..2cd0cf6434 100644 --- a/compiler/codeGen/ClosureInfo.lhs +++ b/compiler/codeGen/ClosureInfo.lhs @@ -43,7 +43,7 @@ module ClosureInfo ( closureFunInfo, isKnownFun, funTag, funTagLFInfo, tagForArity, clHasCafRefs, - enterIdLabel, enterLocalIdLabel, enterReturnPtLabel, + enterIdLabel, enterReturnPtLabel, nodeMustPointToIt, CallMethod(..), getCallMethod, @@ -963,7 +963,10 @@ infoTableLabelFromCI :: ClosureInfo -> CLabel infoTableLabelFromCI = fst . labelsFromCI entryLabelFromCI :: ClosureInfo -> CLabel -entryLabelFromCI = snd . labelsFromCI +entryLabelFromCI ci + | tablesNextToCode = info_lbl + | otherwise = entry_lbl + where (info_lbl, entry_lbl) = labelsFromCI ci labelsFromCI :: ClosureInfo -> (CLabel, CLabel) -- (Info, Entry) labelsFromCI cl@(ClosureInfo { closureName = name, @@ -1032,11 +1035,6 @@ enterIdLabel id | tablesNextToCode = mkInfoTableLabel id | otherwise = mkEntryLabel id -enterLocalIdLabel :: Name -> CafInfo -> CLabel -enterLocalIdLabel id - | tablesNextToCode = mkLocalInfoTableLabel id - | otherwise = mkLocalEntryLabel id - enterReturnPtLabel :: Unique -> CLabel enterReturnPtLabel name | tablesNextToCode = mkReturnInfoLabel name |