diff options
| author | nineonine <mail4chemik@gmail.com> | 2021-05-17 11:25:53 -0700 |
|---|---|---|
| committer | nineonine <mail4chemik@gmail.com> | 2021-11-23 22:32:51 -0800 |
| commit | 1669037430f968dd25a6339edfc95d6091974b61 (patch) | |
| tree | 80984faf0fc3c1322d12b016fdaea385a1ab5e8d /compiler/GHC/StgToByteCode.hs | |
| parent | 9dcb2ad15df54e209cfae3dd1f51cf8e8d6c69d5 (diff) | |
| download | haskell-1669037430f968dd25a6339edfc95d6091974b61.tar.gz | |
Combine STG free variable traversals (#17978)
Previously we would traverse the STG AST twice looking for free variables.
* Once in `annTopBindingsDeps` which considers top level and imported ids free.
Its output is used to put bindings in dependency order. The pass happens
in STG pipeline.
* Once in `annTopBindingsFreeVars` which only considers non-top level ids free.
Its output is used by the code generator to compute offsets into closures.
This happens in Cmm (CodeGen) pipeline.
Now these two traversal operations are merged into one - `FVs.depSortWithAnnotStgPgm`.
The pass happens right at the end of STG pipeline. Some type signatures had to be
updated due to slight shifts of StgPass boundaries (for example, top-level CodeGen
handler now directly works with CodeGen flavoured Stg AST instead of Vanilla).
Due to changed order of bindings, a few debugger type reconstruction bugs
have resurfaced again (see tests break018, break021) - work item #18004 tracks this
investigation.
authors: simonpj, nineonine
Diffstat (limited to 'compiler/GHC/StgToByteCode.hs')
| -rw-r--r-- | compiler/GHC/StgToByteCode.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/compiler/GHC/StgToByteCode.hs b/compiler/GHC/StgToByteCode.hs index e7d4df472d..3e027d07b5 100644 --- a/compiler/GHC/StgToByteCode.hs +++ b/compiler/GHC/StgToByteCode.hs @@ -2,6 +2,7 @@ {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE FlexibleContexts #-} {-# OPTIONS_GHC -fprof-auto-top #-} {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-} @@ -88,14 +89,13 @@ import GHC.Stack.CCS import Data.Either ( partitionEithers ) import GHC.Stg.Syntax -import GHC.Stg.FVs -- ----------------------------------------------------------------------------- -- Generating byte code for a complete module byteCodeGen :: HscEnv -> Module - -> [StgTopBinding] + -> [CgStgTopBinding] -> [TyCon] -> Maybe ModBreaks -> IO CompiledByteCode @@ -116,8 +116,7 @@ byteCodeGen hsc_env this_mod binds tycs mb_modBreaks (BcM_State{..}, proto_bcos) <- runBc hsc_env this_mod mb_modBreaks (mkVarEnv stringPtrs) $ do - let flattened_binds = - concatMap (flattenBind . annBindingFreeVars) (reverse lifted_binds) + let flattened_binds = concatMap flattenBind (reverse lifted_binds) mapM schemeTopBind flattened_binds when (notNull ffis) |