Rodrigo Mesquita pushed to branch wip/romes/step-out-10 at Glasgow Haskell Compiler / GHC
Commits:
-
27645c84
by Rodrigo Mesquita at 2025-07-30T12:10:54+01:00
2 changed files:
Changes:
| ... | ... | @@ -107,8 +107,8 @@ type BreakInfoIndex = Int |
| 107 | 107 | -- Indexes into the structures in the @'InternalModBreaks'@ produced during ByteCode generation.
|
| 108 | 108 | -- See Note [Breakpoint identifiers]
|
| 109 | 109 | data InternalBreakpointId = InternalBreakpointId
|
| 110 | - { ibi_info_mod :: !Module -- ^ Breakpoint tick module
|
|
| 111 | - , ibi_info_index :: !BreakInfoIndex -- ^ Breakpoint tick index
|
|
| 110 | + { ibi_info_mod :: !Module -- ^ Breakpoint info module
|
|
| 111 | + , ibi_info_index :: !BreakInfoIndex -- ^ Breakpoint info index
|
|
| 112 | 112 | }
|
| 113 | 113 | deriving (Eq, Ord)
|
| 114 | 114 |
| ... | ... | @@ -1671,7 +1671,7 @@ allocateBreakArrays interp = |
| 1671 | 1671 | ( \be0 InternalModBreaks{imodBreaks_breakInfo, imodBreaks_modBreaks=ModBreaks {..}} -> do
|
| 1672 | 1672 | -- If no BreakArray is assigned to this module yet, create one
|
| 1673 | 1673 | if not $ elemModuleEnv modBreaks_module be0 then do
|
| 1674 | - let count = 1 + (maybe 0 fst $ IM.lookupMax imodBreaks_breakInfo)
|
|
| 1674 | + let count = maybe 0 ((+1) . fst) $ IM.lookupMax imodBreaks_breakInfo
|
|
| 1675 | 1675 | breakArray <- GHCi.newBreakArray interp count
|
| 1676 | 1676 | evaluate $ extendModuleEnv be0 modBreaks_module breakArray
|
| 1677 | 1677 | else
|
| ... | ... | @@ -1708,7 +1708,7 @@ allocateCCS interp ce mbss |
| 1708 | 1708 | foldlM
|
| 1709 | 1709 | (\ce0 InternalModBreaks{imodBreaks_breakInfo, imodBreaks_modBreaks=ModBreaks{..}} -> do
|
| 1710 | 1710 | if not $ elemModuleEnv modBreaks_module ce then do
|
| 1711 | - let count = 1 + (maybe 0 fst $ IM.lookupMax imodBreaks_breakInfo)
|
|
| 1711 | + let count = (maybe 0 ((+1) fst) $ IM.lookupMax imodBreaks_breakInfo)
|
|
| 1712 | 1712 | let ccs = IM.map
|
| 1713 | 1713 | (\info ->
|
| 1714 | 1714 | fromMaybe (toRemotePtr nullPtr)
|