[commit: ghc] master: Don't do a half-hearted recompilation check in compileOne (af4d998)

git at git.haskell.org git at git.haskell.org
Sat Jan 3 20:31:35 UTC 2015


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

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

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

commit af4d99803ea7676f88f250ad56a8c31c1c8cd5bc
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Fri Dec 26 21:56:54 2014 -0800

    Don't do a half-hearted recompilation check in compileOne
    
    Summary:
    The isNothing maybe_old_linkable check predates
    48bc81ad466edfc80237015dbe5d78ba70eb5095, which fixed #481 by requiring
    recompilation information to be passed in as an argument to compileOne.
    As a result, the check here is redundant: the client has already taken
    a look at the object file to see if it is available or not.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: simonmar, austin
    
    Subscribers: carter, thomie
    
    Differential Revision: https://phabricator.haskell.org/D594


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

af4d99803ea7676f88f250ad56a8c31c1c8cd5bc
 compiler/main/DriverPipeline.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index fdec73e..e8be297 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -171,7 +171,7 @@ compileOne' m_tc_result mHscMessage
    -- -fforce-recomp should also work with --make
    let force_recomp = gopt Opt_ForceRecomp dflags
        source_modified
-         | force_recomp || isNothing maybe_old_linkable = SourceModified
+         | force_recomp = SourceModified
          | otherwise = source_modified0
        object_filename = ml_obj_file location
 



More information about the ghc-commits mailing list