[commit: ghc] master: base: Add dependency on GHC.Integer in a few boot files (54acfbb)

git at git.haskell.org git at git.haskell.org
Fri Apr 6 18:49:05 UTC 2018


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

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

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

commit 54acfbbf64f5fcb108836412e9be0cfabf0d7801
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Apr 6 11:10:07 2018 -0400

    base: Add dependency on GHC.Integer in a few boot files
    
    Summary:
    The typechecker started trying to pull in GHC.Integer.Type's interface file
    due to the change made in d8d4266bf73790f65b223ec16f645763eaed8be3. It's unclear
    why the patch in question changed this behavior, but these typechecker-induced
    dependencies are known to be a bit fragile and adding these imports ensures
    that the build order is correct.
    
    Test Plan: Validate
    
    Reviewers: goldfire, hvr
    
    Subscribers: thomie, carter
    
    GHC Trac Issues: #15004
    
    Differential Revision: https://phabricator.haskell.org/D4560


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

54acfbbf64f5fcb108836412e9be0cfabf0d7801
 libraries/base/Data/Semigroup/Internal.hs-boot | 1 +
 libraries/base/GHC/IO.hs-boot                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/libraries/base/Data/Semigroup/Internal.hs-boot b/libraries/base/Data/Semigroup/Internal.hs-boot
index 645a088..8075024 100644
--- a/libraries/base/Data/Semigroup/Internal.hs-boot
+++ b/libraries/base/Data/Semigroup/Internal.hs-boot
@@ -4,6 +4,7 @@ module Data.Semigroup.Internal where
 
 import {-# SOURCE #-} GHC.Real (Integral)
 import {-# SOURCE #-} GHC.Base (Semigroup,Monoid,Maybe)
+import GHC.Integer ()   -- Note [Depend on GHC.Integer]
 
 stimesIdempotentMonoid :: (Integral b, Monoid a) => b -> a -> a
 
diff --git a/libraries/base/GHC/IO.hs-boot b/libraries/base/GHC/IO.hs-boot
index 88b09aa..f1e50fe 100644
--- a/libraries/base/GHC/IO.hs-boot
+++ b/libraries/base/GHC/IO.hs-boot
@@ -4,6 +4,7 @@
 module GHC.IO where
 
 import GHC.Types
+import GHC.Integer () -- see Note [Depend upon GHC.Integer] in libraries/base/GHC/Base.hs
 
 failIO :: [Char] -> IO a
 mplusIO :: IO a -> IO a -> IO a



More information about the ghc-commits mailing list