Matthew Pickering pushed to branch wip/bytecode-library at Glasgow Haskell Compiler / GHC

Commits:

5 changed files:

Changes:

  • compiler/GHC/Driver/ByteCode.hs
    ... ... @@ -22,7 +22,6 @@ import Data.Time
    22 22
     
    
    23 23
     import GHC.Platform.Ways
    
    24 24
     
    
    25
    -import GHC.ByteCode.Serialize
    
    26 25
     import System.OsPath
    
    27 26
     
    
    28 27
     -- | Write foreign sources and foreign stubs to temporary files and compile them.
    

  • compiler/GHC/Driver/Pipeline.hs
    ... ... @@ -48,7 +48,6 @@ import GHC.Builtin.Names
    48 48
     
    
    49 49
     import GHC.Platform
    
    50 50
     
    
    51
    -import GHC.ByteCode.Serialize
    
    52 51
     import GHC.Utils.Monad ( MonadIO(liftIO), mapMaybeM )
    
    53 52
     
    
    54 53
     import GHC.Driver.Main
    

  • compiler/GHC/Linker/Dynamic.hs
    ... ... @@ -28,7 +28,6 @@ import GHC.Utils.TmpFs
    28 28
     
    
    29 29
     import Control.Monad (when)
    
    30 30
     import System.FilePath
    
    31
    -import GHC.Utils.Outputable
    
    32 31
     
    
    33 32
     data DynLinkMode = LinkingHomePackage -- | Creating a dynamic library for the home package
    
    34 33
                      | LinkingForInterpreter
    

  • compiler/GHC/Linker/Loader.hs
    ... ... @@ -538,6 +538,7 @@ preloadLib
    538 538
     preloadLib interp hsc_env lib_paths framework_paths pls lib_spec = do
    
    539 539
       maybePutStr logger ("Loading object " ++ showLS lib_spec ++ " ... ")
    
    540 540
       case lib_spec of
    
    541
    +    BytecodeLibrary _bco -> panic "TODO: MP preloadLib BytecodeLibrary"
    
    541 542
         Objects static_ishs -> do
    
    542 543
           (b, pls1) <- preload_statics lib_paths static_ishs
    
    543 544
           maybePutStrLn logger (if b  then "done" else "not found")
    

  • compiler/GHC/Runtime/Interpreter.hs
    ... ... @@ -77,9 +77,6 @@ import GHCi.RemoteTypes
    77 77
     import GHCi.ResolvedBCO
    
    78 78
     import GHCi.BreakArray (BreakArray)
    
    79 79
     import GHC.ByteCode.Breakpoints
    
    80
    -import GHC.ByteCode.Serialize
    
    81
    -import GHC.Driver.Env
    
    82
    -import GHC.Driver.ByteCode
    
    83 80
     
    
    84 81
     import GHC.ByteCode.Types
    
    85 82
     import GHC.Linker.Types
    
    ... ... @@ -119,7 +116,6 @@ import qualified GHC.InfoProv as InfoProv
    119 116
     import GHC.Builtin.Names
    
    120 117
     import GHC.Types.Name
    
    121 118
     import qualified GHC.Unit.Home.Graph as HUG
    
    122
    -import GHC.Utils.Misc
    
    123 119
     
    
    124 120
     -- Standard libraries
    
    125 121
     import GHC.Exts