diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-06-21 12:28:23 +0100 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2021-06-21 12:29:15 +0100 |
| commit | 861b7a5be1f8fbcb19477e8c21d18f2cf589b703 (patch) | |
| tree | b4563aa661b9a265aeb0c22dd18fd770c9eedaee /compiler | |
| parent | a0622459f1d9a7068e81b8a707ffc63e153444f8 (diff) | |
| download | haskell-wip/t20009.tar.gz | |
ghci: Correct free variable calculation in StgToByteCodewip/t20009
Fixes #20019
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/GHC/Stg/Lift/Analysis.hs | 3 | ||||
| -rw-r--r-- | compiler/GHC/Stg/Syntax.hs | 6 | ||||
| -rw-r--r-- | compiler/GHC/StgToByteCode.hs | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/compiler/GHC/Stg/Lift/Analysis.hs b/compiler/GHC/Stg/Lift/Analysis.hs index d4e59a8d6e..5999104c9c 100644 --- a/compiler/GHC/Stg/Lift/Analysis.hs +++ b/compiler/GHC/Stg/Lift/Analysis.hs @@ -115,9 +115,6 @@ type instance XRhsClosure 'LiftLams = DIdSet type instance XLet 'LiftLams = Skeleton type instance XLetNoEscape 'LiftLams = Skeleton -freeVarsOfRhs :: (XRhsClosure pass ~ DIdSet) => GenStgRhs pass -> DIdSet -freeVarsOfRhs (StgRhsCon _ _ _ _ args) = mkDVarSet [ id | StgVarArg id <- args ] -freeVarsOfRhs (StgRhsClosure fvs _ _ _ _) = fvs -- | Captures details of the syntax tree relevant to the cost model, such as -- closures, multi-shot lambdas and case expressions. diff --git a/compiler/GHC/Stg/Syntax.hs b/compiler/GHC/Stg/Syntax.hs index a1a1084166..b0c32470f5 100644 --- a/compiler/GHC/Stg/Syntax.hs +++ b/compiler/GHC/Stg/Syntax.hs @@ -50,7 +50,7 @@ module GHC.Stg.Syntax ( StgOp(..), -- utils - stgRhsArity, + stgRhsArity, freeVarsOfRhs, isDllConApp, stgArgType, stripStgTicksTop, stripStgTicksTopE, @@ -504,6 +504,10 @@ stgRhsArity (StgRhsClosure _ _ _ bndrs _) -- The arity never includes type parameters, but they should have gone by now stgRhsArity (StgRhsCon _ _ _ _ _) = 0 +freeVarsOfRhs :: (XRhsClosure pass ~ DIdSet) => GenStgRhs pass -> DIdSet +freeVarsOfRhs (StgRhsCon _ _ _ _ args) = mkDVarSet [ id | StgVarArg id <- args ] +freeVarsOfRhs (StgRhsClosure fvs _ _ _ _) = fvs + {- ************************************************************************ * * diff --git a/compiler/GHC/StgToByteCode.hs b/compiler/GHC/StgToByteCode.hs index 7dad6a87da..37a6539fe6 100644 --- a/compiler/GHC/StgToByteCode.hs +++ b/compiler/GHC/StgToByteCode.hs @@ -567,10 +567,8 @@ fvsToEnv :: BCEnv -> CgStgRhs -> [Id] -- The code that constructs the thunk, and the code that executes -- it, have to agree about this layout -fvsToEnv p (StgRhsClosure fvs _ _ _ _) = - [v | v <- dVarSetElems fvs, - v `Map.member` p] -fvsToEnv _ _ = [] +fvsToEnv p rhs = [v | v <- dVarSetElems $ freeVarsOfRhs rhs, + v `Map.member` p] -- ----------------------------------------------------------------------------- -- schemeE |