diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-05-25 13:27:51 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-05-28 16:27:20 -0400 |
| commit | 13d9380b1fc8b67057a9ad4fffe244040a7f9bc0 (patch) | |
| tree | 6372c8c10a4c242ec358f5afbd7287b54546320f /compiler/GHC/Cmm | |
| parent | 8f021b8c474f328441982c90c6a12f716b5607eb (diff) | |
| download | haskell-13d9380b1fc8b67057a9ad4fffe244040a7f9bc0.tar.gz | |
Rip out CmmStackInfo(updfr_space)
As noted in #18232, this field is currently completely unused and
moreover doesn't have a clear meaning.
Diffstat (limited to 'compiler/GHC/Cmm')
| -rw-r--r-- | compiler/GHC/Cmm/LayoutStack.hs | 7 | ||||
| -rw-r--r-- | compiler/GHC/Cmm/Ppr.hs | 5 | ||||
| -rw-r--r-- | compiler/GHC/Cmm/ProcPoint.hs | 1 |
3 files changed, 5 insertions, 8 deletions
diff --git a/compiler/GHC/Cmm/LayoutStack.hs b/compiler/GHC/Cmm/LayoutStack.hs index 232ab7934d..b8fcf65b58 100644 --- a/compiler/GHC/Cmm/LayoutStack.hs +++ b/compiler/GHC/Cmm/LayoutStack.hs @@ -357,10 +357,9 @@ isGcJump _something_else = False -- This doesn't seem right somehow. We need to find out whether this -- proc will push some update frame material at some point, so that we --- can avoid using that area of the stack for spilling. The --- updfr_space field of the CmmProc *should* tell us, but it doesn't --- (I think maybe it gets filled in later when we do proc-point --- splitting). +-- can avoid using that area of the stack for spilling. Ideally we would +-- capture this information in the CmmProc (e.g. in CmmStackInfo; see #18232 +-- for details on one ill-fated attempt at this). -- -- So we'll just take the max of all the cml_ret_offs. This could be -- unnecessarily pessimistic, but probably not in the code we diff --git a/compiler/GHC/Cmm/Ppr.hs b/compiler/GHC/Cmm/Ppr.hs index 91bdfb40aa..f451550ed1 100644 --- a/compiler/GHC/Cmm/Ppr.hs +++ b/compiler/GHC/Cmm/Ppr.hs @@ -103,9 +103,8 @@ instance Outputable CmmGraph where -- Outputting types Cmm contains pprStackInfo :: CmmStackInfo -> SDoc -pprStackInfo (StackInfo {arg_space=arg_space, updfr_space=updfr_space}) = - text "arg_space: " <> ppr arg_space <+> - text "updfr_space: " <> ppr updfr_space +pprStackInfo (StackInfo {arg_space=arg_space}) = + text "arg_space: " <> ppr arg_space pprTopInfo :: CmmTopInfo -> SDoc pprTopInfo (TopInfo {info_tbls=info_tbl, stack_info=stack_info}) = diff --git a/compiler/GHC/Cmm/ProcPoint.hs b/compiler/GHC/Cmm/ProcPoint.hs index f9dc3a8334..fbefc544dc 100644 --- a/compiler/GHC/Cmm/ProcPoint.hs +++ b/compiler/GHC/Cmm/ProcPoint.hs @@ -356,7 +356,6 @@ splitAtProcPoints dflags entry_label callPPs procPoints procMap g' = replacePPIds g live = ppLiveness (g_entry g') stack_info = StackInfo { arg_space = 0 - , updfr_space = Nothing , do_layout = True } -- cannot use panic, this is printed by -ddump-cmm |