Wolfgang Jeltsch pushed to branch wip/jeltsch/textual-bytecode-output at Glasgow Haskell Compiler / GHC Commits: 796623cd by Wolfgang Jeltsch at 2026-06-06T14:57:40+03:00 Add static-pointer handling and fix things - - - - - 1 changed file: - compiler/GHC/ByteCode/Show.hs Changes: ===================================== compiler/GHC/ByteCode/Show.hs ===================================== @@ -37,7 +37,7 @@ import GHC.Types.SrcLoc (noSrcSpan) import GHC.Types.Name (Name) import GHC.Types.Name.Occurrence (OccName) import GHC.Types.Tickish (BreakTickIndex, BreakpointId (..)) -import GHC.Types.SptEntry (SptEntry) +import GHC.Types.SptEntry (SptEntry (..)) import GHC.Types.Error (MessageClass (MCDump)) import GHC.Utils.Logger (Logger, logMsg) import GHC.Utils.Binary (BinSrcSpan (..)) @@ -260,10 +260,6 @@ pprDataConstructorInfoTable dataConstrName ConInfoTable {..} pprPointerTag $ conItblPtrTag, pprDescription $ conItblDescr ] -{-FIXME: - Check based on any answers to my message on 4 June 2026, 13:17 EEST whether - the current handling of `conItblPtrs` and `conItblNPtrs` is correct. --} -- | […] pprTablePositioning :: Bool -> SDoc @@ -404,7 +400,7 @@ pprBreakpointInByteCode currentModule ix CgBreakInfo {..} -- 'GHC.StgToByteCode.dehydrateCgBreakInfo' using one of its arguments and -- 'dehydrateCgBreakInfo' is always invoked with this argument set to the -- extension field of 'Breakpoint', which in turn holds the type of the - -- breakpoint, according to Note [Tickish passes] and the comment on the + -- breakpoint according to Note [Tickish passes] and the comment on the -- instance declaration of @XBreakpoint 'TickishPassStg@. pprType :: IfaceType -> SDoc @@ -449,7 +445,7 @@ pprOrigin currentModule = entry (text "origin:") . pprBreakpointID currentModule . either internalBreakLoc id --- | […] [analogous to 'pprInternalBreakpointID' but the meanging of the index is different] +-- | […] [analogous to 'pprInternalBreakpointID' but the meaning of the index is different] pprBreakpointID :: Module -> BreakpointId -> SDoc pprBreakpointID currentModule BreakpointId {..} | bi_tick_mod == currentModule = indexDoc @@ -462,7 +458,13 @@ pprBreakpointID currentModule BreakpointId {..} -- | […] pprStaticPointerTableEntries :: [SptEntry] -> SDoc pprStaticPointerTableEntries = entry (text "static-pointer table entries:") . - pprStaticPointerTableEntries + vcatOrNone . + map pprStaticPointerTableEntry + +-- | […] +pprStaticPointerTableEntry :: SptEntry -> SDoc +pprStaticPointerTableEntry (SptEntry name fingerprint) + = ppr fingerprint <> text ":" <+> ppr name -- | […] pprHPCInfo :: Strict.Maybe ByteCodeHpcInfo -> SDoc View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/796623cd130b7304dea937a3edeec535... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/796623cd130b7304dea937a3edeec535... You're receiving this email because of your account on gitlab.haskell.org.