[commit: ghc] master: Don't use old linkable for hs-boot files. (9ed700b)

git at git.haskell.org git at git.haskell.org
Fri Oct 2 21:11:19 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9ed700bb4128b1cbf59d99d725c44d7a0bfb1de6/ghc

>---------------------------------------------------------------

commit 9ed700bb4128b1cbf59d99d725c44d7a0bfb1de6
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Fri Oct 2 23:13:03 2015 +0200

    Don't use old linkable for hs-boot files.
    
    We should only use the old linkable when the really is nothing
    to be done.  In the case of hs-boot, there should just not be
    a linkable.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1301


>---------------------------------------------------------------

9ed700bb4128b1cbf59d99d725c44d7a0bfb1de6
 compiler/main/DriverPipeline.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index a45507e..9523e87 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -224,7 +224,7 @@ compileOne' m_tc_result mHscMessage
                        do (iface, _changed, details) <- hscSimpleIface hsc_env tc_result mb_old_hash
                           return (HomeModInfo{ hm_details  = details,
                                                hm_iface    = iface,
-                                               hm_linkable = maybe_old_linkable })
+                                               hm_linkable = Nothing })
                    _ -> do guts0 <- hscDesugar hsc_env summary tc_result
                            guts <- hscSimplify hsc_env guts0
                            (iface, _changed, details, cgguts) <- hscNormalIface hsc_env guts mb_old_hash
@@ -255,7 +255,7 @@ compileOne' m_tc_result mHscMessage
                       when (gopt Opt_WriteInterface dflags) $
                          hscWriteIface dflags iface changed summary
                       let linkable = if isHsBoot src_flavour
-                                     then maybe_old_linkable
+                                     then Nothing
                                      else Just (LM (ms_hs_date summary) this_mod [])
                       return (HomeModInfo{ hm_details  = details,
                                            hm_iface    = iface,
@@ -273,7 +273,7 @@ compileOne' m_tc_result mHscMessage
                           return (HomeModInfo{
                                     hm_details  = details,
                                     hm_iface    = iface,
-                                    hm_linkable = maybe_old_linkable })
+                                    hm_linkable = Nothing })
 
                    HsSrcFile ->
                         do guts0 <- hscDesugar hsc_env summary tc_result



More information about the ghc-commits mailing list