[commit: ghc] master: Support for abi-depends for computing shadowing. (ee4e165)
git at git.haskell.org
git at git.haskell.org
Wed Dec 21 16:49:27 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/ee4e1654c31b9c6f6ad9b19ece25f040bbbcbd72/ghc
>---------------------------------------------------------------
commit ee4e1654c31b9c6f6ad9b19ece25f040bbbcbd72
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date: Wed Dec 14 01:28:43 2016 -0800
Support for abi-depends for computing shadowing.
Summary:
This is a complete fix based off of
ed7af26606b3a605a4511065ca1a43b1c0f3b51d for handling
shadowing and out-of-order -package-db flags simultaneously.
The general strategy is we first put all databases together,
overriding packages as necessary. Once this is done, we successfully
prune out broken packages, including packages which depend on a package
whose ABI differs from the ABI we need.
Our check gracefully degrades in the absence of abi-depends, as
we only check deps which are recorded in abi-depends.
Contains time and Cabal submodule update.
Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
Test Plan: validate
Reviewers: niteria, austin, bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2846
GHC Trac Issues: #12485
>---------------------------------------------------------------
ee4e1654c31b9c6f6ad9b19ece25f040bbbcbd72
compiler/backpack/DriverBkp.hs | 1 +
compiler/ghc.cabal.in | 2 +-
compiler/main/Packages.hs | 324 ++++++++++++++++++++++------------
ghc/ghc-bin.cabal.in | 2 +-
libraries/Cabal | 2 +-
libraries/ghc-boot/GHC/PackageDb.hs | 12 +-
libraries/hpc | 2 +-
libraries/time | 2 +-
testsuite/driver/extra_files.py | 1 +
testsuite/tests/cabal/Makefile | 41 ++++-
testsuite/tests/cabal/T12485/Makefile | 4 +-
testsuite/tests/cabal/T12485/all.T | 3 +-
testsuite/tests/cabal/T12485a.stdout | 3 +
testsuite/tests/cabal/T1750.stderr | 2 +-
testsuite/tests/cabal/all.T | 7 +
testsuite/tests/cabal/shadow1.pkg | 1 +
testsuite/tests/cabal/shadow2.pkg | 2 +
testsuite/tests/cabal/shadow3.pkg | 1 +
testsuite/tests/perf/haddock/all.T | 3 +-
utils/ghc-cabal/Main.hs | 2 +-
utils/ghc-pkg/Main.hs | 1 +
21 files changed, 282 insertions(+), 136 deletions(-)
Diff suppressed because of size. To see it, use:
git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ee4e1654c31b9c6f6ad9b19ece25f040bbbcbd72
More information about the ghc-commits
mailing list